- Add mysqlnd support for PDO_mysql, fixes at least bug#41997,#42499,

  pecl#12794, pecl#12401

# Running the tests:
# (Note: Doesn't work currnetly on HEAD, see:
#  http://news.php.net/php.qa/64378)
#
#  PDO_MYSQL_TEST_DSN  - DSN
#    For example: mysql:dbname=test;host=localhost;port=3306
#
#  PDO_MYSQL_TEST_HOST    - database host
#  PDO_MYSQL_TEST_DB      - database (schema) name
#  PDO_MYSQL_TEST_SOCKET  - database server socket
#  PDO_MYSQL_TEST_ENGINE  - storage engine to use
#  PDO_MYSQL_TEST_USER    - database user
#  PDO_MYSQL_TEST_PASS    - database user password
#  PDO_MYSQL_TEST_CHARSET - database charset
#
#  NOTE: if any of PDO_MYSQL_TEST_[HOST|DB|SOCKET|ENGINE|CHARSET] is
#  part of PDO_MYSQL_TEST_DSN, the values must match. That is, for example,
#  for PDO_MYSQL_TEST_DSN = mysql:dbname=test you MUST set PDO_MYSQL_TEST_DB=test.

Author: johannes

ext/pdo/pdo_stmt.c

@@ -538,6 +538,20 @@ static inline void fetch_value(pdo_stmt_t *stmt, zval *dest, int colno, int *typ
 	stmt->methods->get_col(stmt, colno, &value, &value_len, &caller_frees TSRMLS_CC);
 
 	switch (type) {
+		case PDO_PARAM_ZVAL:
+			if (value && value_len == sizeof(zval)) {
+				int need_copy = (new_type != PDO_PARAM_ZVAL || stmt->dbh->stringify) ? 1 : 0;
+				zval *zv = *(zval**)value;
+				ZVAL_ZVAL(dest, zv, need_copy, 1);
+			} else {
+				ZVAL_NULL(dest);
+			}
+			
+			if (Z_TYPE_P(dest) == IS_NULL) {
+				type = new_type;
+			}
+			break;
+			
 		case PDO_PARAM_INT:
 			if (value && value_len == sizeof(long)) {
 				ZVAL_LONG(dest, *(long*)value);
@@ -1879,7 +1893,10 @@ static PHP_METHOD(PDOStatement, getColumnMeta)
 	add_assoc_string(return_value, "name", col->name, 1);
 	add_assoc_long(return_value, "len", col->maxlen); /* FIXME: unsigned ? */
 	add_assoc_long(return_value, "precision", col->precision);
-	add_assoc_long(return_value, "pdo_type", col->param_type);
+	if (col->param_type != PDO_PARAM_ZVAL) {
+		/* if param_type is PDO_PARAM_ZVAL the driver has to provide correct data */
+		add_assoc_long(return_value, "pdo_type", col->param_type);
+	}
 }
 /* }}} */
 

ext/pdo/php_pdo_driver.h

@@ -45,7 +45,7 @@ PDO_API char *php_pdo_int64_to_str(pdo_int64_t i64 TSRMLS_DC);
 # define FALSE 0
 #endif
 
-#define PDO_DRIVER_API	20061209
+#define PDO_DRIVER_API	20080721
 
 enum pdo_param_type {
 	PDO_PARAM_NULL,
@@ -68,7 +68,12 @@ enum pdo_param_type {
 	PDO_PARAM_STMT, /* hierarchical result set */
 
 	/* get_col ptr should point to a zend_bool */
-	PDO_PARAM_BOOL
+	PDO_PARAM_BOOL,
+
+	/* get_col ptr should point to a zval*
+	   and the driver is responsible for adding correct type information to get_column_meta()
+	 */
+	PDO_PARAM_ZVAL
 };
 
 /* magic flag to denote a parameter as being input/output */

ext/pdo_mysql/CREDITS

@@ -1,3 +1,3 @@
-mySQL driver for PDO
-George Schlossnagle, Wez Furlong, Ilia Alshanetsky
- 
+MySQL driver for PDO
+George Schlossnagle, Wez Furlong, Ilia Alshanetsky, Johannes Schlueter
+

ext/pdo_mysql/config.m4

@@ -2,68 +2,143 @@ dnl
 dnl $Id$
 dnl
 
-if test "$PHP_PDO" != "no"; then
-
-AC_DEFUN([PDO_MYSQL_LIB_CHK], [
-  str="$PDO_MYSQL_DIR/$1/libmysqlclient.*"
-  for j in `echo $str`; do
-    if test -r $j; then
-      PDO_MYSQL_LIB_DIR=$MYSQL_DIR/$1
-      break 2
-    fi
-  done
-])
-
+dnl TODO Rename when moving to pdo_mysql
 PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO,
-[  --with-pdo-mysql[=DIR]    PDO: MySQL support. DIR is the MySQL base directory])
+[  --with-pdo-mysql[=DIR]    PDO: MySQL support. DIR is the MySQL base directoy
+                                 If mysqlnd is passed as DIR, the MySQL native
+                                 native driver will be used [/usr/local]])
+
+if test -z "$PHP_ZLIB_DIR"; then
+  PHP_ARG_WITH(zlib-dir, for the location of libz,
+  [  --with-zlib-dir[=DIR]       PDO_MySQL: Set the path to libz install prefix], no, no)
+fi
 
 if test "$PHP_PDO_MYSQL" != "no"; then
-  AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
+  PHP_MYSQLND_ENABLED=yes
 
-  for i in $PHP_PDO_MYSQL /usr/local /usr ; do
-    PDO_MYSQL_DIR=$i
-    PDO_MYSQL_CONFIG=$PDO_MYSQL_DIR/bin/mysql_config
-    if test -r $i/include/mysql; then
-      PDO_MYSQL_INC_DIR=$i/include/mysql
-    else
-      PDO_MYSQL_INC_DIR=$i/include
-    fi      
-    if test -r $i/lib/mysql; then
-      PDO_MYSQL_LIB_DIR=$i/lib/mysql
+  AC_DEFUN([PDO_MYSQL_LIB_CHK], [
+    str="$PDO_MYSQL_DIR/$1/libmysqlclient*"
+    for j in `echo $str`; do
+      if test -r $j; then
+        PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$1
+        break 2
+      fi
+    done
+  ])
+
+  if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
+    dnl enables build of mysqnd library
+    PHP_MYSQL_ENABLED=yes
+    AC_DEFINE([PDO_USE_MYSQLND], 1, [Whether pdo_mysql uses mysqlnd])
+  else
+    AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
+    AC_MSG_CHECKING([for mysql_config])
+
+    if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then
+      PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL
+    elif test "$PHP_PDO_MYSQL" != "yes"; then
+      if test -d "$PHP_PDO_MYSQL" ; then
+        if test -x "$PHP_PDO_MYSQL/bin/mysql_config" ; then
+          PDO_MYSQL_CONFIG="$PHP_PDO_MYSQL/bin/mysql_config"
+        else
+          PDO_MYSQL_DIR="$PHP_PDO_MYSQL"
+        fi
+      else
+        AC_MSG_RESULT([$PHP_PDO_MYSQL is not a directory])
+        AC_MSG_ERROR([can not find mysql under the "$PHP_PDO_MYSQL" that you specified])
+      fi
     else
-      PDO_MYSQL_LIB_DIR=$i/lib
-    fi
-    if test -x $PDO_MYSQL_CONFIG; then
-      break
+      for i in /usr/local /usr ; do
+        if test -x "$i/bin/mysql_config" ; then
+          PDO_MYSQL_CONFIG="$i/bin/mysql_config"
+          break;
+        fi
+        if test -r $i/include/mysql/mysql.h || test -r $i/include/mysql.h ; then
+          PDO_MYSQL_DIR="$i"
+          break;
+        fi
+      done
     fi
-  done
 
-  if test -z "$PDO_MYSQL_DIR"; then
-    AC_MSG_ERROR([Cannot find MySQL header files under $PHP_MYSQL.
-Note that the MySQL client library is not bundled anymore!])
-  fi
+    if test -n "$PDO_MYSQL_CONFIG" && test -x "$PDO_MYSQL_CONFIG" ; then
+      AC_MSG_RESULT($PDO_MYSQL_CONFIG)
+      if test "x$SED" = "x"; then
+        AC_PATH_PROG(SED, sed)
+      fi
 
-  if test -x $PDO_MYSQL_CONFIG; then
-	PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` 
-  fi
+      if test "$enable_maintainer_zts" = "yes"; then
+        PDO_MYSQL_LIBNAME=mysqlclient_r
+        PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
+      else
+        PDO_MYSQL_LIBNAME=mysqlclient
+        PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
+      fi
+      PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
+      PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` 
+    elif test -z "$PDO_MYSQL_DIR"; then
+      AC_MSG_RESULT([not found])
+      AC_MSG_ERROR([Cannot find MySQL header files under $PDO_MYSQL_DIR])
+    else
+      AC_MSG_RESULT([not found])
+      AC_MSG_CHECKING([for mysql install under $PDO_MYSQL_DIR])
+      if test -r $PDO_MYSQL_DIR/include/mysql; then
+        PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
+      else
+        PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include
+      fi
+      if test -r $PDO_MYSQL_DIR/$PHP_LIBDIR/mysql; then
+        PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR/mysql
+      else
+        PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR
+      fi
+
+      if test -r "$PDO_MYSQL_LIB_DIR"; then
+        AC_MSG_RESULT([libs under $PDO_MYSQL_LIB_DIR; seems promising])
+      else
+        AC_MSG_RESULT([can not find it])
+        AC_MSG_ERROR([Unable to find your mysql installation])
+      fi
+
+      PHP_ADD_INCLUDE($PDO_MYSQL_INC_DIR)
+      PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
+    fi
 
-  if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
-    AC_DEFINE_UNQUOTED(PDO_MYSQL_UNIX_ADDR, "$PHP_MYSQL_SOCK", [ ])  
-  else
     AC_DEFINE_UNQUOTED(PDO_MYSQL_UNIX_ADDR, "$PDO_MYSQL_SOCKET", [ ])
-  fi
 
-  PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $PDO_MYSQL_LIB_DIR, PDO_MYSQL_SHARED_LIBADD)
-  PHP_ADD_INCLUDE($PDO_MYSQL_INC_DIR)
-  if test -x $PDO_MYSQL_CONFIG; then
-    PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs`
-    PHP_SUBST_OLD(PDO_MYSQL_LIBS)
-  fi
+    PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_query,
+    [
+      PHP_EVAL_INCLINE($PDO_MYSQL_INCLUDE)
+      PHP_EVAL_LIBLINE($PDO_MYSQL_LIBS, PDO_MYSQL_SHARED_LIBADD)
+    ],[
+      if test "$PHP_ZLIB_DIR" != "no"; then
+        PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, PDO_MYSQL_SHARED_LIBADD)
+        PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_query, [], [
+          AC_MSG_ERROR([PDO_MYSQL configure failed. Please check config.log for more information.])
+        ], [
+          -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR 
+        ])  
+        PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
+      else
+        PHP_ADD_LIBRARY(z,, PDO_MYSQL_SHARED_LIBADD)
+        PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_query, [], [
+          AC_MSG_ERROR([Try adding --with-zlib-dir=<DIR>. Please check config.log for more information.])
+        ], [
+          -L$PDO_MYSQL_LIB_DIR
+        ])   
+        PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz"
+      fi
 
-  _SAVE_LDFLAGS=$LDFLAGS
-  LDFLAGS="$LDFLAGS $PDO_MYSQL_LIBS"
-  AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate]) 
-  LDFLAGS=$_SAVE_LDFLAGS
+      PHP_EVAL_INCLINE($PDO_MYSQL_INCLUDE)
+      PHP_EVAL_LIBLINE($PDO_MYSQL_LIBS, PDO_MYSQL_SHARED_LIBADD)
+    ],[
+      $PDO_MYSQL_LIBS
+    ])
+
+    _SAVE_LIBS=$LIBS
+    LIBS="$LIBS $PDO_MYSQL_LIBS"
+    AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate]) 
+    LIBS=$_SAVE_LIBS
+  fi
 
   ifdef([PHP_CHECK_PDO_INCLUDES],
   [
@@ -82,18 +157,19 @@ Note that the MySQL client library is not bundled anymore!])
     AC_MSG_RESULT($pdo_inc_path)
   ])
 
-  PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path)
+
+  dnl fix after renaming to pdo_mysql
+  PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, $ext_shared,,-I$pdo_inc_path -I)
   ifdef([PHP_ADD_EXTENSION_DEP],
   [
-  	PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
+    PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
+    if test "$PHP_MYSQL" = "mysqlnd"; then
+      PHP_ADD_EXTENSION_DEP(pdo_mysql, mysqlnd)
+    fi
   ])
   PDO_MYSQL_MODULE_TYPE=external
-  PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
- 
-  PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)
+
   PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE)
-  PHP_SUBST_OLD(PDO_MYSQL_LIBS)
-  PHP_SUBST_OLD(PDO_MYSQL_INCLUDE)
 fi
 
-fi
+dnl vim: se ts=2 sw=2 et:

ext/pdo_mysql/config.w32

@@ -4,11 +4,17 @@
 ARG_WITH("pdo-mysql", "MySQL support for PDO", "no");
 
 if (PHP_PDO_MYSQL != "no") {
-	if (CHECK_LIB("libmysql.lib", "pdo_mysql", PHP_PDO_MYSQL) &&
-			CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_PDO_MYSQL", PHP_PHP_BUILD + "\\include\\mysql;" + PHP_PDO_MYSQL)) {
+	if (PHP_PDO_MYSQL == "yes" || PHP_PDO_MYSQL == "mysqlnd") {
+		AC_DEFINE('PDO_USE_MYSQLND', 1, 'Using MySQL native driver');
+		STDOUT.WriteLine("INFO: mysqlnd build");
 		EXTENSION("pdo_mysql", "pdo_mysql.c mysql_driver.c mysql_statement.c");
+		ADD_EXTENSION_DEP('pdo_mysql', 'pdo');
 	} else {
-		WARNING("pdo_mysql not enabled; libraries and headers not found");
+		if (CHECK_LIB("libmysql.lib", "pdo_mysql", PHP_PDO_MYSQL) &&
+				CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_PDO_MYSQL", PHP_PHP_BUILD + "\\include\\mysql;" + PHP_PDO_MYSQL)) {
+			EXTENSION("pdo_mysql", "pdo_mysql.c mysql_driver.c mysql_statement.c");
+		} else {
+			WARNING("pdo_mysql not enabled; libraries and headers not found");
+		}
 	}
-	ADD_EXTENSION_DEP('pdo_mysql', 'pdo');
 }