Add to SQL_BINARY and PDO_PARAM_BINARY in PDO_ODBC

...including a test.

I'm not sure if the semantics are right here though. This does binary
data if the DB returns it, instead of listening to the PDO param type.
This does mean that binary data works like expected, but the binary
bound to SQL_C_CHAR converting behaviour in some drivers[1] may be
desired and specified instead...

[1]: At least Db2i and SQL Server's drivers, when I tested them.

Author: NattyNarwhal

ext/pdo_odbc/odbc_stmt.c

@@ -32,6 +32,18 @@ enum pdo_odbc_conv_result {
 	PDO_ODBC_CONV_FAIL
 };
 
+/*
+ * Used for determing if we should use SQL_C_BINARY on binary columns
+ * XXX: Callers use what ODBC returns, rather that what user told PDO,
+ * need to propagate
+ */
+static bool php_odbc_sqltype_is_binary(SWORD sqltype) {
+	if (sqltype == SQL_BINARY || sqltype == SQL_VARBINARY || sqltype == SQL_LONGVARBINARY) {
+		return true;
+	}
+	return false;
+}
+
 static int pdo_odbc_sqltype_is_unicode(pdo_odbc_stmt *S, SWORD sqltype)
 {
 	if (!S->assume_utf8) return 0;
@@ -621,7 +633,7 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno)
 		S->cols[colno].is_long = 0;
 
 		rc = SQLBindCol(S->stmt, colno+1,
-			S->cols[colno].is_unicode ? SQL_C_BINARY : SQL_C_CHAR,
+			(php_odbc_sqltype_is_binary(S->cols[colno].coltype) || S->cols[colno].is_unicode) ? SQL_C_BINARY : SQL_C_CHAR,
 			S->cols[colno].data,
 			S->cols[colno].datalen+1, &S->cols[colno].fetched_len);
 
@@ -642,8 +654,15 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno)
 
 static int odbc_stmt_get_column_meta(pdo_stmt_t *stmt, zend_long colno, zval *return_value)
 {
+	pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
+	pdo_odbc_column *C = &S->cols[colno];
+
 	array_init(return_value);
-	add_assoc_long(return_value, "pdo_type", PDO_PARAM_STR);
+	if (php_odbc_sqltype_is_binary(C->coltype)) {
+		add_assoc_long(return_value, "pdo_type", PDO_PARAM_BINARY);
+	} else {
+		add_assoc_long(return_value, "pdo_type", PDO_PARAM_STR);
+	}
 	return 1;
 }
 
@@ -652,6 +671,7 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, zval *result, enum pdo
 	pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
 	pdo_odbc_column *C = &S->cols[colno];
 
+	SQLSMALLINT c_type = (php_odbc_sqltype_is_binary(C->coltype) || C->is_unicode) ? SQL_C_BINARY : SQL_C_CHAR;
 	/* if it is a column containing "long" data, perform late binding now */
 	if (C->is_long) {
 		SQLLEN orig_fetched_len = SQL_NULL_DATA;
@@ -661,7 +681,7 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, zval *result, enum pdo
 		 * of 256 bytes; if there is more to be had, we then allocate
 		 * bigger buffer for the caller to free */
 
-		rc = SQLGetData(S->stmt, colno+1, C->is_unicode ? SQL_C_BINARY : SQL_C_CHAR, C->data,
+		rc = SQLGetData(S->stmt, colno+1, c_type, C->data,
  			256, &C->fetched_len);
 		orig_fetched_len = C->fetched_len;
 
@@ -688,7 +708,7 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, zval *result, enum pdo
 			do {
 				C->fetched_len = 0;
 				/* read block. 256 bytes => 255 bytes are actually read, the last 1 is NULL */
-				rc = SQLGetData(S->stmt, colno+1, C->is_unicode ? SQL_C_BINARY : SQL_C_CHAR, buf2, 256, &C->fetched_len);
+				rc = SQLGetData(S->stmt, colno+1, c_type, buf2, 256, &C->fetched_len);
 
 				/* adjust `used` in case we have length info from the driver */
 				if (orig_fetched_len >= 0 && C->fetched_len >= 0) {

ext/pdo_odbc/tests/pdo_odbc_binary.phpt

@@ -0,0 +1,40 @@
+--TEST--
+PDO_odbc: Test PARAM_BINARY
+--EXTENSIONS--
+pdo_odbc
+--FILE--
+<?php
+
+// This is a one pixel PNG of rgba(0, 0, 0, 255)
+$binary = base64_decode("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQIW2NgYGD4DwABBAEAwS2OUAAAAABJRU5ErkJggg==");
+
+require 'ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+// XXX: Is this the right type to use?
+$db->exec("CREATE TABLE test_binary(field VARBINARY(256))");
+
+$stmt = $db->prepare("INSERT INTO test_binary(field) VALUES (?)");
+$stmt->bindParam(1, $binary, PDO::PARAM_BINARY);
+$result = $stmt->execute();
+var_dump($result);
+
+$stmt = $db->prepare("SELECT field FROM test_binary");
+$result = $stmt->execute();
+$binary = "";
+$stmt->bindColumn(1, $binary, PDO::PARAM_BINARY);
+$result = $stmt->execute();
+$result = $stmt->fetch();
+
+var_dump(base64_encode($binary));
+var_dump($stmt->getColumnMeta(0)["pdo_type"]);
+?>
+--CLEAN--
+<?php
+require 'ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+$db->exec("DROP TABLE test_binary");
+?>
+--EXPECT--
+bool(true)
+string(96) "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQIW2NgYGD4DwABBAEAwS2OUAAAAABJRU5ErkJggg=="
+int(6)