Adding execute_many() API for Batching support

Author: Ambrish Bhargava

ibm_db2.c

@@ -22,24 +22,27 @@ Cloudscape, and Apache Derby databases.
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2010-11-08</date>
- <time>15:17:22</time>
+ <date>2011-08-23</date>
+ <time>15:00:00</time>
  <version>
-  <release>1.9.1</release>
-  <api>1.9.1</api>
+  <release>1.9.2</release>
+  <api>1.9.2</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license>Apache License 2.0</license>
  <notes>
-Fix for db2_statistics (Failing with pconnect).
+Added execute_many() API to execute batch.
+Fixed: Connection hanging issue.
+Fixed: Defect #20281 (Improve error reporting)
  </notes>
  <contents>
   <dir name="/">
    <dir name="tests">
     <file baseinstalldir="ibm_db2" name="connection.inc" role="test" />
+    <file baseinstalldir="ibm_db2" name="rollbackhandler.inc" role="test" />
     <file baseinstalldir="ibm_db2" name="escape.dat" role="test" />
     <file baseinstalldir="ibm_db2" name="pic1.jpg" role="test" />
     <file baseinstalldir="ibm_db2" name="resume_000130.txt" role="test" />
@@ -265,6 +268,10 @@ Fix for db2_statistics (Failing with pconnect).
     <file baseinstalldir="ibm_db2" name="test_trusted_context_pconnect.phpt" role="test" />
     <file baseinstalldir="ibm_db2" name="test_000_PrepareDb.phpt" role="test" />
     <file baseinstalldir="ibm_db2" name="trusted_connection.inc" role="test" />
+    <file baseinstalldir="ibm_db2" name="test_graphic_data_type.phpt" role="test" />
+    <file baseinstalldir="ibm_db2" name="test_check_rollback.phpt" role="test" />
+    <file baseinstalldir="ibm_db2" name="test_connect_deallocator.phpt" role="test" />
+    <file baseinstalldir="ibm_db2" name="test_execute_many.phpt" role="test" />
    </dir> <!-- //tests -->
    <file baseinstalldir="ibm_db2" name="config.m4" role="src" />
    <file baseinstalldir="ibm_db2" name="config.w32" role="src" />

package.xml

@@ -16,13 +16,14 @@
   | permissions and limitations under the License.                       |
   +----------------------------------------------------------------------+
   | Authors: Sushant Koduru, Lynh Nguyen, Kanchana Padmanabhan,          |
-  |          Dan Scott, Helmut Tessarek, Ambrish Bhargava                |
+  |          Dan Scott, Helmut Tessarek, Ambrish Bhargava,               |
+  |          Rahul Priyadarshi                                           |
   +----------------------------------------------------------------------+
 
   $Id$
 */
 
-#define	PHP_IBM_DB2_VERSION	"1.9.1"
+#define	PHP_IBM_DB2_VERSION	"1.9.2"
 
 #ifndef PHP_IBM_DB2_H
 #define PHP_IBM_DB2_H
@@ -224,6 +225,7 @@ PHP_FUNCTION(db2_commit);
 PHP_FUNCTION(db2_exec);
 PHP_FUNCTION(db2_prepare);
 PHP_FUNCTION(db2_execute);
+PHP_FUNCTION(db2_execute_many);
 PHP_FUNCTION(db2_conn_errormsg);
 PHP_FUNCTION(db2_stmt_errormsg);
 PHP_FUNCTION(db2_conn_error);

php_ibm_db2.h

@@ -0,0 +1,6 @@
+<?php
+require_once('connection.inc');
+if($url == "no url") {
+  die('skip');
+}
+?>

tests/rollbackhandler.inc

@@ -28,6 +28,11 @@ Name:    ANIMALS
 Type:    TABLE
 Remarks: 
 
+Schema:  %s
+Name:    ANIMAL_PICS
+Type:    TABLE
+Remarks: 
+
 Schema:  %s
 Name:    ANIME_CAT
 Type:    VIEW

tests/test_066_TableObjects.phpt

@@ -0,0 +1,87 @@
+--TEST--
+IBM-DB2: pConnect Rollback Handler Test.
+--SKIPIF--
+<?php require_once('rollbackhandler.inc'); ?>
+--FILE--
+<?php
+  require_once('connection.inc');
+
+  $conn = db2_connect($database, $user, $password);
+
+  db2_autocommit($conn,DB2_AUTOCOMMIT_ON);
+
+  function prepare() {
+    global $conn;
+
+    $stmtCreate = db2_exec($conn,"create table rollbacktest(id integer primary key not null, charval varchar(20))");
+    
+    if($stmtCreate) {
+      return 1;
+    } else {
+      echo "creation of table failed\n";
+      $err = db2_stmt_errormsg();
+      print "done $err";
+      return 0;
+    }
+  }
+
+  function cleanup() {
+    global $conn;
+
+    $stmtdrop = db2_exec($conn,"drop table rollbacktest");
+
+    if($stmtdrop) {
+      return 1;
+    } else {
+      echo "drop table failed\n";
+      return 0;
+    }
+  }
+
+  function callURL() {
+    global $url,$database,$user,$password,$hostname,$port;
+    $myurl = "$url?database=$database&user=$user&password=$password&host=$hostname&port=$port";
+    $ch = curl_init($myurl);
+    if( $ch ) {
+      curl_exec($ch);
+    } else {
+      echo "URL specified is not valid";
+    }
+  }
+
+  function checkTest() {
+    global $conn;
+    $stmt = db2_exec($conn,"insert into rollbacktest (id,charval) values (1,'rolled back')");
+    if ( $stmt) {
+      echo "Test successful\n";
+    } else {
+       echo "Test failed\n";
+       $err = db2_stmt_errormsg();
+       print "$err";
+    }
+  }
+
+  function main() {
+    $retVal = prepare();
+    if( $retVal ){
+      callURL();
+      checkTest();
+      cleanup();
+    } else {
+      echo "DB preapre failed \n";
+    }
+  }
+
+  if ($conn) {
+     echo "Connection succeeded.\n" ;
+     main();
+  } else {
+     echo "Connection failed. \n";
+     print db2_conn_errormsg($conn);
+  }
+?>
+--EXPECT--
+Connection succeeded.
+Connection succeeded.
+row insert went through successfully
+Test successful