summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Cramer2003-12-18 03:27:15 +0000
committerDave Cramer2003-12-18 03:27:15 +0000
commitbb58eed0041ed33cd9749ac56c437b7fdf5fcdb9 (patch)
treedc914e780d6f6ea432de2caf47d52c9f55c8c36f
parent38b0dff0d39fa883cbaeb0b187a57c4a6d740d7f (diff)
patch by Kris Jurka to use the correct protocol based upon server information
-rw-r--r--src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java4
-rw-r--r--src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java b/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
index 7283641cbbd..e8836152650 100644
--- 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
- * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java,v 1.19 2003/12/17 15:45:05 davec Exp $
+ * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java,v 1.20 2003/12/18 03:27:14 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 bd8ae26733a..ddf6eb48a12 100644
--- 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
- * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java,v 1.28 2003/11/29 19:52:09 pgsql Exp $
+ * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java,v 1.29 2003/12/18 03:27:15 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();