database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Added postgres.h header for more type checking.

Browse Source 
Changed the way that OID is retrieved on inserts.  PQoidStatus appears
to be deprecated so I am using PQoidValue instead.
This commit is contained in:
D'Arcy J.M. Cain
2001-03-03 13:42:37 +00:00
parent 376fa516bd
commit a487e0d333
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/interfaces/python/pgmodule.c
View File

@ -27,6 +27,7 @@
*/ */
#include <Python.h> #include <Python.h>
#include <postgres.h>
#include <libpq-fe.h> #include <libpq-fe.h>
#include <libpq/libpq-fs.h> #include <libpq/libpq-fs.h>
#include <stdio.h> #include <stdio.h>
@ -492,9 +493,9 @@ pgsource_oidstatus(pgsourceobject * self, PyObject * args)
} }
/* retrieves oid status */ /* retrieves oid status */
if ((oid = PQoidValue(self->last_result)) == InvalidOid)
oid = 0; oid = 0;
if ((status = PQoidStatus(self->last_result)))
oid = atol(status);
return PyInt_FromLong(oid); return PyInt_FromLong(oid);
} }
@ -2125,7 +2126,7 @@ pg_query(pgobject * self, PyObject * args)
/* checks result status */ /* checks result status */
if ((status = PQresultStatus(result)) != PGRES_TUPLES_OK) if ((status = PQresultStatus(result)) != PGRES_TUPLES_OK)
{ {
const char *str; Oid oid;
PQclear(result); PQclear(result);
@ -2140,14 +2141,14 @@ pg_query(pgobject * self, PyObject * args)
PyErr_SetString(PGError, PQerrorMessage(self->cnx)); PyErr_SetString(PGError, PQerrorMessage(self->cnx));
break; break;
case PGRES_COMMAND_OK: /* could be an INSERT */ case PGRES_COMMAND_OK: /* could be an INSERT */
if (*(str = PQoidStatus(result)) == 0) /* nope */ if ((oid = PQoidValue(result)) == InvalidOid) /* nope */
{ {
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
} }
/* otherwise, return the oid */ /* otherwise, return the oid */
return PyInt_FromLong(strtol(str, NULL, 10)); return PyInt_FromLong(oid);
case PGRES_COPY_OUT: /* no data will be received */ case PGRES_COPY_OUT: /* no data will be received */
case PGRES_COPY_IN: case PGRES_COPY_IN: