diff --git a/src/common/data-types/mysql.js b/src/common/data-types/mysql.js
index 126a3a58..1b02dd6b 100644
--- a/src/common/data-types/mysql.js
+++ b/src/common/data-types/mysql.js
@@ -206,7 +206,7 @@ module.exports = [
          },
          {
             name: 'TIMESTAMP',
-            length: true,
+            length: false,
             collation: false,
             unsigned: false,
             zerofill: false
diff --git a/src/common/fieldTypes.js b/src/common/fieldTypes.js
index 14938194..0e287813 100644
--- a/src/common/fieldTypes.js
+++ b/src/common/fieldTypes.js
@@ -1,12 +1,12 @@
-export const TEXT = ['char', 'varchar'];
-export const LONG_TEXT = ['text', 'mediumtext', 'longtext'];
+export const TEXT = ['CHAR', 'VARCHAR'];
+export const LONG_TEXT = ['TEXT', 'MEDIUMTEXT', 'longtext'];
 
-export const NUMBER = ['int', 'tinyint', 'smallint', 'mediumint', 'bigint', 'float', 'double', 'decimal', 'bool'];
+export const NUMBER = ['INT', 'TINYINT', 'SMALLINT', 'MEDIUMINT', 'BIGINT', 'FLOAT', 'DOUBLE', 'DECIMAL', 'BOOL'];
 
-export const DATE = ['date'];
-export const TIME = ['time'];
-export const DATETIME = ['datetime', 'timestamp'];
+export const DATE = ['DATE'];
+export const TIME = ['TIME'];
+export const DATETIME = ['DATETIME', 'TIMESTAMP'];
 
-export const BLOB = ['blob', 'mediumblob', 'longblob'];
+export const BLOB = ['BLOB', 'MEDIUMBLOB', 'LONGBLOB'];
 
-export const BIT = ['bit'];
+export const BIT = ['BIT'];
diff --git a/src/renderer/components/ModalNewTableRow.vue b/src/renderer/components/ModalNewTableRow.vue
index f0cbc611..78b46583 100644
--- a/src/renderer/components/ModalNewTableRow.vue
+++ b/src/renderer/components/ModalNewTableRow.vue
@@ -55,7 +55,7 @@
                               :disabled="fieldsToExclude.includes(field.name)"
                               :tabindex="key+1"
                            >
-                           <span class="input-group-addon" :class="`type-${field.type}`">
+                           <span class="input-group-addon" :class="`type-${field.type.toLowerCase()}`">
                               {{ field.type }} {{ fieldLength(field) | wrapNumber }}
                            </span>
                            <label class="form-checkbox ml-3" :title="$t('word.insert')">
diff --git a/src/renderer/components/WorkspaceQueryTableRow.vue b/src/renderer/components/WorkspaceQueryTableRow.vue
index b2133b2d..3390d200 100644
--- a/src/renderer/components/WorkspaceQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceQueryTableRow.vue
@@ -157,6 +157,8 @@ export default {
       typeFormat (val, type, precision) {
          if (!val) return val;
 
+         type = type.toUpperCase();
+
          if (DATE.includes(type))
             return moment(val).isValid() ? moment(val).format('YYYY-MM-DD') : val;