Version Change

Author: Rahul Priyadarshi

config.m4

@@ -17,10 +17,27 @@ PHP_ARG_WITH(IBM_DB2, for IBM_DB2 support,
 dnl PHP_ARG_ENABLE(IBM_DB2, whether to enable IBM_DB2 support,
 dnl Make sure that the comment is aligned:
 dnl [  --enable-IBM_DB2           Enable IBM_DB2 support])
-
 if test "$PHP_IBM_DB2" != "no"; then
+  dnl # checking php 32/64 bit php
+  AC_MSG_CHECKING(PHP)
+  if test `php -r 'echo PHP_INT_SIZE;'` == 8; then
+    machine_bits=64
+    libDir=lib64
+    AC_MSG_RESULT(Detected 64-bit PHP)
+  else
+    machine_bits=32
+    libDir=lib32
+    AC_MSG_RESULT(Detected 32-bit PHP)
+  fi
+  AC_MSG_CHECKING(IBM_DB_HOME location)
+  if test $IBM_DB_HOME ; then
+    SEARCH_PATH=$IBM_DB_HOME
+    AC_MSG_RESULT($IBM_DB_HOME)
+  else
+    AC_MSG_RESULT(not found)
+  fi
   dnl # --with-IBM_DB2 -> check with-path  	 
-  SEARCH_PATH="$PHP_IBM_DB2_LIB $PHP_IBM_DB2 $DB2PATH $DB2DIR"
+  SEARCH_PATH="$PHP_IBM_DB2_LIB $SEARCH_PATH $PHP_IBM_DB2 $DB2PATH $DB2DIR"
 
   AC_MSG_CHECKING(Looking for DB2 CLI libraries)
   for i in $SEARCH_PATH ; do
@@ -32,17 +49,9 @@ if test "$PHP_IBM_DB2" != "no"; then
     else
       AC_MSG_RESULT()
     fi
-    AC_MSG_CHECKING([     in $i/lib64])
-    if test -r $i/lib64/libdb2.so || test -r $i/lib64/libdb2.a || test -r $i/lib64/libdb400.a || test -r $i/lib64/libdb2.dylib ; then
-      LIB_DIR="$i/lib64/"
-      AC_MSG_RESULT(found)
-      break
-    else
-      AC_MSG_RESULT()
-    fi
-    AC_MSG_CHECKING([     in $i/lib32])
-    if test -r $i/lib32/libdb2.so || test -r $i/lib32/libdb2.a || test -r $i/lib32/libdb400.a || test -r $i/lib32/libdb2.dylib ; then
-      LIB_DIR="$i/lib32/"
+    AC_MSG_CHECKING([     in $i/$libDir])
+    if test -r $i/$libDir/libdb2.so || test -r $i/$libDir/libdb2.a || test -r $i/$libDir/libdb400.a || test -r $i/$libDir/libdb2.dylib ; then
+      LIB_DIR="$i/$libDir/"
       AC_MSG_RESULT(found)
       break
     else
@@ -60,7 +69,11 @@ if test "$PHP_IBM_DB2" != "no"; then
 
   if test -z "$LIB_DIR"; then
     AC_MSG_RESULT([not found])
-    AC_MSG_ERROR([Please reinstall the DB2 CLI distribution])
+    if test $IBM_DB_HOME ; then
+      AC_MSG_ERROR([Cannot find DB2 CLI libraries. Check if you have set the IBM_DB_HOME environment variable's value correctly])
+    else
+       AC_MSG_ERROR([Environment variable IBM_DB_HOME is not set. Set it to your DB2/IBM_Data_Server_Driver installation directory and retry ibm_db2 module install])
+    fi
   fi
 
   AC_MSG_CHECKING([for DB2 CLI include files in default path])

ibm_db2.c

@@ -1711,7 +1711,6 @@ static int _php_db2_get_result_set_info(stmt_handle *stmt_res TSRMLS_DC)
 		} else {
 			stmt_res->column_info[i].name = (SQLCHAR *)estrdup(tmp_name);
 		}
-#ifdef PASE /* i5/OS size changes for "common" converts */
 		switch (stmt_res->column_info[i].type) {
 		        /* BIGINT 9223372036854775807  (2^63-1) string convert */
 			case SQL_BIGINT: 
@@ -1720,7 +1719,6 @@ static int _php_db2_get_result_set_info(stmt_handle *stmt_res TSRMLS_DC)
 			default:
 			    break;
 		}
-#endif /* PASE */
 #ifdef PASE /* i5/OS DBCS may have up to 6 times growth in column alloc size on convert */
 		if (stmt_res->s_i5_dbcs_alloc) {
 		    switch (stmt_res->column_info[i].type) {
@@ -2065,7 +2063,7 @@ static int _php_db2_connect_helper( INTERNAL_FUNCTION_PARAMETERS, conn_handle **
 		} else {
 			/* Need to check for max pconnections? */
 		}
-		if (*pconn_res == NULL) {
+		if ((*pconn_res == NULL) || (reused == 0)) {
 			conn_res = *pconn_res =
 				(conn_handle *) (isPersistent ?  pecalloc(1, sizeof(conn_handle), 1) : ecalloc(1, sizeof(conn_handle)));
 		}
@@ -2172,7 +2170,7 @@ static int _php_db2_connect_helper( INTERNAL_FUNCTION_PARAMETERS, conn_handle **
 						(SQLCHAR *)password, (SQLSMALLINT)password_len );
 			}
 
-			if ( rc != SQL_SUCCESS ) {
+			if ( rc == SQL_ERROR ) {
 				_php_db2_check_sql_errors(conn_res->hdbc, SQL_HANDLE_DBC, rc, 1, NULL, -1, 1 TSRMLS_CC);
 				SQLFreeHandle( SQL_HANDLE_DBC, conn_res->hdbc );
 				SQLFreeHandle(SQL_HANDLE_ENV, conn_res->henv);
@@ -2613,12 +2611,10 @@ PHP_FUNCTION(db2_bind_param)
 						sql_precision = (SQLUINTEGER)precision;
 					}
 				}
-#ifdef PASE /* i5/OS BIGINT to string too small */
 				else if((sql_data_type == SQL_BIGINT) && ((param_type == DB2_PARAM_OUT) || (param_type == DB2_PARAM_INOUT))) 
 				{
 					sql_precision = 20;
 				}
-#endif
 				/* Add to cache */
 				_php_db2_add_param_cache( stmt_res, (SQLUSMALLINT)param_no, varname, varname_len, param_type, sql_data_type, sql_precision, sql_scale, sql_nullable );
 				break;
@@ -2638,12 +2634,10 @@ PHP_FUNCTION(db2_bind_param)
 						sql_precision = 1048576;
 					}
 				}
-#ifdef PASE /* i5/OS BIGINT to string too small */
 				else if((sql_data_type == SQL_BIGINT) && ((param_type == DB2_PARAM_OUT) || (param_type == DB2_PARAM_INOUT))) 
 				{
 					sql_precision = 20;
 				}
-#endif
 				_php_db2_add_param_cache( stmt_res, (SQLUSMALLINT)param_no, varname, varname_len, param_type, sql_data_type, sql_precision, sql_scale, sql_nullable );
 				break;
 
@@ -3660,19 +3654,14 @@ static int _php_db2_bind_data( stmt_handle *stmt_res, param_node *curr, zval **b
 	MAKE_STD_ZVAL(curr->value);
 
 	switch ( curr->data_type ) {
-#ifndef PASE /* i5/OS int not big enough */
-		case SQL_BIGINT:
-#endif
 		case SQL_SMALLINT:
 		case SQL_INTEGER:
 		case SQL_REAL:
 		case SQL_FLOAT:
 		case SQL_DOUBLE:
 			break;
 
-#ifdef PASE /* i5/OS int not big enough */
 		case SQL_BIGINT:
-#endif
 		case SQL_CHAR:
 		case SQL_VARCHAR:
 		case SQL_WCHAR:

package.xml

@@ -16,34 +16,29 @@ Cloudscape, and Apache Derby databases.
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <lead>
-  <name>Ambrish Bhargava</name>
-  <user>ambrish</user>
-  <email>[email protected]</email>
-  <active>yes</active>
- </lead>
  <lead>
   <name>IBM OpenDev</name>
   <user>kfbombar</user>
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2012-03-12</date>
- <time>12:10:00</time>
+ <date>2012-08-10</date>
+ <time>12:50:00</time>
  <version>
-  <release>1.9.3</release>
-  <api>1.9.3</api>
+  <release>1.9.4</release>
+  <api>1.9.4</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license>Apache License 2.0</license>
  <notes>
-  Fixed: Garbage value for VARCHAR type OUT variable of stored-procedure
-  Fixed: Compilation error with php-5.4.x
-  i5/OS: Remove compile errors during IBM i compiles due to chaining support
-  i5/OS: Allow use of V6+ (SQL_ATTR_INFO_ACCTSTR, SQL_ATTR_INFO_APPLNAME, SQL_ATTR_INFO_PROGRAMID, SQL_ATTR_INFO_USERID, SQL_ATTR_INFO_WRKSTNNAME connection attributes)
+  Fixed: DB2 PHP driver does not work as expected with values in BIGINT column
+  Added: test case test_bigint.phpt for BIGINT datatype
+  Fixed: Persistent connections takes up to 1 hour to reconnect on db2 TSA HA failover
+  FIxed: Fixed: Allow trial license to connect ZOS/i5
+  Added a environment variable IBM_DB_HOME to make the installation process easy and config script will automatically detect the architecure for which PHP is built and accordingly use the libraries under lib32/lib64.
  </notes>
  <contents>
   <dir name="/">
@@ -279,6 +274,7 @@ Cloudscape, and Apache Derby databases.
     <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" />
+    <file baseinstalldir="ibm_db2" name="test_bigint.phpt" role="test" />
    </dir> <!-- //tests -->
    <file baseinstalldir="ibm_db2" name="config.m4" role="src" />
    <file baseinstalldir="ibm_db2" name="config.w32" role="src" />

php_ibm_db2.h

@@ -23,7 +23,7 @@
   $Id$
 */
 
-#define	PHP_IBM_DB2_VERSION	"1.9.3"
+#define	PHP_IBM_DB2_VERSION	"1.9.4"
 
 #ifndef PHP_IBM_DB2_H
 #define PHP_IBM_DB2_H