CVS User Account cvsuser
Tue Mar 28 13:32:56 PST 2006
Log Message:
-----------
Further removal of PG 7.3 support - PG version checks now treat 7.3 as
an unsupported version.

Note that this should NOT be backported to 1.1 :-).

Modified Files:
--------------
    slony1-engine/src/slon:
        dbutils.c (r1.20 -> r1.21)
    slony1-engine/src/slonik:
        slonik.c (r1.62 -> r1.63)

-------------- next part --------------
Index: dbutils.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/dbutils.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/slon/dbutils.c -Lsrc/slon/dbutils.c -u -w -r1.20 -r1.21
--- src/slon/dbutils.c
+++ src/slon/dbutils.c
@@ -107,7 +107,7 @@
 	conn = slon_make_dummyconn(symname);
 	conn->dbconn = dbconn;
 	conn->pg_version = db_get_version(dbconn);
-        if (conn->pg_version < 70303)
+        if (conn->pg_version < 70400)
         {
                 slon_log(SLON_ERROR,
                         "slon_connectdb: PQconnectdb(\"%s\") PostgreSQL version not supported\n",
Index: slonik.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -Lsrc/slonik/slonik.c -Lsrc/slonik/slonik.c -u -w -r1.62 -r1.63
--- src/slonik/slonik.c
+++ src/slonik/slonik.c
@@ -1859,8 +1859,10 @@
 	}
 	else if ((adminfo->pg_version >= 70300) && (adminfo->pg_version<70400)) /* 7.3 */
 	{
-		use_major = 7;
-		use_minor = 3;
+		printf("%s:%d: unsupported PostgreSQL "
+			"version %d.%d\n",
+			stmt->stmt_filename, stmt->stmt_lno,
+			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
 	}
 	else if ((adminfo->pg_version >= 70400) && (adminfo->pg_version<70500)) /* 7.4 */
 	{
@@ -1952,8 +1954,10 @@
         }
         else if ((adminfo->pg_version >= 70300) && (adminfo->pg_version<70400)) /* 7.3 */
         {
-                use_major = 7;
-                use_minor = 3;
+                printf("%s:%d: unsupported PostgreSQL "
+                        "version %d.%d\n",
+                        stmt->stmt_filename, stmt->stmt_lno,
+                        (adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
         }
         else if ((adminfo->pg_version >= 70400) && (adminfo->pg_version<70500)) /* 7.4 */
         {



More information about the Slony1-commit mailing list