NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commita487e0d

committed

Added postgres.h header for more type checking.

Changed the way that OID is retrieved on inserts. PQoidStatus appearsto be deprecated so I am using PQoidValue instead.

1 parent376fa51 commita487e0dCopy full SHA for a487e0d

File tree

1 file changed

-6

lines changed

src/interfaces/python
- pgmodule.c

1 file changed

-6

lines changed

`‎src/interfaces/python/pgmodule.c`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`*/`
`28`	`28`
`29`	`29`	`#include<Python.h>`
	`30`	`+#include<postgres.h>`
`30`	`31`	`#include<libpq-fe.h>`
`31`	`32`	`#include<libpq/libpq-fs.h>`
`32`	`33`	`#include<stdio.h>`
`@@ -492,9 +493,9 @@ pgsource_oidstatus(pgsourceobject * self, PyObject * args)`
`492`	`493`	`}`
`493`	`494`
`494`	`495`	`/* retrieves oid status */`
`495`		`-oid=0;`
`496`		`-if ((status=PQoidStatus(self->last_result)))`
`497`		`-oid=atol(status);`
	`496`	`+if ((oid=PQoidValue(self->last_result))==InvalidOid)`
	`497`	`+oid=0;`
	`498`	`+`
`498`	`499`	`returnPyInt_FromLong(oid);`
`499`	`500`	`}`
`500`	`501`
`@@ -2125,7 +2126,7 @@ pg_query(pgobject * self, PyObject * args)`
`2125`	`2126`	`/* checks result status */`
`2126`	`2127`	`if ((status=PQresultStatus(result))!=PGRES_TUPLES_OK)`
`2127`	`2128`	`{`
`2128`		`-constchar*str;`
	`2129`	`+Oidoid;`
`2129`	`2130`
`2130`	`2131`	`PQclear(result);`
`2131`	`2132`
`@@ -2140,14 +2141,14 @@ pg_query(pgobject * self, PyObject * args)`
`2140`	`2141`	`PyErr_SetString(PGError,PQerrorMessage(self->cnx));`
`2141`	`2142`	`break;`
`2142`	`2143`	`casePGRES_COMMAND_OK:/* could be an INSERT */`
`2143`		`-if ((str=PQoidStatus(result))==0)/ nope */`
	`2144`	`+if ((oid=PQoidValue(result))==InvalidOid)/* nope */`
`2144`	`2145`	`{`
`2145`	`2146`	`Py_INCREF(Py_None);`
`2146`	`2147`	`returnPy_None;`
`2147`	`2148`	`}`
`2148`	`2149`
`2149`	`2150`	`/* otherwise, return the oid */`
`2150`		`-returnPyInt_FromLong(strtol(str,NULL,10));`
	`2151`	`+returnPyInt_FromLong(oid);`
`2151`	`2152`
`2152`	`2153`	`casePGRES_COPY_OUT:/* no data will be received */`
`2153`	`2154`	`casePGRES_COPY_IN:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita487e0d

File tree

1 file changed

1 file changed

`‎src/interfaces/python/pgmodule.c`

0 commit comments