X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=Makefile.PL;h=3d26362ed4a6a1930abc463864777843915d0252;hp=ad8fcdbcaac3289447e642be2edd7250c66c35da;hb=83f49b1a6dd37085046213013288504696d5483e;hpb=24259799350483f32219fd3755e0bed54f909c54

diff --git a/Makefile.PL b/Makefile.PL
index ad8fcdb..3d26362 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -11,27 +11,31 @@ WriteMakefile(
         Class::DBI::AbstractSearch       => 0,
         Class::DBI::Pager                => 0,
         Class::DBI::Plugin::RetrieveAll  => 0,
-        Class::DBI::AsForm               => 2.2,
-        Class::DBI::FromCGI              => 0.94,
         Class::DBI::Loader::Relationship => 0,
         Class::DBI                       => 0.96,
-        Class::DBI::SQLite               => 0,
-        CGI::Untaint                     => 0,
+        Class::DBI::SQLite               => 0.08,
+        CGI::Untaint                     => 1.26,
+	CGI::Untaint::date		 => 0,
+	CGI::Untaint::email		 => 0,
         UNIVERSAL::moniker               => 0,
         UNIVERSAL::require               => 0,
-        URI::QueryParam                  => 0,
+        URI                              => 0,
         CGI::Simple                      => 0,
-        HTTP::Headers                    => 0,
+ 	HTTP::Body			 => 0.5,
+	HTML::Tree        		 => 0,
         Template                         => 0,
         Template::Plugin::Class          => 0,
         Test::MockModule                 => 0,
+        Digest::MD5			 => 0,
+	File::MMagic::XS		 => 0.08,
+	Class::DBI::Plugin::Type	 => 0,
     },    # e.g., Module::Name => 1.1
     (
         $] >= 5.005
         ?    ## Add these new keywords supported since 5.005
           (
             ABSTRACT_FROM => 'lib/Maypole.pm',   # retrieve abstract from module
-            AUTHOR => 'Simon Cozens <simon@simon-cozens.org>'
+            AUTHOR => 'Aaron TEEJAY Trevena <aaron@aarontrevena.co.uk>'
           )
         : ()
     ),
@@ -46,17 +50,14 @@ sub has_module {
 
 if ( !-e "t/beerdb.db" ) {
     print "Making SQLite DB\n";
-    eval { require DBD::SQLite };
-    my $dbh;
-    if ($@) {
-        eval { require DBD::SQLite2 };
-        die "No, wait, we don't have SQLite installed. Never mind\n" if $@;
-        require DBI;
-        $dbh = DBI->connect("dbi:SQLite2:dbname=t/beerdb.db");
-    } else {
-        require DBI;
-        $dbh = DBI->connect("dbi:SQLite:dbname=t/beerdb.db");
-    }
+    my $driver = 'SQLite';
+    eval { require DBD::SQLite } or do {
+        print "Error loading DBD::SQLite, trying DBD::SQLite2\n";
+        eval {require DBD::SQLite2} ? $driver = 'SQLite2'
+            : die "DBD::SQLite2 is not installed";
+    };
+    require DBI;
+    my $dbh = DBI->connect("dbi:$driver:dbname=t/beerdb.db");
     my $sql = join( '', (<DATA>) );
 
     for my $statement ( split /;/, $sql ) {
@@ -83,7 +84,7 @@ create table beer (
     style integer,
     name varchar(30),
     url varchar(120),
-#    tasted date,
+    tasted date,
     score integer(2),
     price varchar(12),
     abv varchar(10),