postgresql-jdbc.git / summary / log / commit / refs

commit    fe8d7b5a088435cad4a93b2da7b91f41c3db2aeb
Author:   Kris Jurka <books@ejurka.com>
Date:     Sun Mar 20 03:17:50 2011 +0000

    Fix up getSchemas for 7.2 servers that don't have schemas.  This
    was broken in the a recent change to update getSchemas for JDBC3
    and JDBC4 changes, so no need to backpatch.


 org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java | 4 ++--
 org/postgresql/test/jdbc4/DatabaseMetaDataTest.java     | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java b/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java
index 6c5f369d..153f0bd7 100644
--- a/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java
+++ b/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java
@@ -3,7 +3,7 @@
 * Copyright (c) 2004-2008, PostgreSQL Global Development Group
 *
 * IDENTIFICATION
-*   $PostgreSQL: pgjdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java,v 1.62 2010/12/26 01:59:38 jurka Exp $
+*   $PostgreSQL: pgjdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java,v 1.63 2011/01/03 19:21:37 jurka Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -2221,7 +2221,7 @@ public abstract class AbstractJdbc2DatabaseMetaData
             }
             if (schemaPattern != null)
             {
-                sql += " AND ''::text LIKE '" + escapeQuotes(schemaPattern) + "' ";
+                sql += " WHERE ''::text LIKE '" + escapeQuotes(schemaPattern) + "' ";
             }
         }
         return createMetaDataStatement().executeQuery(sql);
diff --git a/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java b/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java
index f02d3c5b..3cec098d 100644
--- a/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java
+++ b/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java
@@ -3,7 +3,7 @@
 * Copyright (c) 2007-2008, PostgreSQL Global Development Group
 *
 * IDENTIFICATION
-*   $PostgreSQL: pgjdbc/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java,v 1.4 2010/12/25 07:07:45 jurka Exp $
+*   $PostgreSQL: pgjdbc/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java,v 1.5 2010/12/26 01:59:38 jurka Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -72,6 +72,12 @@ public class DatabaseMetaDataTest extends TestCase
         DatabaseMetaData dbmd = _conn.getMetaData();
 
         ResultSet rs = dbmd.getSchemas("", "publ%");
+
+        if (!TestUtil.haveMinimumServerVersion(_conn, "7.3")) {
+            assertTrue(!rs.next());
+            return;
+        }
+
         assertTrue(rs.next());
         assertEquals("public", rs.getString("TABLE_SCHEM"));
         assertNull(rs.getString("TABLE_CATALOG"));


[parent: 8a092705ab84]