* psycopg/utils.c (psycopg_escape_string): same here.

	* psycopg/adapter_binary.c (binary_escape): simplify PostgreSQL
	version check.

	* setup.py (psycopg_build_ext.finalize_options): use a single
	define of the PostgreSQL version in a form that can easily be used
	by #ifdefs.

4 files changed, 15 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index b89be49..f804f07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-02-17  James Henstridge  <james@jamesh.id.au>
 
+	* psycopg/utils.c (psycopg_escape_string): same here.
+
+	* psycopg/adapter_binary.c (binary_escape): simplify PostgreSQL
+	version check.
+
+	* setup.py (psycopg_build_ext.finalize_options): use a single
+	define of the PostgreSQL version in a form that can easily be used
+	by #ifdefs.
+
 	* tests/test_dates.py (DatetimeTests, mxDateTimeTests): full test
 	coverage for datetime and time strings with and without time zone
 	information.
diff --git a/psycopg/adapter_binary.c b/psycopg/adapter_binary.c
index 306c9e5..76ce92d 100644
--- a/psycopg/adapter_binary.c
+++ b/psycopg/adapter_binary.c
@@ -42,9 +42,7 @@ static unsigned char *
 binary_escape(unsigned char *from, size_t from_length,
                size_t *to_length, PGconn *conn)
 {
-#if PG_MAJOR_VERSION > 8 || \
- (PG_MAJOR_VERSION == 8 && PG_MINOR_VERSION > 1) || \
- (PG_MAJOR_VERSION == 8 && PG_MINOR_VERSION == 1 && PG_PATCH_VERSION >= 4)
+#if PG_VERSION_HEX >= 0x080104
     if (conn)
         return PQescapeByteaConn(conn, from, from_length, to_length);
     else
diff --git a/psycopg/utils.c b/psycopg/utils.c
index 03ec9c8..ad346d7 100644
--- a/psycopg/utils.c
+++ b/psycopg/utils.c
@@ -31,9 +31,7 @@ psycopg_escape_string(PyObject *obj, const char *from, Py_ssize_t len,
 
     #ifndef PSYCOPG_OWN_QUOTING
     {
-        #if PG_MAJOR_VERSION > 8 || \
-         (PG_MAJOR_VERSION == 8 && PG_MINOR_VERSION > 1) || \
-         (PG_MAJOR_VERSION == 8 && PG_MINOR_VERSION == 1 && PG_PATCH_VERSION >= 4)
+        #if PG_VERSION_HEX >= 0x080104
             int err;
             if (conn && conn->pgconn)
                 ql = PQescapeStringConn(conn->pgconn, to+eq+1, from, len, &err);
diff --git a/setup.py b/setup.py
index 02daa41..988720b 100644
--- a/setup.py
+++ b/setup.py
@@ -204,12 +204,11 @@ class psycopg_build_ext(build_ext):
                 # *at least* PostgreSQL 7.4 is available (this is the only
                 # 7.x series supported by psycopg 2)
                 pgversion = self.get_pg_config("version").split()[1]
-                pgmajor, pgminor, pgpatch = pgversion.split('.')
             except:
-                pgmajor, pgminor, pgpatch = 7, 4, 0
-            define_macros.append(("PG_MAJOR_VERSION", pgmajor))
-            define_macros.append(("PG_MINOR_VERSION", pgminor))
-            define_macros.append(("PG_PATCH_VERSION", pgpatch))
+                pgversion = "7.4.0"
+            pgmajor, pgminor, pgpatch = pgversion.split('.')
+            define_macros.append(("PG_VERSION_HEX", "0x%02X%02X%02X" %
+                                  (int(pgmajor), int(pgminor), int(pgpatch))))
         except Warning, w:
             if self.pg_config == self.DEFAULT_PG_CONFIG:
                 sys.stderr.write("Warning: %s" % str(w))