back patch by Kris Jurka to get the correct protocol version from the server

diff --git a/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java b/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
index 193de9e6105cf9155e9d29381f5b12d6387f00f5..5f46ad12068bda7cfec776816cde3f9263576027 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
+++ b/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
@@ -6,7 +6,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Attic/Fastpath.java,v 1.16.2.1 2003/12/17 15:48:39 davec Exp $
+ *       $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Attic/Fastpath.java,v 1.16.2.2 2003/12/18 03:29:12 davec Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,7 +63,7 @@ public class Fastpath
         */
        public Object fastpath(int fnid, boolean resulttype, FastpathArg[] args) throws SQLException
        {
-               if (conn.haveMinimumCompatibleVersion("7.4")) {
+               if (conn.getPGProtocolVersionMajor() == 3) {
                        return fastpathV3(fnid, resulttype, args);
                } else {
                        return fastpathV2(fnid, resulttype, args);

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
index fd451f5db78f37a8340334f855fd4c5e8dd4e911..1f6b8e532727b5d21d9a2b44fc355f663df51e4b 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
@@ -9,7 +9,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.27 2003/10/29 02:39:09 davec Exp $
+ *       $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.27.2.1 2003/12/18 03:29:12 davec Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1109,7 +1109,7 @@ public abstract class AbstractJdbc1Connection implements BaseConnection
         */
        public void close() throws SQLException
        {
-               if (haveMinimumCompatibleVersion("7.4")) {
+               if (getPGProtocolVersionMajor() == 3) {
                        closeV3();
                } else {
                        closeV2();