edink Fri Jul 1 17:54:52 2005 EDT
Modified files:
/php-src/ext/pdo_pgsql pgsql_driver.c
Log:
Added support for fetching current value of a sequence when the
optional sequence name has been passed to PDO::lastInsertId()
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.43&r2=1.44&ty=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.43
php-src/ext/pdo_pgsql/pgsql_driver.c:1.44
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.43 Wed Jun 29 20:07:42 2005
+++ php-src/ext/pdo_pgsql/pgsql_driver.c Fri Jul 1 17:54:50 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql_driver.c,v 1.43 2005/06/30 00:07:42 iliaa Exp $ */
+/* $Id: pgsql_driver.c,v 1.44 2005/07/01 21:54:50 edink Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -207,14 +207,43 @@
{
pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
char *id = NULL;
-
+
if (H->pgoid == InvalidOid) {
return NULL;
}
- /* TODO: if name != NULL, pull out last value for that sequence/column
*/
+ if (name == NULL) {
+ *len = spprintf(&id, 0, "%ld", (long) H->pgoid);
+ } else {
+ PGresult *res;
+ char *name_escaped, *q;
+ size_t l = strlen(name);
+ ExecStatusType status;
+
+ name_escaped = safe_emalloc(l, 2, 1);
+ PQescapeString(name_escaped, name, l);
+ spprintf(&q, 0, "SELECT CURRVAL('%s')", name_escaped);
+ res = PQexec(H->server, q);
+ efree(name_escaped);
+ efree(q);
+ status = PQresultStatus(res);
+
+ if (res && (status == PGRES_TUPLES_OK)) {
+ 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
+ }
- *len = spprintf(&id, 0, "%ld", (long) H->pgoid);
+ if (res) {
+ PQclear(res);
+ }
+ }
return id;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
