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

a temp table

diff --git a/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java b/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java
index 44243f7b8ea41a34f9245a45a87792f21154eeb8..7283641cbbd1a3a158e2dcd9b6df744b25fb4b38 100644 (file)
--- 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 @@ public class Fastpath
                        // 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
index ae80ce4286ef2f1e8e86a84e3dd10859a3b22cf7..5a5781ac691225927400069be6a2dc4d7beecb89 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/OID74Test.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/OID74Test.java
@@ -13,7 +13,7 @@ import java.sql.*;
  * User: alexei\r
  * Date: 17-Dec-2003\r
  * Time: 11:01:44\r
- * @version $Id: OID74Test.java,v 1.1 2003/12/17 15:38:42 davec Exp $\r
+ * @version $Id: OID74Test.java,v 1.2 2003/12/17 15:45:05 davec Exp $\r
  */\r
 public class OID74Test  extends TestCase\r
 {\r
@@ -41,7 +41,7 @@ public class OID74Test  extends TestCase
                        c =  DriverManager.getConnection("jdbc:postgresql://localhost/test?compatible=7.1&user=test");\r
                        c.setAutoCommit(false);\r
                        st = c.createStatement();\r
-                       st.execute("CREATE TABLE temp (col oid)");\r
+                       st.execute("CREATE temp TABLE temp (col oid)");\r
                }\r
                 catch (SQLException e) \r
                {\r