Merge pull request #133

Fix some tests

Author: pali

t/29warnings.t

@@ -12,11 +12,6 @@ use vars qw($test_dsn $test_user $test_password);
 my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
                       { RaiseError => 1, PrintError => 0, AutoCommit => 0 });
 
-my $expected_warnings = 2;
-if ($dbh->{mariadb_serverversion} >= 50000 && $dbh->{mariadb_serverversion} < 50500) {
-    $expected_warnings = 1;
-}
-
 plan tests => 14;
 
 ok(defined $dbh, "Connected to database");
@@ -43,15 +38,14 @@ ok($sth->execute());
 
 is($sth->{'mariadb_warning_count'}, 2 );
 
-# $dbh->{mariadb_info} actually uses mysql_info()
-my $str = $dbh->{mariadb_info};
-my $numwarn;
-if ( $str =~ /Warnings:\s(\d+)$/ ) {
-    $numwarn = $1;
-}
-
 # this test passes on mysql 5.5.x and fails on 5.1.x
-# but I'm not sure which versions, so I'll just disable it for now
-is($numwarn, $expected_warnings);
+# so change number of expected warnings from mysql_info()
+my $expected_warnings = 2;
+if ($dbh->{mariadb_serverversion} >= 50000 && $dbh->{mariadb_serverversion} < 50500) {
+    $expected_warnings = 1;
+}
+# $dbh->{mariadb_info} actually uses mysql_info()
+my $info = $dbh->{mariadb_info};
+like($info, qr/Warnings:\s\Q$expected_warnings\E$/);
 
 ok($dbh->disconnect);

t/41int_min_max.t

@@ -17,7 +17,7 @@ if ($dbh->{mariadb_serverversion} < 50002) {
         "SKIP TEST: You must have MySQL version 5.0.2 and greater for this test to run";
 }
 # nostrict tests + strict tests + init/tear down commands
-plan tests => (19*8 + 19*8 + 4) * 2;
+plan tests => (19*8 + 19*8 + 3) * 2;
 
 my $table = 'dbd_mysql_t41minmax'; # name of the table we will be using
 my $mode; # 'strict' or 'nostrict' corresponds to strict SQL mode
@@ -26,9 +26,8 @@ sub test_int_type ($$$$) {
     my ($perl_type, $mariadb_type, $min, $max) = @_;
 
     # Create the table
-    ok($dbh->do(qq{DROP TABLE IF EXISTS $table}), "removing $table");
     ok($dbh->do(qq{
-            CREATE TABLE `$table` (
+            CREATE TEMPORARY TABLE `$table` (
                 `id` int not null auto_increment,
                 `val` $mariadb_type,
                 primary key (id)
@@ -38,7 +37,7 @@ sub test_int_type ($$$$) {
     my ($store, $retrieve); # statements
     my $read_value;         # retrieved value
     ok($store = $dbh->prepare("INSERT INTO $table (val) VALUES (?)"));
-    ok($retrieve = $dbh->prepare("SELECT val from $table where id=(SELECT MAX(id) FROM $table)"));
+    ok($retrieve = $dbh->prepare("SELECT val from $table ORDER BY id DESC LIMIT 1"));
 
     ########################################
     # Insert allowed min value
@@ -107,6 +106,8 @@ sub test_int_type ($$$$) {
         ($read_value) = $retrieve->fetchrow_array();
         cmp_ok($read_value, 'eq', $max, "retrieved maximal value for type $mariadb_type, mode=$mode");
     };
+
+    ok($dbh->do(qq{DROP TEMPORARY TABLE `$table`}), "removing $table");
 }
 
 $dbh->disconnect;
@@ -141,7 +142,5 @@ test_int_type(DBI::SQL_INTEGER,  'int unsigned',           0, 2**32-1);
 test_int_type(DBI::SQL_BIGINT,   'bigint signed',     -2**63, 2**63-1);
 test_int_type(DBI::SQL_BIGINT,   'bigint unsigned',        0, 2**64-1);
 
-ok ($dbh->do("DROP TABLE $table"));
-
 ok $dbh->disconnect;
 }

t/50commit.t

@@ -39,9 +39,11 @@ sub num_rows($$$) {
 
 my $engines = $dbh->selectall_hashref('SHOW ENGINES', 'Engine');
 my $have_innodb = exists $engines->{InnoDB} && $engines->{InnoDB}->{Support} ne 'NO';
+my $have_myisam = exists $engines->{MyISAM} && $engines->{MyISAM}->{Support} ne 'NO';
+
+plan tests => 1 + ($have_myisam ? 12 : 0) + ($have_innodb ? 22 : 0);
 
 if ($have_innodb) {
-  plan tests => 22;
 
   ok $dbh->do("DROP TABLE IF EXISTS dbd_mysql_t50commit"), "drop table if exists dbd_mysql_t50commit";
   my $create =<<EOT;
@@ -100,15 +102,15 @@ EOT
   ok $dbh->do("DROP TABLE dbd_mysql_t50commit");
 
 }
-else {
-  plan tests => 13;
+
+if ($have_myisam) {
 
   ok $dbh->do("DROP TABLE IF EXISTS dbd_mysql_t50commit"), "drop table if exists dbd_mysql_t50commit";
   my $create =<<EOT;
   CREATE TABLE dbd_mysql_t50commit (
       id INT(4) NOT NULL default 0,
       name VARCHAR(64) NOT NULL default ''
-      )
+      ) ENGINE=MyISAM
 EOT
 
   ok $dbh->do($create), 'create dbd_mysql_t50commit';
@@ -154,5 +156,7 @@ EOT
   ok $got_warning, "Should be warning defined upon rollback of non-trx table";
 
   ok $dbh->do("DROP TABLE dbd_mysql_t50commit");
-  ok $dbh->disconnect();
+
 }
+
+ok $dbh->disconnect();