Fix up example module, skip test if no SQLite.

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@119 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/ex/BeerDB.pm b/ex/BeerDB.pm
index b7961bc1e8874a22beaa670eb09d1ace92455534..f7a96904c70985801ff7e74bb1d09df17f24b2ff 100644 (file)
--- a/ex/BeerDB.pm
+++ b/ex/BeerDB.pm
@@ -4,12 +4,12 @@ use Class::DBI::Loader::Relationship;
 
 # This is the sample application. Change this to the path to your
 # database. (or use mysql or something)
-#BeerDB->set_database("dbi:SQLite:t/beerdb.db");
-BeerDB->setup("dbi:mysql:beerdb");
+BeerDB->setup("dbi:SQLite:t/beerdb.db");
+#BeerDB->setup("dbi:mysql:beerdb");
 
 # 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://localhost/beerdb/";
+#BeerDB->config->{uri_base} = "http://neo.trinity-house.org.uk/beerdb/";
 
 BeerDB->config->{rows_per_page} = 10;
 

diff --git a/t/1.t b/t/1.t
index be5e6bdac57f11a880cbf59019bab09e66887d00..50aa24c4d6933994b2903e0db2d1dd045d8f9aa1 100644 (file)
--- a/t/1.t
+++ b/t/1.t
@@ -1,5 +1,10 @@
 # vim:ft=perl
-use Test::More tests => 5;
+use Test::More;
+use lib 'ex'; # Where BeerDB should live
+BEGIN { if (eval { require BeerDB }) { 
+            plan tests => 5;
+        } else { Test::More->import(skip_all =>"SQLite not working or BeerDB module not found: $@") }
+      }
 use Maypole::CLI qw(BeerDB);
 use Maypole::Constants;
 $ENV{MAYPOLE_TEMPLATES} = "t/templates";