[CONJ-379] Metadata TINYTEXT type return wrong (Types.LONGVARCHAR ins…

…tead of Types.VARCHAR)
mariadb-corporation · Oct 27, 2016 · 4a52270 · 4a52270
1 parent e6c3b02
commit 4a52270
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbDatabaseMetaData.java b/src/main/java/org/mariadb/jdbc/MariaDbDatabaseMetaData.java
@@ -375,11 +375,11 @@ private String dataTypeClause(String fullTypeColumnName) {
         return
                 " CASE data_type"
                         + " WHEN 'bit' THEN " + Types.BIT
-                        + " WHEN 'tinyblob' THEN " + Types.LONGVARBINARY
+                        + " WHEN 'tinyblob' THEN " + Types.VARBINARY
                         + " WHEN 'mediumblob' THEN " + Types.LONGVARBINARY
                         + " WHEN 'longblob' THEN " + Types.LONGVARBINARY
                         + " WHEN 'blob' THEN " + Types.LONGVARBINARY
-                        + " WHEN 'tinytext' THEN " + Types.LONGVARCHAR
+                        + " WHEN 'tinytext' THEN " + Types.VARCHAR
                         + " WHEN 'mediumtext' THEN " + Types.LONGVARCHAR
                         + " WHEN 'longtext' THEN " + Types.LONGVARCHAR
                         + " WHEN 'text' THEN " + Types.LONGVARCHAR

diff --git a/src/test/java/org/mariadb/jdbc/DatabaseMetadataTest.java b/src/test/java/org/mariadb/jdbc/DatabaseMetadataTest.java
@@ -46,6 +46,7 @@ public static void initClass() throws SQLException {
                         + "  `blob_col` blob,"
                         + "  `mediumblob_col` mediumblob,"
                         + "  `longblob_col` longblob,"
+                        + "  `tinytext_col` tinytext,"
                         + "  `text_col` text,"
                         + "  `mediumtext_col` mediumtext,"
                         + "  `longtext_col` longtext"
@@ -885,10 +886,11 @@ public void getColumnsTest() throws SQLException {
             checkType(columnName, type, "char_col", Types.CHAR);
             checkType(columnName, type, "varchar_col", Types.VARCHAR);
             checkType(columnName, type, "binary_col", Types.BINARY);
-            checkType(columnName, type, "tinyblob_col", Types.LONGVARBINARY);
+            checkType(columnName, type, "tinyblob_col", Types.VARBINARY);
             checkType(columnName, type, "blob_col", Types.LONGVARBINARY);
             checkType(columnName, type, "longblob_col", Types.LONGVARBINARY);
             checkType(columnName, type, "mediumblob_col", Types.LONGVARBINARY);
+            checkType(columnName, type, "tinytext_col", Types.VARCHAR);
             checkType(columnName, type, "text_col", Types.LONGVARCHAR);
             checkType(columnName, type, "mediumtext_col", Types.LONGVARCHAR);
             checkType(columnName, type, "longtext_col", Types.LONGVARCHAR);