+ fix #7917 - use correct template if object creation fails

[maypole.git] / ex / BeerDB.pm

diff --git a/ex/BeerDB.pm b/ex/BeerDB.pm
index 26f8e94cd249197ff919a9746120421e09245235..6d90b2eb7828f1c1566a1f25f3bfa443414a5d32 100644 (file)
--- a/ex/BeerDB.pm
+++ b/ex/BeerDB.pm
@@ -2,10 +2,24 @@ package BeerDB;
 use Maypole::Application;
 use Class::DBI::Loader::Relationship;
 
-BEGIN {
-# This is the sample application. Change this to the path to your
+sub debug { $ENV{BEERDB_DEBUG} }
+# This is the sample application.  Change this to the path to your
 # database. (or use mysql or something)
-BeerDB->setup("dbi:SQLite:t/beerdb.db");
+use constant DBI_DRIVER => 'SQLite';
+use constant DATASOURCE => 't/beerdb.db';
+
+BEGIN {
+    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" and $dbi_driver = 'SQLite2';
+        }
+    }
+    BeerDB->setup(join ':', "dbi", $dbi_driver, DATASOURCE);
 }
 
 # Give it a name.
@@ -13,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(
@@ -31,11 +45,7 @@ BeerDB->config->{loader}->relationship($_) for (
     "a style defines beers",
     "a pub has beers on handpumps");
 
-#package BeerDB::Beer;
-#our %remember;
-#sub MODIFY_CODE_ATTRIBUTES { $remember{ $_[1] } = $_[2]; () }
-#sub FETCH_CODE_ATTRIBUTES { $remember{ $_[1] } }
-
+# For testing classmetadata
 sub BeerDB::Beer::classdata :Exported {};
 sub BeerDB::Beer::list_columns  { return qw/score name price style brewery url/};