fix(MySQL): default value not displayed for DECIMAL fields

antares-sql · Feb 5, 2022 · fa3f3e1 · fa3f3e1
1 parent 2c7c978
commit fa3f3e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/common/data-types/mysql.js b/src/common/data-types/mysql.js
@@ -121,7 +121,7 @@ module.exports = [
          {
             name: 'JSON',
             length: false,
-            collation: true,
+            collation: false,
             unsigned: false,
             zerofill: false
          }

diff --git a/src/main/libs/clients/MySQLClient.js b/src/main/libs/clients/MySQLClient.js
@@ -395,7 +395,7 @@ export class MySQLClient extends AntaresCore {
                return acc;
             }, '')
             .replaceAll('\n', '')
-            .split(',')
+            .split(/,\s?(?![^(]*\))/)
             .map(f => {
                try {
                   const fieldArr = f.trim().split(' ');
@@ -440,6 +440,10 @@ export class MySQLClient extends AntaresCore {
             ? field.COLUMN_TYPE.match(/\(([^)]+)\)/)[0].slice(1, -1)
             : null;
 
+         const defaultValue = (remappedFields && remappedFields[field.COLUMN_NAME])
+            ? remappedFields[field.COLUMN_NAME].default
+            : field.COLUMN_DEFAULT;
+
          return {
             name: field.COLUMN_NAME,
             key: field.COLUMN_KEY.toLowerCase(),
@@ -458,7 +462,7 @@ export class MySQLClient extends AntaresCore {
             unsigned: field.COLUMN_TYPE.includes('unsigned'),
             zerofill: field.COLUMN_TYPE.includes('zerofill'),
             order: field.ORDINAL_POSITION,
-            default: (remappedFields && remappedFields[field.COLUMN_NAME]) ? remappedFields[field.COLUMN_NAME].default : field.COLUMN_DEFAULT,
+            default: defaultValue,
             charset: field.CHARACTER_SET_NAME,
             collation: field.COLLATION_NAME,
             autoIncrement: field.EXTRA.includes('auto_increment'),