Merge pull request #1020 from katzyn/metadata

Fix getTables() and getColumns() for modern client with older server

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #992: 1.4.196+ client cannot use DatabaseMetaData with 1.4.195- server
+</li>
 <li>Issue #1016: ResultSet.getObject() should return enum value, not ordinal
 </li>
 <li>Issue #1012: NPE when querying INFORMATION_SCHEMA.COLUMNS on a view that references an ENUM column

h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java

@@ -14,11 +14,16 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Arrays;
 import java.util.Properties;
+
+import org.h2.command.CommandInterface;
 import org.h2.engine.Constants;
+import org.h2.engine.SessionInterface;
+import org.h2.engine.SessionRemote;
 import org.h2.engine.SysProperties;
 import org.h2.message.DbException;
 import org.h2.message.Trace;
 import org.h2.message.TraceObject;
+import org.h2.result.ResultInterface;
 import org.h2.tools.SimpleResultSet;
 import org.h2.util.StatementBuilder;
 import org.h2.util.StringUtils;
@@ -31,6 +36,11 @@ public class JdbcDatabaseMetaData extends TraceObject implements
 
     private final JdbcConnection conn;
 
+    /**
+     * Whether database has support for synonyms ({@code null} if not yet known).
+     */
+    private Boolean hasSynonyms;
+
     JdbcDatabaseMetaData(JdbcConnection conn, Trace trace, int id) {
         setTrace(trace, TraceObject.DATABASE_META_DATA, id);
         this.conn = conn;
@@ -105,6 +115,33 @@ public class JdbcDatabaseMetaData extends TraceObject implements
         return Constants.getFullVersion();
     }
 
