Properly invalidate statement attributes in mariadb_st_more_results()

All attributes are invalid after trying to move to the next result.

Author: pali

dbdimp.c

@@ -4128,9 +4128,34 @@ bool mariadb_st_more_results(SV* sth, imp_sth_t* imp_sth)
     imp_sth->result= NULL;
   }
 
+  imp_sth->done_desc = FALSE;
   imp_sth->currow = 0;
   imp_sth->row_num = 0;
 
+  /* clear NUM_OF_FIELDS attribute */
+  DBIc_DBISTATE(imp_sth)->set_attr_k(sth, sv_2mortal(newSVpvs("NUM_OF_FIELDS")), 0, sv_2mortal(newSViv(0)));
+
+  /* delete cached handle attributes */
+  /* XXX should be driven by a list to ease maintenance */
+  (void)hv_deletes((HV*)SvRV(sth), "NAME", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "NULLABLE", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "NUM_OF_FIELDS", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "PRECISION", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "SCALE", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "TYPE", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_insertid", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_auto_increment", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_blob", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_key", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_num", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_pri_key", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_length", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_max_length", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_table", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_type", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_type_name", G_DISCARD);
+  (void)hv_deletes((HV*)SvRV(sth), "mariadb_warning_count", G_DISCARD);
+
   if (DBIc_ACTIVE(imp_sth))
     DBIc_ACTIVE_off(imp_sth);
 
@@ -4178,45 +4203,19 @@ bool mariadb_st_more_results(SV* sth, imp_sth_t* imp_sth)
       imp_sth->row_num = mysql_affected_rows(imp_dbh->pmysql);
 
       imp_dbh->insertid = imp_sth->insertid = mysql_insert_id(imp_dbh->pmysql);
-      /* No "real" rowset*/
-      DBIS->set_attr_k(sth, sv_2mortal(newSVpvs("NUM_OF_FIELDS")), 0,
-			               sv_2mortal(newSViv(0)));
       return TRUE;
     }
     else
     {
       /* We have a new rowset */
       imp_sth->row_num = mysql_num_rows(imp_sth->result);
 
-      /* delete cached handle attributes */
-      /* XXX should be driven by a list to ease maintenance */
-      (void)hv_deletes((HV*)SvRV(sth), "NAME", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "NULLABLE", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "NUM_OF_FIELDS", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "PRECISION", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "SCALE", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "TYPE", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_insertid", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_auto_increment", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_blob", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_key", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_num", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_is_pri_key", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_length", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_max_length", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_table", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_type", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_type_name", G_DISCARD);
-      (void)hv_deletes((HV*)SvRV(sth), "mariadb_warning_count", G_DISCARD);
-
       /* Adjust NUM_OF_FIELDS - which also adjusts the row buffer size */
       DBIc_DBISTATE(imp_sth)->set_attr_k(sth, sv_2mortal(newSVpvs("NUM_OF_FIELDS")), 0,
           sv_2mortal(newSVuv(mysql_num_fields(imp_sth->result)))
       );
 
       DBIc_ACTIVE_on(imp_sth);
-
-      imp_sth->done_desc = FALSE;
     }
     imp_dbh->pmysql->net.last_errno= 0;
     return TRUE;

t/76multi_statement.t

@@ -3,6 +3,7 @@ use warnings;
 
 use Test::More;
 use DBI;
+use DBD::MariaDB;
 use lib 't', '.';
 require 'lib.pl';
 $|= 1;
@@ -13,7 +14,7 @@ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
                       { RaiseError => 1, PrintError => 0, AutoCommit => 0,
                         mariadb_multi_statements => 1 });
 
-plan tests => 51;
+plan tests => 73;
 
 ok (defined $dbh, "Connected to database with multi statement support");
 
@@ -96,4 +97,28 @@ $dbh->{mariadb_server_prepare}= 0;
   is($dbh->last_insert_id(undef, undef, undef, undef), 10, '$dbh->last_insert_id is correct after multi statement prepare and execute without finish followed by $dbh->do');
   ok($sth->finish());
 
+  # 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"));
+  ok($sth->execute());
+  is($sth->{NUM_OF_FIELDS}, 1);
+  is($sth->{NUM_OF_PARAMS}, 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);
+  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_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} });
+
 $dbh->disconnect();