fixes to Makefile

[maypole.git] / t / db_colinfo.t

diff --git a/t/db_colinfo.t b/t/db_colinfo.t
index 50f885f5971aa1d67b75df227837b2ba4a28b5ef..3b20f8dcd463376f32fc158047e0a184b5bb58d5 100755 (executable)
--- a/t/db_colinfo.t
+++ b/t/db_colinfo.t
@@ -4,8 +4,13 @@ use Data::Dumper;
 use DBI;
 use lib 'examples'; # Where BeerDB should live
 BEGIN {
-       my $drh = eval { DBI->install_driver("mysql"); };
-        my $testcount = ($@) ? 45 : 65 ;
+       my $drh = eval {
+         DBI->install_driver("mysql");
+         my @databases = DBI->data_sources("mysql");
+         die "couldn't connect to mysql" unless (@databases);
+       };
+       warn "error : $@ \n" if ($@);
+        my $testcount = ($@) ? 45 : 64 ;
         plan tests => $testcount;
 }
 
@@ -133,10 +138,10 @@ SKIP: {
        }
 
        foreach my $colname (keys %correct_nullables) {
-           ok( $DB_Class->column_required($colname) == !$correct_nullables{$colname}, "nullable column $colname is required (via column_required)" )
+         ok( $DB_Class->column_required($colname) == !$correct_nullables{$colname}, "nullable column $colname is required (via column_required)" )
        }
 
-       ok($DB_Class->required_columns([qw/score/]), 'set required column(s)');
+       ok($DB_Class->required_columns([qw/style name tasted score/]), 'set required column(s)');
        
        foreach my $colname ( @{$DB_Class->required_columns()} ) {
            ok($correct_nullables{$colname} == 0 || $colname eq 'score',"nullable or required column $colname is required (via required_columns)" );