X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ex%2FBeerDB.pm;h=e276830c4e10d18620783e10cecb6b937a9cc634;hb=8617321ebf13ce6b63d41a65a003d153f2b5cc5e;hp=6df04914611ad19d1f176209c53c49917015cac4;hpb=24259799350483f32219fd3755e0bed54f909c54;p=maypole.git

diff --git a/ex/BeerDB.pm b/ex/BeerDB.pm
index 6df0491..e276830 100644
--- a/ex/BeerDB.pm
+++ b/ex/BeerDB.pm
@@ -3,16 +3,23 @@ use Maypole::Application;
 use Class::DBI::Loader::Relationship;
 
 sub debug { $ENV{BEERDB_DEBUG} }
+# This is the sample application.  Change this to the path to your
+# database. (or use mysql or something)
+use constant DBI_DRIVER => 'SQLite';
+use constant DATASOURCE => 't/beerdb.db';
 
 BEGIN {
-# This is the sample application. Change this to the path to your
-# database. (or use mysql or something)
-eval { require DBD::SQLite };
-if ($@) {
-   BeerDB->setup("dbi:SQLite2:t/beerdb.db");
-} else {
-    BeerDB->setup("dbi:SQLite:t/beerdb.db");
-}
+    my $dbi_driver = DBI_DRIVER;
+    if ($dbi_driver =~ /^SQLite/) {
+        die sprintf "SQLite datasource '%s' not found, correct the path or "
+            . "recreate the database by running Makefile.PL", DATASOURCE
+            unless -e DATASOURCE;
+        eval "require DBD::SQLite";
+        if ($@) {
+            eval "require DBD::SQLite2" && dbi_driver = 'SQLite2';
+        }
+    }
+    BeerDB->setup(join ':', "dbi", $dbi_driver, DATASOURCE);
 }
 
 # Give it a name.
@@ -20,12 +27,12 @@ BeerDB->config->application_name('The Beer Database');
 
 # Change this to the root of the web space.
 BeerDB->config->uri_base("http://localhost/beerdb/");
-#BeerDB->config->{uri_base} = "http://neo.trinity-house.org.uk/beerdb/";
+#BeerDB->config->uri_base("http://neo.trinity-house.org.uk/beerdb/");
 
 BeerDB->config->rows_per_page(10);
 
 # Handpumps should not show up.
-BeerDB->config->{display_tables} = [qw[beer brewery pub style]];
+BeerDB->config->display_tables([qw[beer brewery pub style]]);
 BeerDB::Brewery->untaint_columns( printable => [qw/name notes url/] );
 BeerDB::Style->untaint_columns( printable => [qw/name notes/] );
 BeerDB::Beer->untaint_columns(