Merge pull request #1663 from katzyn/console

Display correct types of H2's columns in Console

h2/src/docsrc/help/help.csv

@@ -3543,10 +3543,13 @@ The default separator is a ',' (without space).
 This method returns a string.
 If no rows are selected, the result is NULL.
 If ORDER BY is not specified order of strings is not determined.
-Note that when this aggregate is used with OVER clause its ORDER BY subclause does not enforce exact order of strings.
+When this aggregate is used with OVER clause that contains ORDER BY subclause
+it does not enforce exact order of strings.
+This aggregate needs additional own ORDER BY clause to make it deterministic.
 Aggregates are only allowed in select statements.
 ","
 GROUP_CONCAT(NAME ORDER BY ID SEPARATOR ', ')
+GROUP_CONCAT(ID ORDER BY ID SEPARATOR ', ') OVER (ORDER BY ID)
 "
 
 "Functions (Aggregate)","ARRAY_AGG","
@@ -3558,10 +3561,13 @@ Aggregate the value into an array.
 This method returns an array.
 If no rows are selected, the result is NULL.
 If ORDER BY is not specified order of values is not determined.
-Note that when this aggregate is used with OVER clause its ORDER BY subclause does not enforce exact order of values.
+When this aggregate is used with OVER clause that contains ORDER BY subclause
+it does not enforce exact order of values.
+This aggregate needs additional own ORDER BY clause to make it deterministic.
 Aggregates are only allowed in select statements.
 ","
 ARRAY_AGG(NAME ORDER BY ID)
+ARRAY_AGG(ID ORDER BY ID) OVER (ORDER BY ID)
 "
 
 "Functions (Aggregate)","MAX","

h2/src/docsrc/html/changelog.html

@@ -21,8 +21,16 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #1576: H2 Console should not display precision and scale for data types that don't have them
+</li>
+<li>PR #1662: Fix Alter Table Drop Column In View when table name is wrapped by Double Quotes
+</li>
 <li>PR #1660: Optimize window aggregates with AND UNBOUNDED FOLLOWING and no exclusions
 </li>
+<li>PR #1658: Assorted small changes
+</li>
+<li>PR #1657: Failure to stop background thread
+</li>
 <li>PR #1656: Optimize window aggregates with ORDER BY + UNBOUNDED PRECEDING + no exclusions
 </li>
 <li>Issue #1654: OOM in TestMemoryUsage, in big mode

h2/src/main/org/h2/bnf/context/DbColumn.java

@@ -27,31 +27,30 @@ public class DbColumn {
             throws SQLException {
         name = rs.getString("COLUMN_NAME");
         quotedName = contents.quoteIdentifier(name);
+        position = rs.getInt("ORDINAL_POSITION");
+        if (contents.isH2() && !procedureColumn) {
+            dataType = rs.getString("COLUMN_TYPE");
+            return;
+        }
         String type = rs.getString("TYPE_NAME");
         // a procedures column size is identified by PRECISION, for table this
         // is COLUMN_SIZE
-        String precisionColumnName;
+        String precisionColumnName, scaleColumnName;
         if (procedureColumn) {
             precisionColumnName = "PRECISION";
+            scaleColumnName = "SCALE";
         } else {
             precisionColumnName = "COLUMN_SIZE";
+            scaleColumnName = "DECIMAL_DIGITS";
         }
         int precision = rs.getInt(precisionColumnName);
-        position = rs.getInt("ORDINAL_POSITION");
-        boolean isSQLite = contents.isSQLite();
-        if (precision > 0 && !isSQLite) {
-            type += "(" + precision;
-            String scaleColumnName;
-            if (procedureColumn) {
-                scaleColumnName = "SCALE";
+        if (precision > 0 && !contents.isSQLite()) {
+            int scale = rs.getInt(scaleColumnName);
+            if (scale > 0) {
+                type = type + '(' + precision + ", " + scale + ')';
             } else {
-                scaleColumnName = "DECIMAL_DIGITS";
-            }
-            int prec = rs.getInt(scaleColumnName);
-            if (prec > 0) {
-                type += ", " + prec;
+                type = type + '(' + precision + ')';
             }
-            type += ")";
         }
         if (rs.getInt("NULLABLE") == DatabaseMetaData.columnNoNulls) {
             type += " NOT NULL";

h2/src/main/org/h2/bnf/context/DbSchema.java

@@ -6,6 +6,7 @@
 package org.h2.bnf.context;
 
 import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -119,9 +120,13 @@ public class DbSchema {
         rs.close();
         tables = list.toArray(new DbTableOrView[0]);
         if (tables.length < SysProperties.CONSOLE_MAX_TABLES_LIST_COLUMNS) {
+            try (PreparedStatement ps = contents.isH2() ? meta.getConnection().prepareStatement(
+                    "SELECT COLUMN_NAME, ORDINAL_POSITION, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS"
+                            + " WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?")
+                    : null) {
                 for (DbTableOrView tab : tables) {
                     try {
-                    tab.readColumns(meta);
+                        tab.readColumns(meta, ps);
                     } catch (SQLException e) {
                         // MySQL:
                         // View '...' references invalid table(s) or column(s)
@@ -132,6 +137,7 @@ public class DbSchema {
                 }
             }
         }
+    }
 
     /**
      * Read all procedures in the database.

h2/src/main/org/h2/bnf/context/DbTableOrView.java

@@ -6,6 +6,7 @@
 package org.h2.bnf.context;
 
 import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -88,9 +89,18 @@ public class DbTableOrView {
      * Read the column for this table from the database meta data.
      *
      * @param meta the database meta data
+     * @param ps prepared statement with custom query for H2 database, null for
+     *           others
      */
-    public void readColumns(DatabaseMetaData meta) throws SQLException {
-        ResultSet rs = meta.getColumns(null, schema.name, name, null);
+    public void readColumns(DatabaseMetaData meta, PreparedStatement ps) throws SQLException {
+        ResultSet rs;
+        if (schema.getContents().isH2()) {
+            ps.setString(1, schema.name);
+            ps.setString(2, name);
+            rs = ps.executeQuery();
+        } else {
+            rs = meta.getColumns(null, schema.name, name, null);
+        }
         ArrayList<DbColumn> list = new ArrayList<>();
         while (rs.next()) {
             DbColumn column = DbColumn.getColumn(schema.getContents(), rs);

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -805,4 +805,4 @@ queryparser tokenized freeze factorings recompilation unenclosed rfe dsync
 econd irst bcef ordinality nord unnest
 analyst occupation distributive josaph aor engineer sajeewa isuru randil kevin doctor businessman artist ashan
 corrupts splitted disruption unintentional octets preconditions predicates subq objectweb insn opcodes
-preserves masking holder unboxing avert iae transformed subtle reevaluate exclusions subclause
+preserves masking holder unboxing avert iae transformed subtle reevaluate exclusions subclause ftbl