diff options
| author | Dave Cramer <davec@fastcrypt.com> | 2003-12-17 15:38:42 +0000 |
|---|---|---|
| committer | Dave Cramer <davec@fastcrypt.com> | 2003-12-17 15:38:42 +0000 |
| commit | e4955c2ec365daaae6e3eab730e0686ebbf009cc (patch) | |
| tree | 27386436e55302091c71f3a03252142f3c2f50d0 /src/interfaces/jdbc/org/postgresql/largeobject | |
| parent | 95eea2d89c49fd073ad01407d842c6f8199c74e2 (diff) | |
| download | postgresql-e4955c2ec365daaae6e3eab730e0686ebbf009cc.tar.gz | |
patch from Kris Jurka to fix large object 7.1 compatible protocol issues
modified test case from Alexey Yudichev to be part of the testsuite
Diffstat (limited to 'src/interfaces/jdbc/org/postgresql/largeobject')
| -rw-r--r-- | src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java b/src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java index 4895f1b614..2958fb0498 100644 --- a/src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java +++ b/src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java @@ -11,7 +11,7 @@ * Copyright (c) 2003, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java,v 1.11 2003/11/29 19:52:11 pgsql Exp $ + * $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/largeobject/LargeObjectManager.java,v 1.12 2003/12/17 15:38:42 davec Exp $ * *------------------------------------------------------------------------- */ @@ -116,7 +116,7 @@ public class LargeObjectManager 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 "; + " WHERE p.pronamespace=n.oid AND n.nspname='pg_catalog' AND ("; } else { sql = "SELECT proname,oid FROM pg_proc WHERE "; } @@ -129,6 +129,10 @@ public class LargeObjectManager " or proname = 'loread'" + " or proname = 'lowrite'"; + if (conn.getMetaData().supportsSchemasInTableDefinitions()) { + sql += ")"; + } + ResultSet res = conn.createStatement().executeQuery(sql); if (res == null) |