X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=t%2Fdb_colinfo.t;fp=t%2Fdb_colinfo.t;h=ed526fc2182e31c709520ec1a5f8adbb719c0fab;hb=833895f46fdd117b0416acff264041af2ce6f46a;hp=ef2466fb002aa067a85aebf2fbed03dcd6008d77;hpb=d3bd3060bf3f11775d9f40ee983f71949404f794;p=maypole.git diff --git a/t/db_colinfo.t b/t/db_colinfo.t index ef2466f..ed526fc 100755 --- a/t/db_colinfo.t +++ b/t/db_colinfo.t @@ -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 @@ -110,7 +112,7 @@ 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 +123,7 @@ SKIP: { package BeerDB::BeerTestsqlite; use base Maypole::Model::CDBI; package main; +use Cwd; $DB_Class = 'BeerDB::BeerTestsqlite'; @@ -133,7 +136,9 @@ 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 = $@; }