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

SYNC: some fixes

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-02-24 15:18:35 +01:00
committed by Diflow
parent afcb226111
commit 963994b1e5
7 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/tools/src/SqlDumper.ts
View File

@@ -259,11 +259,21 @@ export class SqlDumper implements AlterProcessor {
this.putRaw(' ');
this.specialColumnOptions(column);
if (includeNullable && !this.dialect?.specificNullabilityImplementation) {
this.put(column.notNull ? '^not ^null' : '^null');
}
if (includeDefault && column.defaultValue?.toString()?.trim()) {
this.columnDefault(column);
if (this.dialect?.defaultValueBeforeNullability) {
if (includeDefault && column.defaultValue?.toString()?.trim()) {
this.columnDefault(column);
}
if (includeNullable && !this.dialect?.specificNullabilityImplementation) {
this.put(column.notNull ? '^not ^null' : '^null');
}
} else {
if (includeNullable && !this.dialect?.specificNullabilityImplementation) {
this.put(column.notNull ? '^not ^null' : '^null');
}
if (includeDefault && column.defaultValue?.toString()?.trim()) {
this.columnDefault(column);
}
}
}

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

@@ -45,6 +45,10 @@ export function createBulkInsertStreamBase(driver: EngineDriver, stream, dbhan,
logger.info({ sql: dmp.s }, `Creating table ${fullNameQuoted}`);
await driver.script(dbhan, dmp.s);
structure = await driver.analyseSingleTable(dbhan, name);
writable.structure = structure;
}
if (!writable.structure) {
throw new Error(`Error importing table - ${fullNameQuoted} not found`);
}
if (options.truncate) {
await driver.script(dbhan, `TRUNCATE TABLE ${fullNameQuoted}`);

1
packages/types/dialect.d.ts vendored
View File

@@ -63,6 +63,7 @@ export interface SqlDialect {
requireFromDual?: boolean;
userDatabaseNamePrefix?: string; // c## in Oracle
upperCaseAllDbObjectNames?: boolean;
defaultValueBeforeNullability?: boolean;
predefinedDataTypes: string[];