X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile.PL;h=ed3b4a1f7622e7dbaa70d756602be7263078039b;hb=8237e83ed726d86f1ef754e51077eb2aff0cd4ed;hp=767f8ec5c53f3afce78830af3df72a3a4515eddd;hpb=cb585659f8b5f12f0a32c93ac88971fe84d4c1f3;p=maypole.git

diff --git a/Makefile.PL b/Makefile.PL
index 767f8ec..ed3b4a1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,7 +6,7 @@ WriteMakefile(
     NAME              => 'Maypole',
     VERSION_FROM      => 'lib/Maypole.pm', # finds $VERSION
     PREREQ_PM         => {
-        Class::DBI::Loader => 0,
+        Class::DBI::Loader => '0.02',
         Class::DBI::AbstractSearch => 0,
         Class::DBI::Pager => 0,
         Class::DBI::Plugin::RetrieveAll => 0,
@@ -20,14 +20,14 @@ WriteMakefile(
         Template => 0,
     }, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
-      (ABSTRACT_FROM  => 'lib/Apache/MVC.pm', # retrieve abstract from module
-       AUTHOR         => 'Simon Cozens <simon@nonet>') : ()),
+      (ABSTRACT_FROM  => 'lib/Maypole.pm', # retrieve abstract from module
+       AUTHOR         => 'Simon Cozens <simon@simon-cozens.org>') : ()),
 );
 
 if (!-e "t/beerdb.db") {
     print "Making SQLite DB\n";
-    require DBD::SQLite 
-        or die "No, wait, we don't have SQLite installed. Never mind\n";
+    eval { require DBD::SQLite };
+    die "No, wait, we don't have SQLite installed. Never mind\n" if $@;
     require DBI;
     my $dbh = DBI->connect("dbi:SQLite:dbname=t/beerdb.db");
 
@@ -45,16 +45,16 @@ if (!-e "t/beerdb.db") {
 __DATA__
 
 create table brewery (
-    id int not null auto_increment primary key,
+    id integer auto_increment primary key,
     name varchar(30),
     url varchar(50),
     notes text
 );
 
 create table beer (
-    id int not null auto_increment primary key,
+    id integer auto_increment primary key,
     brewery integer,
-    style integer, 
+    style integer,
     name varchar(30),
     url varchar(120),
 #    tasted date,
@@ -65,18 +65,24 @@ create table beer (
 );
 
 create table handpump (
-    id int not null auto_increment primary key,
+    id integer auto_increment primary key,
     beer integer,
     pub integer
 );
 
 create table pub (
-    id int not null auto_increment primary key,
+    id integer auto_increment primary key,
     name varchar(60),
     url varchar(120),
     notes text
 );
 
+create table style (
+    id integer auto_increment primary key,
+    name varchar(60),
+    notes text
+);
+
 INSERT INTO beer (id, brewery, name, abv) VALUES
     (1, 1, "Organic Best Bitter", "4.1");
 INSERT INTO brewery (id, name, url) VALUES