Commit9dddd24

Dave Cramer

committed

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

a temp table

1 parente4955c2 commit9dddd24Copy full SHA for 9dddd24

File tree

-12

lines changed

src/interfaces/jdbc/org/postgresql
- fastpath
  - Fastpath.java
- test/jdbc2
  - OID74Test.java

-12

lines changed

Lines changed: 7 additions & 10 deletions

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.18 2003/12/17 15:38:42 davec Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java,v 1.19 2003/12/17 15:45:05 davec Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -78,22 +78,19 @@ private Object fastpathV3(int fnid, boolean resulttype, FastpathArg[] args) thro`
`78`	`78`	`// send the function call`
`79`	`79`	`try`
`80`	`80`	`{`
`81`		`-intl_msgLen =14;`
`82`		`-for (inti=0;i <args.length;i++) {`
`83`		`-l_msgLen +=2;`
	`81`	`+intl_msgLen =0;`
	`82`	`+l_msgLen +=16;`
	`83`	`+for (inti=0;i <args.length;i++)`
`84`	`84`	`l_msgLen +=args[i].sendSize();`
`85`		`-}`
`86`	`85`
`87`	`86`	`stream.SendChar('F');`
`88`	`87`	`stream.SendInteger(l_msgLen,4);`
`89`	`88`	`stream.SendInteger(fnid,4);`
`90`		`-`
	`89`	`+stream.SendInteger(1,2);`
	`90`	`+stream.SendInteger(1,2);`
`91`	`91`	`stream.SendInteger(args.length,2);`
`92`		`-for (inti=0;i <args.length;i++)`
`93`		`-stream.SendInteger(1,2);`
`94`	`92`
`95`		`-stream.SendInteger(args.length,2);`
`96`		`-for (inti =0;i <args.length;i++)`
	`93`	`+for (inti =0;i <args.length;i++)`
`97`	`94`	`args[i].send(stream);`
`98`	`95`
`99`	`96`	`stream.SendInteger(1,2);`

Lines changed: 2 additions & 2 deletions

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`	`publicclassOID74TestextendsTestCase`
`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("CREATEtempTABLE temp (col oid)");`
`45`	`45`	`}`
`46`	`46`	`catch (SQLExceptione)`
`47`	`47`	`{`

Comments

(0)