mirror of
https://github.com/psycopg/psycopg2.git
synced 2025-02-12 07:10:33 +03:00
Merge branch 'fix-520'
This commit is contained in:
commit
d007dc3249
1
NEWS
1
NEWS
|
@ -6,6 +6,7 @@ What's new in psycopg 2.7.1
|
||||||
|
|
||||||
- Ignore `!None` arguments passed to `~psycopg2.connect()` and
|
- Ignore `!None` arguments passed to `~psycopg2.connect()` and
|
||||||
`~psycopg2.extensions.make_dsn()` (:ticket:`#517`).
|
`~psycopg2.extensions.make_dsn()` (:ticket:`#517`).
|
||||||
|
- Fixed build with libpq versions < 9.3 (:ticket:`#520`).
|
||||||
|
|
||||||
|
|
||||||
What's new in psycopg 2.7
|
What's new in psycopg 2.7
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "psycopg/config.h"
|
#include "psycopg/config.h"
|
||||||
|
|
||||||
/* type and constant definitions from internal postgres include */
|
/* type and constant definitions from internal postgres include */
|
||||||
typedef unsigned PG_INT64_TYPE XLogRecPtr;
|
typedef uint64_t XLogRecPtr;
|
||||||
|
|
||||||
/* have to use lowercase %x, as PyString_FromFormat can't do %X */
|
/* have to use lowercase %x, as PyString_FromFormat can't do %X */
|
||||||
#define XLOGFMTSTR "%x/%x"
|
#define XLOGFMTSTR "%x/%x"
|
||||||
|
|
|
@ -313,7 +313,7 @@ def libpq_version():
|
||||||
import psycopg2
|
import psycopg2
|
||||||
v = psycopg2.__libpq_version__
|
v = psycopg2.__libpq_version__
|
||||||
if v >= 90100:
|
if v >= 90100:
|
||||||
v = psycopg2.extensions.libpq_version()
|
v = min(v, psycopg2.extensions.libpq_version())
|
||||||
return v
|
return v
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user