dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-29 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

using GO separator for MS SQL db sync

Browse Source
This commit is contained in:
Jan Prochazka
2021-11-25 17:43:09 +01:00
parent 9dcc235f5a
commit 8fd2c78b6a
5 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -468,7 +468,7 @@ export function getAlterTableScript(
} }
const plan = createAlterTablePlan(oldTable, newTable, opts, wholeOldDb, wholeNewDb, driver); const plan = createAlterTablePlan(oldTable, newTable, opts, wholeOldDb, wholeNewDb, driver);
const dmp = driver.createDumper(); const dmp = driver.createDumper({ useHardSeparator: true });
if (!driver.dialect.disableExplicitTransaction) dmp.beginTransaction(); if (!driver.dialect.disableExplicitTransaction) dmp.beginTransaction();
plan.run(dmp); plan.run(dmp);
if (!driver.dialect.disableExplicitTransaction) dmp.commitTransaction(); if (!driver.dialect.disableExplicitTransaction) dmp.commitTransaction();
@@ -487,7 +487,7 @@ export function getAlterDatabaseScript(
driver: EngineDriver driver: EngineDriver
) { ) {
const plan = createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver); const plan = createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver);
const dmp = driver.createDumper(); const dmp = driver.createDumper({ useHardSeparator: true });
if (!driver.dialect.disableExplicitTransaction) dmp.beginTransaction(); if (!driver.dialect.disableExplicitTransaction) dmp.beginTransaction();
plan.run(dmp); plan.run(dmp);
if (!driver.dialect.disableExplicitTransaction) dmp.commitTransaction(); if (!driver.dialect.disableExplicitTransaction) dmp.commitTransaction();

4
packages/tools/src/driverBase.ts
View File

@@ -32,8 +32,8 @@ export const driverBase = {
const analyser = new this.analyserClass(pool, this, version); const analyser = new this.analyserClass(pool, this, version);
return analyser.incrementalAnalysis(structure); return analyser.incrementalAnalysis(structure);
}, },
createDumper() { createDumper(options = null) {
return new this.dumperClass(this); return new this.dumperClass(this, options);
}, },
async script(pool, sql) { async script(pool, sql) {
for (const sqlItem of splitQuery(sql, this.getQuerySplitterOptions('script'))) { for (const sqlItem of splitQuery(sql, this.getQuerySplitterOptions('script'))) {

2
packages/types/engines.d.ts vendored
View File

@@ -72,7 +72,7 @@ export interface EngineDriver {
analyseIncremental(pool: any, structure: DatabaseInfo, serverVersion): Promise<DatabaseInfo>; analyseIncremental(pool: any, structure: DatabaseInfo, serverVersion): Promise<DatabaseInfo>;
dialect: SqlDialect; dialect: SqlDialect;
dialectByVersion(version): SqlDialect; dialectByVersion(version): SqlDialect;
createDumper(): SqlDumper; createDumper(options = null): SqlDumper;
getAuthTypes(): EngineAuthType[]; getAuthTypes(): EngineAuthType[];
readCollection(pool: any, options: ReadCollectionOptions): Promise<any>; readCollection(pool: any, options: ReadCollectionOptions): Promise<any>;
updateCollection(pool: any, changeSet: any): Promise<any>; updateCollection(pool: any, changeSet: any): Promise<any>;

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

@@ -186,6 +186,7 @@
$: console.log('sourceDb', sourceDb); $: console.log('sourceDb', sourceDb);
$: console.log('targetDb', targetDb); $: console.log('targetDb', targetDb);
$: console.log('connection', connection);
$: console.log('driver', driver); $: console.log('driver', driver);
$: targetDbPaired = matchPairedObjects(sourceDb, targetDb, dbDiffOptions); $: targetDbPaired = matchPairedObjects(sourceDb, targetDb, dbDiffOptions);

15
plugins/dbgate-plugin-mssql/src/frontend/MsSqlDumper.js
View File

@@ -1,6 +1,21 @@
const { SqlDumper, testEqualColumns } = global.DBGATE_TOOLS; const { SqlDumper, testEqualColumns } = global.DBGATE_TOOLS;
class MsSqlDumper extends SqlDumper { class MsSqlDumper extends SqlDumper {
constructor(driver, options) {
super(driver);
if (options && options.useHardSeparator) {
this.useHardSeparator = true;
}
}
endCommand() {
if (this.useHardSeparator) {
this.putRaw('\nGO\n');
} else {
super.endCommand();
}
}
autoIncrement() { autoIncrement() {
this.put(' ^identity'); this.put(' ^identity');
} }