dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-03 12:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix deploy bug + logging

Browse Source
This commit is contained in:
Jan Prochazka
2021-11-25 17:29:55 +01:00
parent cec0130cba
commit 9dcc235f5a
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/web/src/tabs/CompareModelTab.svelte
View File

@@ -127,6 +127,8 @@
modelCompareDbDiffOptions, modelCompareDbDiffOptions,
filterName, filterName,
DbDiffCompareDefs, DbDiffCompareDefs,
getAlterDatabaseScript,
DatabaseAnalyser,
} from 'dbgate-tools'; } from 'dbgate-tools';
import _, { startsWith } from 'lodash'; import _, { startsWith } from 'lodash';
@@ -173,16 +175,26 @@
$: sourceDbValue = useDatabaseInfo({ conid: $values?.sourceConid, database: $values?.sourceDatabase }); $: sourceDbValue = useDatabaseInfo({ conid: $values?.sourceConid, database: $values?.sourceDatabase });
$: targetDbValue = useDatabaseInfo({ conid: $values?.targetConid, database: $values?.targetDatabase }); $: targetDbValue = useDatabaseInfo({ conid: $values?.targetConid, database: $values?.targetDatabase });
$: console.log('$sourceDbValue', $sourceDbValue);
$: console.log('$targetDbValue', $targetDbValue);
$: sourceDb = generateDbPairingId($sourceDbValue); $: sourceDb = generateDbPairingId($sourceDbValue);
$: targetDb = generateDbPairingId($targetDbValue); $: targetDb = generateDbPairingId($targetDbValue);
$: connection = useConnectionInfo({ conid: $values?.targetConid }); $: connection = useConnectionInfo({ conid: $values?.targetConid });
$: driver = findEngineDriver($connection, $extensions); $: driver = findEngineDriver($connection, $extensions);
$: console.log('sourceDb', sourceDb);
$: console.log('targetDb', targetDb);
$: console.log('driver', driver);
$: targetDbPaired = matchPairedObjects(sourceDb, targetDb, dbDiffOptions); $: targetDbPaired = matchPairedObjects(sourceDb, targetDb, dbDiffOptions);
$: diffRowsAll = _.sortBy(computeDbDiffRows(sourceDb, targetDbPaired, dbDiffOptions, driver), x => $: diffRowsAll = _.sortBy(computeDbDiffRows(sourceDb, targetDbPaired, dbDiffOptions, driver), x =>
stateOrder(x.state) stateOrder(x.state)
); );
$: console.log('diffRowsAll', diffRowsAll);
$: diffRows = filterDiffRows(diffRowsAll, $values, filter); $: diffRows = filterDiffRows(diffRowsAll, $values, filter);
$: diffColumns = computeTableDiffColumns( $: diffColumns = computeTableDiffColumns(
diffRows[pairIndex]?.source, diffRows[pairIndex]?.source,
@@ -278,10 +290,20 @@
} }
function getDeploySql() { function getDeploySql() {
return diffRows const leftDb = DatabaseAnalyser.createEmptyStructure();
.filter(row => $values[`isChecked_${row.identifier}`]) const rightDb = DatabaseAnalyser.createEmptyStructure();
.map(row => getAlterTableScript(row?.target, row?.source, dbDiffOptions, sourceDb, targetDb, driver).sql)
.join('\n'); for (const diffRow of diffRows.filter(row => $values[`isChecked_${row.identifier}`])) {
if (diffRow.source) leftDb[diffRow.objectTypeField].push(diffRow.source);
if (diffRow.target) rightDb[diffRow.objectTypeField].push(diffRow.target);
}
return getAlterDatabaseScript(rightDb, leftDb, dbDiffOptions, targetDb, sourceDb, driver).sql;
// getAlterDatabaseScript();
// return diffRows
// .filter(row => $values[`isChecked_${row.identifier}`])
// .map(row => getAlterTableScript(row?.target, row?.source, dbDiffOptions, sourceDb, targetDb, driver).sql)
// .join('\n');
} }
export function deploy() { export function deploy() {