X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=t%2Fdb_colinfo.t;fp=t%2Fdb_colinfo.t;h=b387769c9e8e9e8edf54f896211dea92c013c7f4;hb=90b7b082066bee6303621aab49b166546445085c;hp=c56fbf28497b2b954345059a1d6816474574885d;hpb=745badbb1417451398a0f983c450fd8725794f65;p=maypole.git

diff --git a/t/db_colinfo.t b/t/db_colinfo.t
index c56fbf2..b387769 100755
--- a/t/db_colinfo.t
+++ b/t/db_colinfo.t
@@ -1,5 +1,6 @@
 #!/usr/bin/perl -w
 use Test::More;
+use Data::Dumper;
 use lib 'ex'; # Where BeerDB should live
 BEGIN {
    plan tests => 35;
@@ -56,7 +57,7 @@ create table $table (
 		  brewery   => 1, 
 		  modified 	=> 1,
 		  style 	=> 0,	
-		      name      => 0, 
+		  name      => 0, 
 		  tasted    => 0,
 );
 
@@ -76,6 +77,7 @@ sub run_method_tests {
     my $correct = $correct{$col};
     like($val, qr/$correct/,"$method $col is $val");
   }
+
 }
 
 
@@ -83,7 +85,7 @@ sub run_method_tests {
 
 # Make test class 
 package BeerDB::BeerTestmysql;
-use base Maypole::Model::CDBI;
+use base qw(Maypole::Model::CDBI Class::DBI);
 package main;
 
 $DB_Class = 'BeerDB::BeerTestmysql';
@@ -117,6 +119,8 @@ SKIP: {
 	$DB_Class->db_Main->do("drop table if exists $table;");
 	$DB_Class->db_Main->do($sql);
 	$DB_Class->table($table);
+	$DB_Class->columns(All => keys %correct_types);
+	$DB_Class->columns(Primary => 'id');
 	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);
@@ -125,7 +129,7 @@ SKIP: {
 # SQLite  test
 
 package BeerDB::BeerTestsqlite;
-use base Maypole::Model::CDBI;
+use base qw(Maypole::Model::CDBI Class::DBI);
 package main;
 use Cwd;
 
@@ -152,6 +156,8 @@ $skip_howmany = 13;
 SKIP: {
    	skip $skip_msg, $skip_howmany  if $err; 
 	$DB_Class->table($table); 
+	$DB_Class->columns(All => keys %correct_types);
+	$DB_Class->columns(Primary => 'id');
 #use Data::Dumper; 
 	run_method_tests($DB_Class,'column_type', %correct_types);
 	# No support default