dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-01 20:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysql analyser & comparer fix

Browse Source
This commit is contained in:
SPRINX0\prochazka
2024-08-28 16:53:20 +02:00
parent d243af323e
commit 791a2e8cd4
2 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/tools/src/diffTools.ts
View File

@@ -142,6 +142,12 @@ function testEqualFullNames(lft: NamedObjectInfo, rgt: NamedObjectInfo, opts: Db
return testEqualSchemas(lft.schemaName, rgt.schemaName, opts) && testEqualNames(lft.pureName, rgt.pureName, opts); return testEqualSchemas(lft.schemaName, rgt.schemaName, opts) && testEqualNames(lft.pureName, rgt.pureName, opts);
} }
function testEqualDefaultValues(value1: string | null | undefined, value2: string | null | undefined) {
if (value1 == null) return value2 == null || value2 == 'NULL';
if (value2 == null) return value1 == null || value1 == 'NULL';
return value1 == value2;
}
export function testEqualColumns( export function testEqualColumns(
a: ColumnInfo, a: ColumnInfo,
b: ColumnInfo, b: ColumnInfo,
@@ -175,8 +181,7 @@ export function testEqualColumns(
return true; return true;
} }
if (checkDefault) { if (checkDefault) {
if (a.defaultValue == null) { if (!testEqualDefaultValues(a.defaultValue, b.defaultValue)) {
if (a.defaultValue != b.defaultValue) {
console.debug( console.debug(
`Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different default value: ${a.defaultValue}, ${b.defaultValue}` `Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different default value: ${a.defaultValue}, ${b.defaultValue}`
); );
@@ -190,22 +195,6 @@ export function testEqualColumns(
// ); // );
return false; return false;
} }
} else {
if (a.defaultValue != b.defaultValue) {
console.debug(
`Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different default value: ${a.defaultValue}, ${b.defaultValue}`
);
// opts.DiffLogger.Trace(
// 'Column {0}, {1}: different default values: {2}; {3}',
// a,
// b,
// a.DefaultValue,
// b.DefaultValue
// );
return false;
}
}
if (a.defaultConstraint != b.defaultConstraint) { if (a.defaultConstraint != b.defaultConstraint) {
console.debug( console.debug(
`Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different default constraint: ${a.defaultConstraint}, ${b.defaultConstraint}` `Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different default constraint: ${a.defaultConstraint}, ${b.defaultConstraint}`

2
plugins/dbgate-plugin-mysql/src/backend/Analyser.js
View File

@@ -8,6 +8,8 @@ function quoteDefaultValue(value) {
if (value == null) return value; if (value == null) return value;
if (!isNaN(value) && !isNaN(parseFloat(value))) return value; if (!isNaN(value) && !isNaN(parseFloat(value))) return value;
if (_.isString(value) && value.startsWith('CURRENT_')) return value; if (_.isString(value) && value.startsWith('CURRENT_')) return value;
// keep NULL as default value. Is this really necessary?
if (_.isString(value) && value?.toUpperCase() == 'NULL') return 'NULL';
if (_.isString(value)) { if (_.isString(value)) {
return `'${value.replace("'", "\\'")}'`; return `'${value.replace("'", "\\'")}'`;
} }