mirror of
https://github.com/DeNNiiInc/dbgate.git
synced 2026-04-23 03:26:00 +00:00
db diff sort
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
import { DbDiffOptions, testEqualColumns, testEqualTables, testEqualSqlObjects } from './diffTools';
|
import { DbDiffOptions, testEqualColumns, testEqualTables, testEqualSqlObjects } from './diffTools';
|
||||||
import { DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
|
import { DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
|
||||||
|
import _ from 'lodash';
|
||||||
|
|
||||||
export function computeDiffRowsCore(sourceList, targetList, testEqual) {
|
export function computeDiffRowsCore(sourceList, targetList, testEqual) {
|
||||||
const res = [];
|
const res = [];
|
||||||
@@ -75,21 +76,24 @@ export function computeDbDiffRows(
|
|||||||
for (const objectTypeField of ['tables', 'views', 'procedures', 'matviews', 'functions']) {
|
for (const objectTypeField of ['tables', 'views', 'procedures', 'matviews', 'functions']) {
|
||||||
const defs = COMPARE_DEFS[objectTypeField];
|
const defs = COMPARE_DEFS[objectTypeField];
|
||||||
res.push(
|
res.push(
|
||||||
...computeDiffRowsCore(sourceDb[objectTypeField], targetDb[objectTypeField], (a, b) =>
|
..._.sortBy(
|
||||||
defs.test(a, b, opts, targetDb, driver)
|
computeDiffRowsCore(sourceDb[objectTypeField], targetDb[objectTypeField], (a, b) =>
|
||||||
).map(row => ({
|
defs.test(a, b, opts, targetDb, driver)
|
||||||
...row,
|
).map(row => ({
|
||||||
sourceSchemaName: row?.source?.schemaName,
|
...row,
|
||||||
sourcePureName: row?.source?.pureName,
|
sourceSchemaName: row?.source?.schemaName,
|
||||||
targetSchemaName: row?.target?.schemaName,
|
sourcePureName: row?.source?.pureName,
|
||||||
targetPureName: row?.target?.pureName,
|
targetSchemaName: row?.target?.schemaName,
|
||||||
typeName: defs.name,
|
targetPureName: row?.target?.pureName,
|
||||||
typeIcon: defs.icon,
|
typeName: defs.name,
|
||||||
identifier: `${row?.source?.schemaName || row?.target?.schemaName}.${
|
typeIcon: defs.icon,
|
||||||
row?.source?.pureName || row?.target?.pureName
|
identifier: `${row?.source?.schemaName || row?.target?.schemaName}.${
|
||||||
}`,
|
row?.source?.pureName || row?.target?.pureName
|
||||||
objectTypeField,
|
}`,
|
||||||
}))
|
objectTypeField,
|
||||||
|
})),
|
||||||
|
'identifier'
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
|
|||||||
Reference in New Issue
Block a user