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 1427a45eaa344f6ee1952e33a0f6b3e188f5e0cf..56a6b8a8f340f1183ae98aafd8c895fc2da60f0c 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
+++ b/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
@@ -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 ab4a0786402915d4da056e7125db72cc72e31dfc..33cab33cef4b5c9ec2218c39309e81a5d2d20d32 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
@@ -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();