Merge pull request #130

Fix return value of $sth->rows when error occurred

Author: pali

MariaDB.xs

@@ -236,6 +236,8 @@ rows(sth)
             XSRETURN_UNDEF;
         }
     }
+    if (imp_sth->row_num == (my_ulonglong)-1)
+        XSRETURN_IV(-1);
     RETVAL = my_ulonglong2sv(imp_sth->row_num);
   OUTPUT:
     RETVAL

dbdimp.c

@@ -3777,7 +3777,7 @@ mariadb_st_prepare_sv(
   imp_sth->done_desc = FALSE;
   imp_sth->result = NULL;
   imp_sth->currow = 0;
-  imp_sth->row_num = 0;
+  imp_sth->row_num = (my_ulonglong)-1;
 
   if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
     PerlIO_printf(DBIc_LOGPIO(imp_xxh),
@@ -4139,7 +4139,7 @@ bool mariadb_st_more_results(SV* sth, imp_sth_t* imp_sth)
 
   imp_sth->done_desc = FALSE;
   imp_sth->currow = 0;
-  imp_sth->row_num = 0;
+  imp_sth->row_num = (my_ulonglong)-1;
 
   /* clear NUM_OF_FIELDS attribute */
   DBIc_DBISTATE(imp_sth)->set_attr_k(sth, sv_2mortal(newSVpvs("NUM_OF_FIELDS")), 0, sv_2mortal(newSViv(0)));

t/35prepare.t

@@ -64,7 +64,7 @@ for (my $i = 0 ; $i < 10; $i++)
    # save these values for later testing
   $testInsertVals->{$i}= $random_chars;
   ok($rows= $sth->execute($i, $random_chars), "Testing insert row");
-  ok($rows= 1, "Should have inserted one row");
+  is($rows, 1, "Should have inserted one row");
 }
 
 ok($sth= $dbh->prepare("SELECT * FROM dbd_mysql_t35prepare WHERE id = ? OR id = ?"),

t/40numrows.t

@@ -10,7 +10,7 @@ require 'lib.pl';
 my ($dbh, $sth, $aref);
 $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
                       { RaiseError => 1, PrintError => 0, AutoCommit => 0 });
-plan tests => 2*29 + 1;
+plan tests => 2*36 + 1;
 
 for my $mariadb_server_prepare (0, 1) {
 
@@ -29,6 +29,8 @@ ok $dbh->do("INSERT INTO dbd_mysql_t40numrows VALUES( 1, 'Alligator Descartes' )
 
 ok ($sth = $dbh->prepare("SELECT * FROM dbd_mysql_t40numrows WHERE id = 1"));
 
+is $sth->rows, -1, '$sth->rows prior execute is unknown (-1)';
+
 ok $sth->execute;
 
 is $sth->rows, 1, '$sth->rows should be 1';
@@ -43,6 +45,8 @@ ok $dbh->do("INSERT INTO dbd_mysql_t40numrows VALUES( 2, 'Jochen Wiedmann' )"),
 
 ok ($sth = $dbh->prepare("SELECT * FROM dbd_mysql_t40numrows WHERE id >= 1"));
 
+is $sth->rows, -1, '$sth->rows prior execute is unknown (-1)';
+
 ok $sth->execute;
 
 is $sth->rows, 2, '$sth->rows should be 2';
@@ -57,6 +61,8 @@ ok $dbh->do("INSERT INTO dbd_mysql_t40numrows VALUES(3, 'Tim Bunce')"), "inserti
 
 ok ($sth = $dbh->prepare("SELECT * FROM dbd_mysql_t40numrows WHERE id >= 2"));
 
+is $sth->rows, -1, '$sth->rows prior execute is unknown (-1)';
+
 ok $sth->execute;
 
 is $sth->rows, 2, 'rows should be 2';
@@ -69,6 +75,8 @@ is $sth->rows, 2, 'rows still should be 2';
 
 ok ($sth = $dbh->prepare("SELECT * FROM dbd_mysql_t40numrows"));
 
+is $sth->rows, -1, '$sth->rows prior execute is unknown (-1)';
+
 ok $sth->execute;
 
 is $sth->rows, 3, 'rows should be 3';
@@ -79,6 +87,15 @@ is scalar @$aref, 3, 'Verified rows should be 3';
 
 is $sth->rows, 3, 'rows still should be 3';
 
+my $sth = eval { $dbh->prepare("SYNTAX ERROR") };
+if ($sth) {
+  is $sth->rows, -1, '$sth->rows prior execute is unknown (-1)';
+  ok !eval { $sth->execute() }, '$sth->execute for SYNTAX ERROR failed';
+  is $sth->rows, -1, '$sth->rows for SYNTAX ERROR is unknown (-1)';
+} else {
+  pass '$dbh->prepare for SYNTAX ERROR failed' for 1..3;
+}
+
 ok $dbh->do("DROP TEMPORARY TABLE dbd_mysql_t40numrows"), "drop table dbd_mysql_t40numrows";
 
 }

t/76multi_statement.t

@@ -14,7 +14,7 @@ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
                       { RaiseError => 1, PrintError => 0, AutoCommit => 0,
                         mariadb_multi_statements => 1 });
 
-plan tests => 71;
+plan tests => 77;
 
 ok (defined $dbh, "Connected to database with multi statement support");
 
@@ -34,6 +34,7 @@ $dbh->{mariadb_server_prepare}= 0;
   # Check that more_results works for non-SELECT results too
   my $sth;
   ok($sth = $dbh->prepare("UPDATE dbd_mysql_t76multi SET a=5 WHERE a=1; UPDATE dbd_mysql_t76multi SET a='6suffix' WHERE a<4"));
+  is($sth->rows, -1);
   ok($sth->execute(), "Execute updates");
   is($sth->rows, 1, "First update affected 1 row");
   is($sth->{mariadb_warning_count}, 0, "First update had no warnings");
@@ -98,25 +99,30 @@ $dbh->{mariadb_server_prepare}= 0;
   # Check that statement attributes are correct after calling more_results
   ok($dbh->do("CREATE TEMPORARY TABLE dbd_mysql_t76multi3 (name_id1 INT, name_id2 INT)"));
   ok($sth = $dbh->prepare("SELECT name_id1 FROM dbd_mysql_t76multi3; INSERT INTO dbd_mysql_t76multi2 VALUES(11); SELECT name_id1, name_id2 FROM dbd_mysql_t76multi3; SYNTAX ERROR"));
+  is($sth->rows, -1);
   ok($sth->execute());
   is($sth->{NUM_OF_FIELDS}, 1);
   is($sth->{NUM_OF_PARAMS}, 0);
+  is($sth->rows, 0);
   is_deeply($sth->{NAME}, [ 'name_id1' ]);
   is_deeply($sth->{mariadb_type}, [ DBD::MariaDB::TYPE_LONG ]);
   ok($sth->more_results());
   is($sth->{NUM_OF_FIELDS}, 0);
   is($sth->{NUM_OF_PARAMS}, 0);
+  is($sth->rows, 1);
   ok(!eval { $sth->{NAME} });
   ok(!eval { $sth->{mariadb_type} });
   ok($sth->more_results());
   is($sth->{NUM_OF_FIELDS}, 2);
   is($sth->{NUM_OF_PARAMS}, 0);
+  is($sth->rows, 0);
   is_deeply($sth->{NAME}, [ 'name_id1', 'name_id2' ]);
   is_deeply($sth->{mariadb_type}, [ DBD::MariaDB::TYPE_LONG, DBD::MariaDB::TYPE_LONG ]);
   ok(!eval { $sth->more_results() });
   is($sth->{NUM_OF_FIELDS}, 0);
   is($sth->{NUM_OF_PARAMS}, 0);
   ok(!eval { $sth->{NAME} });
   ok(!eval { $sth->{mariadb_type} });
+  is($sth->rows, -1);
 
 $dbh->disconnect();