? src/interfaces/jdbc/org/postgresql/fastpath/.Fastpath.java.swp Index: src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java =================================================================== RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java,v retrieving revision 1.17 diff -c -r1.17 Fastpath.java *** src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java 29 Nov 2003 19:52:09 -0000 1.17 --- src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java 17 Dec 2003 12:09:03 -0000 *************** *** 63,69 **** */ public Object fastpath(int fnid, boolean resulttype, FastpathArg[] args) throws SQLException { ! if (conn.haveMinimumServerVersion("7.4")) { return fastpathV3(fnid, resulttype, args); } else { return fastpathV2(fnid, resulttype, args); --- 63,69 ---- */ public Object fastpath(int fnid, boolean resulttype, FastpathArg[] args) throws SQLException { ! if (conn.haveMinimumCompatibleVersion("7.4")) { return fastpathV3(fnid, resulttype, args); } else { return fastpathV2(fnid, resulttype, args); *************** *** 78,96 **** // send the function call try { ! 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++) args[i].send(stream); stream.SendInteger(1,2); --- 78,99 ---- // send the function call try { ! int l_msgLen = 14; ! for (int i=0; i < args.length; i++) { ! l_msgLen += 2; l_msgLen += args[i].sendSize(); + } stream.SendChar('F'); stream.SendInteger(l_msgLen,4); stream.SendInteger(fnid, 4); ! 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++) args[i].send(stream); stream.SendInteger(1,2); Index: src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java =================================================================== RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java,v retrieving revision 1.11 diff -c -r1.11 LargeObjectManager.java *** src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java 29 Nov 2003 19:52:11 -0000 1.11 --- src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java 17 Dec 2003 12:09:03 -0000 *************** *** 116,122 **** if (conn.getMetaData().supportsSchemasInTableDefinitions()) { sql = "SELECT p.proname,p.oid "+ " FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n "+ ! " WHERE p.pronamespace=n.oid AND n.nspname='pg_catalog' AND "; } else { sql = "SELECT proname,oid FROM pg_proc WHERE "; } --- 116,122 ---- if (conn.getMetaData().supportsSchemasInTableDefinitions()) { sql = "SELECT p.proname,p.oid "+ " FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n "+ ! " WHERE p.pronamespace=n.oid AND n.nspname='pg_catalog' AND ("; } else { sql = "SELECT proname,oid FROM pg_proc WHERE "; } *************** *** 128,133 **** --- 128,137 ---- " or proname = 'lo_tell'" + " or proname = 'loread'" + " or proname = 'lowrite'"; + + if (conn.getMetaData().supportsSchemasInTableDefinitions()) { + sql += ")"; + } ResultSet res = conn.createStatement().executeQuery(sql);