ignore UNSIGNED mark in TINYINT(1) columns when TINYINT1_IS_BIT is set

mariadb-corporation · Apr 8, 2017 · b70cbb3 · b70cbb3
1 parent 908e428
commit b70cbb3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbDatabaseMetaData.java b/src/main/java/org/mariadb/jdbc/MariaDbDatabaseMetaData.java
@@ -91,7 +91,7 @@ static String columnTypeClause(int dataTypeMappingFlags) {
                 + "COLUMN_TYPE))";
 
         if ((dataTypeMappingFlags & MariaSelectResultSet.TINYINT1_IS_BIT) > 0) {
-            upperCaseWithoutSize = " IF(COLUMN_TYPE = 'tinyint(1)', 'BIT', " + upperCaseWithoutSize + ")";
+            upperCaseWithoutSize = " IF(COLUMN_TYPE like 'tinyint(1)%', 'BIT', " + upperCaseWithoutSize + ")";
         }
 
         if ((dataTypeMappingFlags & MariaSelectResultSet.YEAR_IS_DATE_TYPE) == 0) {
@@ -412,7 +412,7 @@ private String dataTypeClause(String fullTypeColumnName) {
                         + " WHEN 'timestamp' THEN " + Types.TIMESTAMP
                         + " WHEN 'tinyint' THEN "
                         + (((connection.getProtocol().getDataTypeMappingFlags() & MariaSelectResultSet.TINYINT1_IS_BIT) == 0)
-                        ? Types.TINYINT : "IF(" + fullTypeColumnName + "='tinyint(1)'," + Types.BIT + "," + Types.TINYINT + ") ")
+                        ? Types.TINYINT : "IF(" + fullTypeColumnName + " like 'tinyint(1)%'," + Types.BIT + "," + Types.TINYINT + ") ")
                         + " WHEN 'year' THEN "
                         + (((connection.getProtocol().getDataTypeMappingFlags() & MariaSelectResultSet.YEAR_IS_DATE_TYPE) == 0)
                         ? Types.SMALLINT : Types.DATE)