[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_pgsql config.w32 pgsql_driver.c
mbeccatiThu Apr 30 12:56:00 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_pgsql config.w32 pgsql_driver.c
Log:
MFH:
- Removed HAVE_PQEXECPARAMS which was left out during the previous commit
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.4.2.1.2.3.2.4&r2=1.4.2.1.2.3.2.5&diff_format=u
Index: php-src/ext/pdo_pgsql/config.w32
diff -u php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.4
php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.5
--- php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.4Thu Apr 30 12:38:43 2009
+++ php-src/ext/pdo_pgsql/config.w32Thu Apr 30 12:56:00 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.1.2.3.2.4 2009/04/30 12:38:43 mbeccati Exp $
+// $Id: config.w32,v 1.4.2.1.2.3.2.5 2009/04/30 12:56:00 mbeccati Exp $
// vim:ft=javascript
ARG_WITH("pdo-pgsql", "PostgreSQL support for PDO", "no");
@@ -15,7 +15,6 @@
AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL
library');
AC_DEFINE('HAVE_PQESCAPE_BYTEA_CONN', 1, 'Have
PQescapeByteaConn');
AC_DEFINE('HAVE_PQESCAPE_CONN', 1, 'Have PQescapeConn');
- AC_DEFINE('HAVE_PQEXECPARAMS', 1, 'Have PQexecParams');
AC_DEFINE('HAVE_PQPREPARE', 1, 'Have PQprepare');
ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1 /D HAVE_PQESCAPE_CONN=1 /D
HAVE_PQESCAPE_BYTEA_CONN=1");
ADD_EXTENSION_DEP('pdo_pgsql', 'pdo');
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.53.2.14.2.9.2.7&r2=1.53.2.14.2.9.2.8&diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.14.2.9.2.7
php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.14.2.9.2.8
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.14.2.9.2.7 Thu Apr 30
12:38:43 2009
+++ php-src/ext/pdo_pgsql/pgsql_driver.cThu Apr 30 12:56:00 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pgsql_driver.c,v 1.53.2.14.2.9.2.7 2009/04/30 12:38:43 mbeccati Exp $
*/
+/* $Id: pgsql_driver.c,v 1.53.2.14.2.9.2.8 2009/04/30 12:56:00 mbeccati Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -356,25 +356,9 @@
} else {
PGresult *res;
ExecStatusType status;
-#ifdef HAVE_PQEXECPARAMS
const char *q[1];
q[0] = name;
res = PQexecParams(H->server, "SELECT CURRVAL($1)", 1, NULL, q,
NULL, NULL, 0);
-#else
- char *name_escaped, *q;
- size_t l = strlen(name);
-
- name_escaped = safe_emalloc(l, 2, 1);
-#ifndef HAVE_PQESCAPE_CONN
- PQescapeString(name_escaped, name, l);
-#else
- PQescapeStringConn(H->server, name_escaped, name, l, NULL);
-#endif
- spprintf(&q, 0, "SELECT CURRVAL('%s')", name_escaped);
- res = PQexec(H->server, q);
- efree(name_escaped);
- efree(q);
-#endif
status = PQresultStatus(res);
if (res && (status == PGRES_TUPLES_OK)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_pgsql config.w32
pajoye Wed Apr 1 16:16:49 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_pgsql config.w32
Log:
- MFH: 8.3.x supports pqprepare
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.4.2.1.2.3.2.2&r2=1.4.2.1.2.3.2.3&diff_format=u
Index: php-src/ext/pdo_pgsql/config.w32
diff -u php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.2
php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.3
--- php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.2Mon Mar 9 17:52:37 2009
+++ php-src/ext/pdo_pgsql/config.w32Wed Apr 1 16:16:49 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.1.2.3.2.2 2009/03/09 17:52:37 pajoye Exp $
+// $Id: config.w32,v 1.4.2.1.2.3.2.3 2009/04/01 16:16:49 pajoye Exp $
// vim:ft=javascript
ARG_WITH("pdo-pgsql", "PostgreSQL support for PDO", "no");
@@ -12,6 +12,7 @@
ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_CONFIG_H");
}
+ AC_DEFINE('HAVE_PQPREPARE', 1, 'Have PqPrepare');
AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');
ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PQPARAMETERSTATUS=1 /D
HAVE_PQPROTOCOLVERSION=1 /D HAVE_PGTRANSACTIONSTATUS=1 /D
HAVE_PQUNESCAPEBYTEA=1 /D HAVE_PQRESULTERRORFIELD=1 /D HAVE_PQESCAPE_CONN=1 /D
HAVE_PQESCAPE_BYTEA_CONN=1");
ADD_EXTENSION_DEP('pdo_pgsql', 'pdo');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_pgsql config.w32
pajoye Mon Mar 9 17:52:37 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_pgsql config.w32
Log:
- add path for libpq (other are kept)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.w32?r1=1.4.2.1.2.3.2.1&r2=1.4.2.1.2.3.2.2&diff_format=u
Index: php-src/ext/pdo_pgsql/config.w32
diff -u php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.1
php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.2
--- php-src/ext/pdo_pgsql/config.w32:1.4.2.1.2.3.2.1Sun Jun 22 23:17:22 2008
+++ php-src/ext/pdo_pgsql/config.w32Mon Mar 9 17:52:37 2009
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.1.2.3.2.1 2008/06/22 23:17:22 pajoye Exp $
+// $Id: config.w32,v 1.4.2.1.2.3.2.2 2009/03/09 17:52:37 pajoye Exp $
// vim:ft=javascript
ARG_WITH("pdo-pgsql", "PostgreSQL support for PDO", "no");
if (PHP_PDO_PGSQL != "no") {
if (CHECK_LIB("libpq.lib", "pdo_pgsql", PHP_PDO_PGSQL) &&
- CHECK_HEADER_ADD_INCLUDE("libpq-fe.h",
"CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql")) {
+ CHECK_HEADER_ADD_INCLUDE("libpq-fe.h",
"CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql;" +
PHP_PHP_BUILD + "\\include\\libpq;")) {
EXTENSION("pdo_pgsql", "pdo_pgsql.c pgsql_driver.c
pgsql_statement.c");
if (CHECK_HEADER_ADD_INCLUDE("pg_config.h", "CFLAGS_PDO_PGSQL",
PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql")) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
