Some database metadata calls returned the wrong data type for DATA_TYPE columns.

h2/src/main/org/h2/table/MetaTable.java

@@ -139,7 +139,7 @@ public class MetaTable extends Table {
                     "ORDINAL_POSITION INT",
                     "COLUMN_DEFAULT",
                     "IS_NULLABLE",
-                    "DATA_TYPE SMALLINT",
+                    "DATA_TYPE INT",
                     "CHARACTER_MAXIMUM_LENGTH INT",
                     "CHARACTER_OCTET_LENGTH INT",
                     "NUMERIC_PRECISION INT",
@@ -149,7 +149,7 @@ public class MetaTable extends Table {
                     "COLLATION_NAME",
                     // extensions
                     "TYPE_NAME",
-                    "NULLABLE SMALLINT",
+                    "NULLABLE INT",
                     "IS_COMPUTED BIT",
                     "SELECTIVITY INT",
                     "CHECK_CONSTRAINT",
@@ -191,7 +191,7 @@ public class MetaTable extends Table {
             setObjectName("TYPE_INFO");
             cols = createColumns(new String[]{
                 "TYPE_NAME",
-                "DATA_TYPE SMALLINT",
+                "DATA_TYPE INT",
                 "PRECISION INT",
                 "PREFIX",
                 "SUFFIX",
@@ -421,7 +421,7 @@ public class MetaTable extends Table {
                     "CONSTANT_CATALOG",
                     "CONSTANT_SCHEMA",
                     "CONSTANT_NAME",
-                    "DATA_TYPE SMALLINT",
+                    "DATA_TYPE INT",
                     "REMARKS",
                     "SQL",
                     "ID INT"
@@ -435,7 +435,7 @@ public class MetaTable extends Table {
                     "DOMAIN_NAME",
                     "COLUMN_DEFAULT",
                     "IS_NULLABLE",
-                    "DATA_TYPE SMALLINT",
+                    "DATA_TYPE INT",
                     "PRECISION INT",
                     "SCALE INT",
                     "TYPE_NAME",

h2/src/test/org/h2/test/jdbc/TestMetaData.java

@@ -595,8 +595,8 @@ public class TestMetaData extends TestBase {
                 "TYPE_NAME", "COLUMN_SIZE", "BUFFER_LENGTH", "DECIMAL_DIGITS", "NUM_PREC_RADIX", "NULLABLE", "REMARKS",
                 "COLUMN_DEF", "SQL_DATA_TYPE", "SQL_DATETIME_SUB", "CHAR_OCTET_LENGTH", "ORDINAL_POSITION",
                 "IS_NULLABLE" }, new int[] { Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR,
-                Types.SMALLINT, Types.VARCHAR, Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.INTEGER,
-                Types.SMALLINT, Types.VARCHAR, Types.VARCHAR, Types.SMALLINT, Types.INTEGER, Types.INTEGER,
+                Types.INTEGER, Types.VARCHAR, Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.INTEGER,
+                Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.INTEGER, Types.INTEGER,
                 Types.INTEGER, Types.VARCHAR }, null, null);
         assertResultSetOrdered(rs,
                 new String[][] {
@@ -791,10 +791,10 @@ public class TestMetaData extends TestBase {
         assertResultSetMeta(rs, 18, new String[] { "TYPE_NAME", "DATA_TYPE", "PRECISION", "LITERAL_PREFIX",
                 "LITERAL_SUFFIX", "CREATE_PARAMS", "NULLABLE", "CASE_SENSITIVE", "SEARCHABLE", "UNSIGNED_ATTRIBUTE",
                 "FIXED_PREC_SCALE", "AUTO_INCREMENT", "LOCAL_TYPE_NAME", "MINIMUM_SCALE", "MAXIMUM_SCALE",
-                "SQL_DATA_TYPE", "SQL_DATETIME_SUB", "NUM_PREC_RADIX" }, new int[] { Types.VARCHAR, Types.SMALLINT,
+                "SQL_DATA_TYPE", "SQL_DATETIME_SUB", "NUM_PREC_RADIX" }, new int[] { Types.VARCHAR, Types.INTEGER,
                 Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.SMALLINT, DataType.TYPE_BOOLEAN,
                 Types.SMALLINT, DataType.TYPE_BOOLEAN, DataType.TYPE_BOOLEAN, DataType.TYPE_BOOLEAN, Types.VARCHAR,
-                Types.SMALLINT, Types.SMALLINT, Types.SMALLINT, Types.INTEGER, Types.INTEGER }, null, null);
+                Types.SMALLINT, Types.SMALLINT, Types.INTEGER, Types.INTEGER, Types.INTEGER }, null, null);
 
         rs = meta.getTablePrivileges(null, null, null);
         assertResultSetMeta(rs, 7, new String[] { "TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "GRANTOR", "GRANTEE",