cvs: php-src /ext/pdo pdo.c pdo_dbh.c

wez Thu Jul 7 13:08:03 2005 EDT Modified files: /php-src/ext/pdo pdo.c pdo_dbh.c Log: populate the new dbh->driver field. Implement PDO_ATTR_DRIVER_NAME. http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.52&r2=1.53&ty=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.52 php-src/ext/pdo/pdo.c:1.53 --- php-src/ext/pdo/pdo.c:1.52 Sat Jul 2 23:49:44 2005 +++ php-src/ext/pdo/pdo.c Thu Jul 7 13:08:01 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo.c,v 1.52 2005/07/03 03:49:44 wez Exp $ */ +/* $Id: pdo.c,v 1.53 2005/07/07 17:08:01 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -336,6 +336,7 @@ REGISTER_LONG_CONSTANT("PDO_ATTR_STATEMENT_CLASS", (long)PDO_ATTR_STATEMENT_CLASS, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PDO_ATTR_FETCH_TABLE_NAMES", (long)PDO_ATTR_FETCH_TABLE_NAMES, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PDO_ATTR_FETCH_CATALOG_NAMES", (long)PDO_ATTR_FETCH_CATALOG_NAMES, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PDO_ATTR_DRIVER_NAME", (long)PDO_ATTR_DRIVER_NAME, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PDO_ERRMODE_SILENT", (long)PDO_ERRMODE_SILENT, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PDO_ERRMODE_WARNING", (long)PDO_ERRMODE_WARNING, CONST_CS|CONST_PERSISTENT); http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.77&r2=1.78&ty=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.77 php-src/ext/pdo/pdo_dbh.c:1.78 --- php-src/ext/pdo/pdo_dbh.c:1.77 Thu Jul 7 07:19:56 2005 +++ php-src/ext/pdo/pdo_dbh.c Thu Jul 7 13:08:01 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.77 2005/07/07 11:19:56 dmitry Exp $ */ +/* $Id: pdo_dbh.c,v 1.78 2005/07/07 17:08:01 wez Exp $ */ /* The PDO Database Handle Class */ @@ -390,6 +390,8 @@ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Failed to register persistent entry"); } } + + dbh->driver = driver; return; } @@ -744,6 +746,8 @@ case PDO_ATTR_ERRMODE: RETURN_LONG(dbh->error_mode); + case PDO_ATTR_DRIVER_NAME: + RETURN_STRINGL(dbh->driver->driver_name, dbh->driver->driver_name_len, 1); } if (!dbh->methods->get_attribute) {