#2866 MySQL: year data type reading/editing fix

dbeaver · Jan 11, 2019 · cb361a3 · cb361a3
1 parent 17e17b4
commit cb361a3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...iss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/data/MySQLDateTimeValueHandler.java b/...iss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/data/MySQLDateTimeValueHandler.java
@@ -26,6 +26,7 @@
 import org.jkiss.dbeaver.model.exec.DBCSession;
 import org.jkiss.dbeaver.model.exec.DBCStatement;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
+import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet;
 import org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCDateTimeValueHandler;
 import org.jkiss.dbeaver.model.messages.ModelMessages;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;
@@ -53,6 +54,19 @@ public MySQLDateTimeValueHandler(DBDDataFormatterProfile formatterProfile)
 
     @Override
     public Object fetchValueObject(@NotNull DBCSession session, @NotNull DBCResultSet resultSet, @NotNull DBSTypedObject type, int index) throws DBCException {
+        if (MySQLConstants.TYPE_YEAR.equalsIgnoreCase(type.getTypeName()) && resultSet instanceof JDBCResultSet) {
+            JDBCResultSet dbResults = (JDBCResultSet) resultSet;
+            try {
+                int year = dbResults.getInt(index + 1);
+                if (dbResults.wasNull()) {
+                    return null;
+                } else {
+                    return year;
+                }
+            } catch (SQLException e) {
+                log.debug("Error reading year value", e);
+            }
+        }
         return super.fetchValueObject(session, resultSet, type, index);
     }
 
@@ -71,7 +85,7 @@ public void bindValueObject(@NotNull DBCSession session, @NotNull DBCStatement s
             catch (SQLException e) {
                 throw new DBCException(ModelMessages.model_jdbc_exception_could_not_bind_statement_parameter, e);
             }
-        } else if (MySQLConstants.TYPE_YEAR.equals(type.getTypeName())) {
+        } else if (MySQLConstants.TYPE_YEAR.equalsIgnoreCase(type.getTypeName())) {
             try {
                 JDBCPreparedStatement dbStat = (JDBCPreparedStatement)statement;
                 if (value instanceof Number) {

diff --git a/...jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/DateTimeCustomValueHandler.java b/...jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/DateTimeCustomValueHandler.java
@@ -86,7 +86,7 @@ public Object getValueFromObject(@NotNull DBCSession session, @NotNull DBSTypedO
     @Override
     public String getValueDisplayString(@NotNull DBSTypedObject column, Object value, @NotNull DBDDisplayFormat format)
     {
-        if (value == null || value instanceof String) {
+        if (value == null || value instanceof String || value instanceof Number) {
             return super.getValueDisplayString(column, value, format);
         }
         try {