+    private boolean hasSynonyms() {
+        Boolean hasSynonyms = this.hasSynonyms;
+        if (hasSynonyms == null) {
+            SessionInterface si = conn.getSession();
+            if (si instanceof SessionRemote) {
+                SessionRemote sr = (SessionRemote) si;
+                int clientVersion = sr.getClientVersion();
+                if (clientVersion >= Constants.TCP_PROTOCOL_VERSION_17) {
+                    hasSynonyms = true;
+                } else if (clientVersion <= Constants.TCP_PROTOCOL_VERSION_15) {
+                    hasSynonyms = false;
+                } else { // 1.4.194-1.4.196
+                    CommandInterface c = sr.prepareCommand("CALL H2VERSION()", Integer.MAX_VALUE);
+                    ResultInterface result = c.executeQuery(0, false);
+                    result.next();
+                    String s = result.currentRow()[0].getString();
+                    result.close();
+                    hasSynonyms = "1.4.196".equals(s);
+                }
+            } else {
+                hasSynonyms = true;
+            }
+            this.hasSynonyms = hasSynonyms;
+        }
+        return hasSynonyms;
+    }
+
     /**
      * Gets the list of tables in the database. The result set is sorted by
      * TABLE_TYPE, TABLE_SCHEM, and TABLE_NAME.
@@ -144,7 +181,7 @@ public class JdbcDatabaseMetaData extends TraceObject implements
             }
             checkClosed();
             int typesLength = types != null ? types.length : 0;
-            boolean includeSynonyms = types == null || Arrays.asList(types).contains("SYNONYM");
+            boolean includeSynonyms = hasSynonyms() && (types == null || Arrays.asList(types).contains("SYNONYM"));
 
             // (1024 - 16) is enough for the most cases
             StringBuilder select = new StringBuilder(1008);
@@ -279,39 +316,37 @@ public class JdbcDatabaseMetaData extends TraceObject implements
                         +quote(columnNamePattern)+");");
             }
             checkClosed();
-            String tableSql = "SELECT "
-                    + "TABLE_CATALOG TABLE_CAT, "
-                    + "TABLE_SCHEMA TABLE_SCHEM, "
+            boolean includeSynonyms = hasSynonyms();
+
+            StringBuilder select = new StringBuilder(2432);
+            if (includeSynonyms) {
+                select.append("SELECT "
+                        + "TABLE_CAT, "
+                        + "TABLE_SCHEM, "
                         + "TABLE_NAME, "
                         + "COLUMN_NAME, "
                         + "DATA_TYPE, "
                         + "TYPE_NAME, "
-                    + "CHARACTER_MAXIMUM_LENGTH COLUMN_SIZE, "
-                    + "CHARACTER_MAXIMUM_LENGTH BUFFER_LENGTH, "
-                    + "NUMERIC_SCALE DECIMAL_DIGITS, "
-                    + "NUMERIC_PRECISION_RADIX NUM_PREC_RADIX, "
+                        + "COLUMN_SIZE, "
+                        + "BUFFER_LENGTH, "
+                        + "DECIMAL_DIGITS, "
+                        + "NUM_PREC_RADIX, "
                         + "NULLABLE, "
                         + "REMARKS, "
-                    + "COLUMN_DEFAULT COLUMN_DEF, "
-                    + "DATA_TYPE SQL_DATA_TYPE, "
-                    + "ZERO() SQL_DATETIME_SUB, "
-                    + "CHARACTER_OCTET_LENGTH CHAR_OCTET_LENGTH, "
+                        + "COLUMN_DEF, "
+                        + "SQL_DATA_TYPE, "
+                        + "SQL_DATETIME_SUB, "
+                        + "CHAR_OCTET_LENGTH, "
                         + "ORDINAL_POSITION, "
-                    + "IS_NULLABLE IS_NULLABLE, "
-                    + "CAST(SOURCE_DATA_TYPE AS VARCHAR) SCOPE_CATALOG, "
-                    + "CAST(SOURCE_DATA_TYPE AS VARCHAR) SCOPE_SCHEMA, "
-                    + "CAST(SOURCE_DATA_TYPE AS VARCHAR) SCOPE_TABLE, "
+                        + "IS_NULLABLE, "
+                        + "SCOPE_CATALOG, "
+                        + "SCOPE_SCHEMA, "
+                        + "SCOPE_TABLE, "
                         + "SOURCE_DATA_TYPE, "
-                    + "CASE WHEN SEQUENCE_NAME IS NULL THEN "
-                    + "CAST(? AS VARCHAR) ELSE CAST(? AS VARCHAR) END IS_AUTOINCREMENT, "
-                    + "CAST(SOURCE_DATA_TYPE AS VARCHAR) SCOPE_CATLOG "
-                    + "FROM INFORMATION_SCHEMA.COLUMNS "
-                    + "WHERE TABLE_CATALOG LIKE ? ESCAPE ? "
-                    + "AND TABLE_SCHEMA LIKE ? ESCAPE ? "
-                    + "AND TABLE_NAME LIKE ? ESCAPE ? "
-                    + "AND COLUMN_NAME LIKE ? ESCAPE ? "
-                    + "ORDER BY TABLE_SCHEM, TABLE_NAME, ORDINAL_POSITION";
-            String synonymSql = "SELECT "
+                        + "IS_AUTOINCREMENT, "
+                        + "SCOPE_CATLOG "
+                        + "FROM ("
+                        + "SELECT "
                         + "s.SYNONYM_CATALOG TABLE_CAT, "
                         + "s.SYNONYM_SCHEMA TABLE_SCHEM, "
                         + "s.SYNONYM_NAME TABLE_NAME, "
@@ -335,62 +370,60 @@ public class JdbcDatabaseMetaData extends TraceObject implements
                         + "CAST(c.SOURCE_DATA_TYPE AS VARCHAR) SCOPE_TABLE, "
                         + "c.SOURCE_DATA_TYPE, "
                         + "CASE WHEN c.SEQUENCE_NAME IS NULL THEN "
-                    + "CAST(? AS VARCHAR) ELSE CAST(? AS VARCHAR) END IS_AUTOINCREMENT, "
+                        + "CAST(?1 AS VARCHAR) ELSE CAST(?2 AS VARCHAR) END IS_AUTOINCREMENT, "
                         + "CAST(c.SOURCE_DATA_TYPE AS VARCHAR) SCOPE_CATLOG "
                         + "FROM INFORMATION_SCHEMA.COLUMNS c JOIN INFORMATION_SCHEMA.SYNONYMS s ON "
                         + "s.SYNONYM_FOR = c.TABLE_NAME "
                         + "AND s.SYNONYM_FOR_SCHEMA = c.TABLE_SCHEMA "
-                    + "WHERE s.SYNONYM_CATALOG LIKE ? ESCAPE ? "
-                    + "AND s.SYNONYM_SCHEMA LIKE ? ESCAPE ? "
-                    + "AND s.SYNONYM_NAME LIKE ? ESCAPE ? "
-                    + "AND c.COLUMN_NAME LIKE ? ESCAPE ? ";
-            PreparedStatement prep = conn.prepareAutoCloseStatement("SELECT "
-                    + "TABLE_CAT, "
-                    + "TABLE_SCHEM, "
+                        + "WHERE s.SYNONYM_CATALOG LIKE ?3 ESCAPE ?7 "
+                        + "AND s.SYNONYM_SCHEMA LIKE ?4 ESCAPE ?7 "
+                        + "AND s.SYNONYM_NAME LIKE ?5 ESCAPE ?7 "
+                        + "AND c.COLUMN_NAME LIKE ?6 ESCAPE ?7 "
+                        + "UNION ");
+            }
+            select.append("SELECT "
+                    + "TABLE_CATALOG TABLE_CAT, "
+                    + "TABLE_SCHEMA TABLE_SCHEM, "
                     + "TABLE_NAME, "
                     + "COLUMN_NAME, "
                     + "DATA_TYPE, "
                     + "TYPE_NAME, "
-                    + "COLUMN_SIZE, "
-                    + "BUFFER_LENGTH, "
-                    + "DECIMAL_DIGITS, "
-                    + "NUM_PREC_RADIX, "
+                    + "CHARACTER_MAXIMUM_LENGTH COLUMN_SIZE, "
+                    + "CHARACTER_MAXIMUM_LENGTH BUFFER_LENGTH, "
+                    + "NUMERIC_SCALE DECIMAL_DIGITS, "
+                    + "NUMERIC_PRECISION_RADIX NUM_PREC_RADIX, "
                     + "NULLABLE, "
                     + "REMARKS, "
-                    + "COLUMN_DEF, "
-                    + "SQL_DATA_TYPE, "
-                    + "SQL_DATETIME_SUB, "
-                    + "CHAR_OCTET_LENGTH, "
+                    + "COLUMN_DEFAULT COLUMN_DEF, "
+                    + "DATA_TYPE SQL_DATA_TYPE, "
+                    + "ZERO() SQL_DATETIME_SUB, "
+                    + "CHARACTER_OCTET_LENGTH CHAR_OCTET_LENGTH, "
                     + "ORDINAL_POSITION, "
-                    + "IS_NULLABLE, "
-                    + "SCOPE_CATALOG, "
-                    + "SCOPE_SCHEMA, "
-                    + "SCOPE_TABLE, "
+                    + "IS_NULLABLE IS_NULLABLE, "
+                    + "CAST(SOURCE_DATA_TYPE AS VARCHAR) SCOPE_CATALOG, "
+                    + "CAST(SOURCE_DATA_TYPE AS VARCHAR) SCOPE_SCHEMA, "
+                    + "CAST(SOURCE_DATA_TYPE AS VARCHAR) SCOPE_TABLE, "
                     + "SOURCE_DATA_TYPE, "
-                    + "IS_AUTOINCREMENT, "
-                    + "SCOPE_CATLOG "
-                    + "FROM ((" + tableSql + ") UNION (" + synonymSql
-                    + ")) ORDER BY TABLE_SCHEM, TABLE_NAME, ORDINAL_POSITION");
+                    + "CASE WHEN SEQUENCE_NAME IS NULL THEN "
+                    + "CAST(?1 AS VARCHAR) ELSE CAST(?2 AS VARCHAR) END IS_AUTOINCREMENT, "
+                    + "CAST(SOURCE_DATA_TYPE AS VARCHAR) SCOPE_CATLOG "
+                    + "FROM INFORMATION_SCHEMA.COLUMNS "
+                    + "WHERE TABLE_CATALOG LIKE ?3 ESCAPE ?7 "
+                    + "AND TABLE_SCHEMA LIKE ?4 ESCAPE ?7 "
+                    + "AND TABLE_NAME LIKE ?5 ESCAPE ?7 "
+                    + "AND COLUMN_NAME LIKE ?6 ESCAPE ?7");
+            if (includeSynonyms) {
+                select.append(')');
+            }
+            PreparedStatement prep = conn.prepareAutoCloseStatement(
+                    select.append(" ORDER BY TABLE_SCHEM, TABLE_NAME, ORDINAL_POSITION").toString());
             prep.setString(1, "NO");
             prep.setString(2, "YES");
             prep.setString(3, getCatalogPattern(catalogPattern));
-            prep.setString(4, "\\");
-            prep.setString(5, getSchemaPattern(schemaPattern));
-            prep.setString(6, "\\");
-            prep.setString(7, getPattern(tableNamePattern));
-            prep.setString(8, "\\");
-            prep.setString(9, getPattern(columnNamePattern));
-            prep.setString(10, "\\");
-            prep.setString(11, "NO");
-            prep.setString(12, "YES");
-            prep.setString(13, getCatalogPattern(catalogPattern));
-            prep.setString(14, "\\");
-            prep.setString(15, getSchemaPattern(schemaPattern));
-            prep.setString(16, "\\");
-            prep.setString(17, getPattern(tableNamePattern));
-            prep.setString(18, "\\");
-            prep.setString(19, getPattern(columnNamePattern));
-            prep.setString(20, "\\");
+            prep.setString(4, getSchemaPattern(schemaPattern));
+            prep.setString(5, getPattern(tableNamePattern));
+            prep.setString(6, getPattern(columnNamePattern));
+            prep.setString(7, "\\");
             return prep.executeQuery();
         } catch (Exception e) {
             throw logAndConvert(e);