Merge pull request #57 from php/boolean

Boolean support

Author: NattyNarwhal

ibm_db2.c

@@ -2122,6 +2122,16 @@ static int _php_db2_bind_column_helper(stmt_handle *stmt_res)
                 }
                 break;
 
+            case SQL_BOOLEAN:
+            case SQL_BIT:
+                rc = SQLBindCol((SQLHSTMT)stmt_res->hstmt, (SQLUSMALLINT)(i + 1),
+                    SQL_C_LONG, &row_data->i_val, sizeof(row_data->i_val),
+                    (SQLINTEGER *)(&stmt_res->row_data[i].out_length));
+                if ( rc == SQL_ERROR ) {
+                    _php_db2_check_sql_errors((SQLHSTMT)stmt_res->hstmt, SQL_HANDLE_STMT, rc, 1, NULL, -1, 1);
+                }
+                break;
+
             case SQL_SMALLINT:
                 rc = SQLBindCol((SQLHSTMT)stmt_res->hstmt, (SQLUSMALLINT)(i + 1),
                     SQL_C_DEFAULT, &row_data->s_val, sizeof(row_data->s_val),
@@ -4444,6 +4454,8 @@ static int _php_db2_bind_data( stmt_handle *stmt_res, param_node *curr, zval **b
     }
 
     switch ( curr->data_type ) {
+        case SQL_BOOLEAN:
+        case SQL_BIT:
         case SQL_SMALLINT:
         case SQL_INTEGER:
         case SQL_REAL:
@@ -5481,6 +5493,10 @@ PHP_FUNCTION(db2_field_type)
         RETURN_FALSE;
     }
     switch (stmt_res->column_info[col].type) {
+        case SQL_BOOLEAN:
+        case SQL_BIT:
+            str_val = "boolean";
+            break;
         case SQL_SMALLINT:
         case SQL_INTEGER:
         case SQL_BIGINT:
@@ -5931,6 +5947,9 @@ PHP_FUNCTION(db2_result)
                 }
                 break;
 
+            /* BOOLEAN can't be represented as true/false because false is considered an error */
+            case SQL_BOOLEAN:
+            case SQL_BIT:
             case SQL_SMALLINT:
             case SQL_INTEGER:
                 rc = _php_db2_get_data(stmt_res, col_num+1, SQL_C_LONG, (SQLPOINTER)&long_val, sizeof(long_val), &out_length);
@@ -6290,6 +6309,15 @@ static void _php_db2_bind_fetch_helper(INTERNAL_FUNCTION_PARAMETERS, int op)
                             strlen((char *)row_data->str_val));
                     }
                     break;
+                case SQL_BOOLEAN:
+                case SQL_BIT:
+                    if ( op & DB2_FETCH_ASSOC ) {
+                        add_assoc_bool(return_value, (char *)stmt_res->column_info[i].name, row_data->i_val);
+                    }
+                    if ( op & DB2_FETCH_INDEX ) {
+                        add_index_bool(return_value, i, row_data->i_val);
+                    }
+                    break;
                 case SQL_SMALLINT:
                     if ( op & DB2_FETCH_ASSOC ) {
                         add_assoc_long(return_value, (char *)stmt_res->column_info[i].name, row_data->s_val);

php_ibm_db2_int.h

@@ -15,6 +15,14 @@ typedef uint32_t uintptr_t;
 #endif
 #endif
 
+/*
+ * Added in IBM i 7.5, also in LUW 11.1 MP1/FP1
+ * see: https://www.ibm.com/docs/en/db2/11.1?topic=database-mod-pack-fix-pack-updates#c0061179__FP1
+ */
+#ifndef SQL_BOOLEAN
+#define SQL_BOOLEAN 16
+#endif
+
 /* Needed for backward compatibility (SQL_ATTR_DBC_SYS_NAMING not defined prior to DB2 10.1.0.2) */
 #ifndef SQL_ATTR_DBC_SYS_NAMING
 #define SQL_ATTR_DBC_SYS_NAMING 3017

tests/test_boolean.phpt

@@ -0,0 +1,67 @@
+--TEST--
+IBM-DB2: Boolean data type test.
+--SKIPIF--
+<?php
+
+require_once('skipif.inc');
+
+// This test requires IBM i 7.5 or DB2/LUW 9.7 for the boolean type
+require_once('connection.inc');
+$conn = db2_connect($database, $user, $password);
+if (!$conn) {
+	die("skip can't connect to DB:" . db2_conn_errormsg());
+}
+
+$info = db2_server_info($conn);
+if ($info->DBMS_NAME == "AS") { // IBM i
+	// DBMS_VER is VVRRM string
+	$major = $info->DBMS_VER[1];
+	$minor = $info->DBMS_VER[3];
+	$mod = $info->DBMS_VER[4];
+	if (!version_compare("$major.$minor.$mod", "7.5.0", ">=")) {
+		die("skip IBM i version too old");
+	}
+} else { // Should cover i.e. DB2/LINUX
+	// DBMS_VER is VV.RR.MMMM, version_compore should work directly
+	if (!version_compare($info->DBMS_VER, "9.7.0", ">=")) {
+		die("skip DB2 version too old");
+	}
+}
+// XXX: z
+
+?>
+--FILE--
+<?php
+
+require_once('connection.inc');
+$conn = db2_connect($database, $user, $password);
+
+if (!$conn) {
+	echo "Error connecting to database " . db2_conn_errormsg() ."\n";
+	exit;
+}
+
+$s = db2_exec($conn, "values (true, false)");
+$r = db2_fetch_array($s);
+var_dump($r);
+
+// db2_result can't return true/false due to API limitations, so these will be ints
+$s = db2_exec($conn, "values (true, false)");
+db2_fetch_row($s);
+var_dump(db2_result($s, 0));
+var_dump(db2_result($s, 1));
+echo db2_field_type($s, 1) . "\n";
+
+db2_close($conn);
+
+?>
+--EXPECT--
+array(2) {
+  [0]=>
+  bool(true)
+  [1]=>
+  bool(false)
+}
+int(1)
+int(0)
+boolean