edink Fri Jul 1 18:30:55 2005 EDT
Modified files:
/php-src/ext/pdo_pgsql pgsql_driver.c pgsql_statement.c
php_pdo_pgsql_int.h
Log:
Fold PQresultErrorField() into a macro
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.44&r2=1.45&ty=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.44
php-src/ext/pdo_pgsql/pgsql_driver.c:1.45
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.44 Fri Jul 1 17:54:50 2005
+++ php-src/ext/pdo_pgsql/pgsql_driver.c Fri Jul 1 18:30:55 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql_driver.c,v 1.44 2005/07/01 21:54:50 edink Exp $ */
+/* $Id: pgsql_driver.c,v 1.45 2005/07/01 22:30:55 edink Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -160,12 +160,7 @@
} else {
ExecStatusType qs = PQresultStatus(res);
if (qs != PGRES_COMMAND_OK && qs != PGRES_TUPLES_OK) {
-#if HAVE_PQRESULTERRORFIELD
- char * sqlstate = PQresultErrorField(res,
PG_DIAG_SQLSTATE);
- pdo_pgsql_error(dbh, qs, (const char *)sqlstate);
-#else
- pdo_pgsql_error(dbh, qs, NULL);
-#endif
+ pdo_pgsql_error(dbh, qs, pdo_pgsql_sqlstate(res));
PQclear(res);
return -1;
}
@@ -232,12 +227,7 @@
id = estrdup((char *)PQgetvalue(res, 0, 0));
*len = PQgetlength(res, 0, 0);
} else {
-#if HAVE_PQRESULTERRORFIELD
- char * sqlstate = PQresultErrorField(res,
PG_DIAG_SQLSTATE);
- pdo_pgsql_error(dbh, status, (const char *)sqlstate);
-#else
- pdo_pgsql_error(dbh, status, NULL);
-#endif
+ pdo_pgsql_error(dbh, status, pdo_pgsql_sqlstate(res));
}
if (res) {
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.22&r2=1.23&ty=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.22
php-src/ext/pdo_pgsql/pgsql_statement.c:1.23
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.22 Wed May 18 18:40:56 2005
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Fri Jul 1 18:30:55 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql_statement.c,v 1.22 2005/05/18 22:40:56 iliaa Exp $ */
+/* $Id: pgsql_statement.c,v 1.23 2005/07/01 22:30:55 edink Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -97,13 +97,7 @@
status = PQresultStatus(S->result);
if (status != PGRES_COMMAND_OK && status != PGRES_TUPLES_OK) {
-#if HAVE_PQRESULTERRORFIELD
- char * sqlstate = PQresultErrorField(S->result,
PG_DIAG_SQLSTATE);
- pdo_pgsql_error_stmt(stmt, status, (const char *)sqlstate);
-#else
- pdo_pgsql_error_stmt(stmt, status, NULL);
-#endif
-
+ pdo_pgsql_error_stmt(stmt, status,
pdo_pgsql_sqlstate(S->result));
return 0;
}
@@ -151,12 +145,7 @@
status = PQresultStatus(S->result);
if (status != PGRES_COMMAND_OK && status != PGRES_TUPLES_OK) {
-#if HAVE_PQRESULTERRORFIELD
- char * sqlstate = PQresultErrorField(S->result,
PG_DIAG_SQLSTATE);
- pdo_pgsql_error_stmt(stmt, status, (const char
*)sqlstate);
-#else
- pdo_pgsql_error_stmt(stmt, status, NULL);
-#endif
+ pdo_pgsql_error_stmt(stmt, status,
pdo_pgsql_sqlstate(S->result));
return 0;
}
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/php_pdo_pgsql_int.h?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/pdo_pgsql/php_pdo_pgsql_int.h
diff -u php-src/ext/pdo_pgsql/php_pdo_pgsql_int.h:1.10
php-src/ext/pdo_pgsql/php_pdo_pgsql_int.h:1.11
--- php-src/ext/pdo_pgsql/php_pdo_pgsql_int.h:1.10 Tue May 17 16:08:53 2005
+++ php-src/ext/pdo_pgsql/php_pdo_pgsql_int.h Fri Jul 1 18:30:55 2005
@@ -16,12 +16,13 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_pgsql_int.h,v 1.10 2005/05/17 20:08:53 iliaa Exp $ */
+/* $Id: php_pdo_pgsql_int.h,v 1.11 2005/07/01 22:30:55 edink Exp $ */
#ifndef PHP_PDO_PGSQL_INT_H
#define PHP_PDO_PGSQL_INT_H
#include <libpq-fe.h>
+#include <php.h>
#define PHP_PDO_PGSQL_CONNECTION_FAILURE_SQLSTATE "08006"
@@ -71,6 +72,12 @@
extern struct pdo_stmt_methods pgsql_stmt_methods;
+#ifdef HAVE_PQRESULTERRORFIELD
+#define pdo_pgsql_sqlstate(r) PQresultErrorField(r, PG_DIAG_SQLSTATE)
+#else
+#define pdo_pgsql_sqlstate(r) (const char *)NULL
+#endif
+
#endif /* PHP_PDO_PGSQL_INT_H */
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
