From bb58eed0041ed33cd9749ac56c437b7fdf5fcdb9 Mon Sep 17 00:00:00 2001 From: Dave Cramer Date: Thu, 18 Dec 2003 03:27:15 +0000 Subject: [PATCH] patch by Kris Jurka to use the correct protocol based upon server information --- src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java | 4 ++-- .../jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java | 4 ++-- 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 7283641cbb..e883615265 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 bd8ae26733..ddf6eb48a1 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(); -- GitLab