X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=t%2Fdb_colinfo.t;h=c56fbf28497b2b954345059a1d6816474574885d;hb=8ccc7518f5fd8c8bc0964b6ba61d60757b3b09e7;hp=ef2466fb002aa067a85aebf2fbed03dcd6008d77;hpb=d3bd3060bf3f11775d9f40ee983f71949404f794;p=maypole.git

diff --git a/t/db_colinfo.t b/t/db_colinfo.t
index ef2466f..c56fbf2 100755
--- a/t/db_colinfo.t
+++ b/t/db_colinfo.t
@@ -2,7 +2,7 @@
 use Test::More;
 use lib 'ex'; # Where BeerDB should live
 BEGIN {
-   plan tests => 44;
+   plan tests => 35;
 }
 
 $db     	= 'test';
@@ -32,7 +32,7 @@ create table $table (
 		  brewery 	=> 	'int',
 		  style 	=> 	'int',
 		  name 		=> 	'char',
-		  url 		=>      'varchar',
+		  url 		=>  'varchar',
 		  tasted 	=>	'date',
 		  created 	=>	'(time|time)',
 		  modified 	=>	'(date|time)',
@@ -48,7 +48,7 @@ create table $table (
 		  created 	=>	'CURRENT_TIMESTAMP', 
 		  modified 	=>	undef, 
 		  style 	=> 1,	
-          name      => 'noname',
+		  name      => 'noname',
 );
 
 # correct nullables 
@@ -56,7 +56,7 @@ create table $table (
 		  brewery   => 1, 
 		  modified 	=> 1,
 		  style 	=> 0,	
-          name      => 0, 
+		      name      => 0, 
 		  tasted    => 0,
 );
 
@@ -66,6 +66,8 @@ create table $table (
 sub run_method_tests { 
   ($class, $method,  %correct)  = @_;
   for $col (sort keys %correct) {
+#    warn "class : $class\n";
+#    warn "ISA : ", join(', ',@BeerDB::BeerTestmysql::ISA);
     $val = $class->$method($col);
 
     # Hacks for various val types
@@ -86,31 +88,35 @@ package main;
 
 $DB_Class = 'BeerDB::BeerTestmysql';
 
-my $drh = DBI->install_driver("mysql");
-my %databases = map { $_ => 1 } $drh->func('localhost', 3306, '_ListDBs');
+my $drh = eval { DBI->install_driver("mysql"); };
+$err = $@;
+if ($err) {
+  $skip_msg = "no driver for MySQL";
+} else {
+  my %databases = map { $_ => 1 } $drh->func('localhost', 3306, '_ListDBs');
 
-unless ($databases{test}) {
-  my $rc = $drh->func("createdb", 'test', 'admin');
-}
+  unless ($databases{test}) {
+    my $rc = $drh->func("createdb", 'test', 'admin');
+  }
 
-%databases = map { $_ => 1 } $drh->func('localhost', 3306, '_ListDBs');
+  %databases = map { $_ => 1 } $drh->func('localhost', 3306, '_ListDBs');
 
-if ($databases{test}) {
-  eval {$DB_Class->connection("dbi:mysql:$db", "$dbuser", "$dbpasswd"); };
-  $err = $@;
-  $skip_msg = "Could not connect to MySQL using database 'test', username 'test', and password ''. Check privileges and try again.";
-} else {
-  $err = 'no test db';
-  $skip_msg = "Could not connect to MySQL using database 'test' as it doesn't exist, sorry";
+  if ($databases{test}) {
+    eval {$DB_Class->connection("dbi:mysql:$db", "$dbuser", "$dbpasswd"); };
+    $err = $@;
+    $skip_msg = "Could not connect to MySQL using database 'test', username 'test', and password ''. Check privileges and try again.";
+  } else {
+    $err = 'no test db';
+    $skip_msg = "Could not connect to MySQL using database 'test' as it doesn't exist, sorry";
+  }
 }
-
 $skip_howmany = 22;
 
 SKIP: {
    	skip $skip_msg, $skip_howmany  if $err;
 	$DB_Class->db_Main->do("drop table if exists $table;");
 	$DB_Class->db_Main->do($sql);
-	$DB_Class->table($table); 
+	$DB_Class->table($table);
 	run_method_tests($DB_Class,'column_type', %correct_types);
 	run_method_tests($DB_Class,'column_default', %correct_defaults);
 	run_method_tests($DB_Class,'column_nullable', %correct_nullables);
@@ -121,6 +127,7 @@ SKIP: {
 package BeerDB::BeerTestsqlite;
 use base Maypole::Model::CDBI;
 package main;
+use Cwd;
 
 $DB_Class = 'BeerDB::BeerTestsqlite';
 
@@ -133,19 +140,24 @@ if ( !-e "t/test.db" ) {
 }
 unless ($err) {
 	my $driver = sqlite_driver();
-	eval { $DB_Class->connection("dbi:$driver:dbname='t/test.db'");};
+	warn "using driver : $driver";
+	my $cwd = cwd;
+	eval { $DB_Class->connection("dbi:$driver:dbname=$cwd/t/test.db");};
 	$err = $@;
 }
 
 $skip_msg = "Could not connect to SQLite database 't/test.db'";
-$skip_howmany = 22;
+$skip_howmany = 13;
 
 SKIP: {
    	skip $skip_msg, $skip_howmany  if $err; 
 	$DB_Class->table($table); 
+#use Data::Dumper; 
 	run_method_tests($DB_Class,'column_type', %correct_types);
-	run_method_tests($DB_Class,'column_default', %correct_defaults);
-	run_method_tests($DB_Class,'column_nullable', %correct_nullables);
+	# No support default
+	#run_method_tests($DB_Class,'column_default', %correct_defaults);
+	# I think sqlite driver allows everything to be nullable.
+	#run_method_tests($DB_Class,'column_nullable', %correct_nullables);
 
 };