fabio286/antares
1
1
Fork 0
mirror of https://github.com/Fabio286/antares.git synced 2025-02-20 05:31:00 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabio Di Stasio 2022-02-05 09:43:37 +01:00
parent 2c7c97852f
commit fa3f3e1fd8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/data-types/mysql.js
View File

@ -121,7 +121,7 @@ module.exports = [
{ {
name: 'JSON', name: 'JSON',
length: false, length: false,
collation: true, collation: false,
unsigned: false, unsigned: false,
zerofill: false zerofill: false
} }

8
src/main/libs/clients/MySQLClient.js
View File

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