revoked patch from Kris Jurka to fix multiarguments, and changed test to create

Dave Cramer · Dave Cramer · commit 9dddd242dd13 · 2003-12-17T15:45:05.000Z
a temp table
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.18 2003/12/17 15:38:42 davec Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java,v 1.19 2003/12/17 15:45:05 davec Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,22 +78,19 @@ private Object fastpathV3(int fnid, boolean resulttype, FastpathArg[] args) thro
 			// send the function call
 			try
 			{
-				int l_msgLen = 14;
-				for (int i=0; i < args.length; i++) {
-					l_msgLen += 2;
+				int l_msgLen = 0;
+				l_msgLen += 16;
+				for (int i=0;i < args.length;i++)
 					l_msgLen += args[i].sendSize();
-				}
 					
 				stream.SendChar('F');
 				stream.SendInteger(l_msgLen,4);
 				stream.SendInteger(fnid, 4);
-
+				stream.SendInteger(1,2);
+				stream.SendInteger(1,2);
 				stream.SendInteger(args.length,2);
-				for (int i=0; i < args.length; i++)
-					stream.SendInteger(1,2);
 
-				stream.SendInteger(args.length,2);
-				for (int i = 0; i < args.length; i++)
+				for (int i = 0;i < args.length;i++)
 					args[i].send(stream);
 				
 				stream.SendInteger(1,2);
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/OID74Test.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/OID74Test.java
@@ -13,7 +13,7 @@
  * User: alexei
  * Date: 17-Dec-2003
  * Time: 11:01:44
- * @version $Id: OID74Test.java,v 1.1 2003/12/17 15:38:42 davec Exp $
+ * @version $Id: OID74Test.java,v 1.2 2003/12/17 15:45:05 davec Exp $
  */
 public class OID74Test  extends TestCase
 {
@@ -41,7 +41,7 @@ public void testBinaryStream()
 			c =  DriverManager.getConnection("jdbc:postgresql://localhost/test?compatible=7.1&user=test");
     			c.setAutoCommit(false);
 			st = c.createStatement();
-        		st.execute("CREATE TABLE temp (col oid)");
+        		st.execute("CREATE temp TABLE temp (col oid)");
       		}
 		 catch (SQLException e) 
 		{

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* User: alexei`
`14`	`14`	`* Date: 17-Dec-2003`
`15`	`15`	`* Time: 11:01:44`
`16`		`- * @version $Id: OID74Test.java,v 1.1 2003/12/17 15:38:42 davec Exp $`
	`16`	`+ * @version $Id: OID74Test.java,v 1.2 2003/12/17 15:45:05 davec Exp $`
`17`	`17`	`*/`
`18`	`18`	`public class OID74Test extends TestCase`
`19`	`19`	`{`
`@@ -41,7 +41,7 @@ public void testBinaryStream()`
`41`	`41`	`c = DriverManager.getConnection("jdbc:postgresql://localhost/test?compatible=7.1&user=test");`
`42`	`42`	`c.setAutoCommit(false);`
`43`	`43`	`st = c.createStatement();`
`44`		`- st.execute("CREATE TABLE temp (col oid)");`
	`44`	`+ st.execute("CREATE temp TABLE temp (col oid)");`
`45`	`45`	`}`
`46`	`46`	`catch (SQLException e)`
`47`	`47`	`{`