patch by Kris Jurka to use the correct protocol based upon server information

Dave Cramer · Dave Cramer · commit bb58eed0041e · 2003-12-18T03:27:15.000Z
diff --git 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 Fastpath(BaseConnection conn, PGStream stream)
 	 */
 	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
@@ -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 @@ private void initObjectTypes()
 	 */
 	public void close() throws SQLException
 	{
-		if (haveMinimumCompatibleVersion("7.4")) {
+		if (getPGProtocolVersionMajor() == 3) {
 			closeV3();
 		} else {
 			closeV2();

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java,v 1.19 2003/12/17 15:45:05 davec Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java,v 1.20 2003/12/18 03:27:14 davec Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -63,7 +63,7 @@ public Fastpath(BaseConnection conn, PGStream stream)`
`63`	`63`	`*/`
`64`	`64`	`public Object fastpath(int fnid, boolean resulttype, FastpathArg[] args) throws SQLException`
`65`	`65`	`{`
`66`		`- if (conn.haveMinimumCompatibleVersion("7.4")) {`
	`66`	`+ if (conn.getPGProtocolVersionMajor() == 3) {`
`67`	`67`	`return fastpathV3(fnid, resulttype, args);`
`68`	`68`	`} else {`
`69`	`69`	`return fastpathV2(fnid, resulttype, args);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java,v 1.28 2003/11/29 19:52:09 pgsql Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java,v 1.29 2003/12/18 03:27:15 davec Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -1109,7 +1109,7 @@ private void initObjectTypes()`
`1109`	`1109`	`*/`
`1110`	`1110`	`public void close() throws SQLException`
`1111`	`1111`	`{`
`1112`		`- if (haveMinimumCompatibleVersion("7.4")) {`
	`1112`	`+ if (getPGProtocolVersionMajor() == 3) {`
`1113`	`1113`	`closeV3();`
`1114`	`1114`	`} else {`
`1115`	`1115`	`closeV2();`