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

oracle fixes

Browse Source
This commit is contained in:
Jan Prochazka
2024-12-11 16:33:28 +01:00
parent face7ecdb5
commit ec5d05fc26
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
integration-tests/__tests__/deploy-database.spec.js
View File

@@ -69,6 +69,22 @@ function checkStructure(
} }
} }
// function convertObjectText(text, driver) {
// if (!text) return undefined;
// text = formatQueryWithoutParams(driver, text);
// if (driver.dialect.requireFromDual && text.startsWith('create view ') && !text.includes('from')) {
// text = text + ' from dual';
// }
// return text;
// }
// function convertModelToEngine(model, driver) {
// return model.map(x => ({
// ...x,
// text: convertObjectText(x.text, driver),
// }));
// }
function convertModelToEngine(model, driver) { function convertModelToEngine(model, driver) {
return model.map(x => ({ return model.map(x => ({
...x, ...x,
@@ -542,7 +558,7 @@ describe('Deploy database', () => {
const V1_VARIANT2 = { const V1_VARIANT2 = {
name: 'v1.view.sql', name: 'v1.view.sql',
text: 'create view ~v1 as select 1 as c1', text: 'create view ~v1 as select ~id + ~id from ~t1',
}; };
const V1_DELETED = { const V1_DELETED = {
@@ -694,7 +710,7 @@ describe('Deploy database', () => {
[ [
{ {
name: '1.predeploy.sql', name: '1.predeploy.sql',
text: 'create table ~t1 (~id int primary key); insert into ~t1 (id) values (1);', text: 'create table ~t1 (~id int primary key); insert into ~t1 (~id) values (1);',
}, },
], ],
]); ]);

2
integration-tests/__tests__/schema-tests.spec.js
View File

@@ -76,7 +76,7 @@ describe('Schema tests', () => {
}); });
describe('Base analyser test', () => { describe('Base analyser test', () => {
test.each(engines.map(engine => [engine.label, engine]))( test.each(engines.filter(x => !x.skipIncrementalAnalysis).map(engine => [engine.label, engine]))(
'Structure without change - %s', 'Structure without change - %s',
testWrapper(async (conn, driver, engine) => { testWrapper(async (conn, driver, engine) => {
await baseStructure(conn, driver); await baseStructure(conn, driver);

1
integration-tests/engines.js
View File

@@ -417,6 +417,7 @@ end;$$`,
skipOnCI: false, skipOnCI: false,
dbSnapshotBySeconds: true, dbSnapshotBySeconds: true,
setNullDefaultInsteadOfDrop: true, setNullDefaultInsteadOfDrop: true,
skipIncrementalAnalysis: true,
}, },
]; ];

3
packages/datalib/src/DataDuplicator.ts
View File

@@ -140,6 +140,9 @@ class DuplicatorItemHolder {
weakref.foreignKey.columns[0].columnName weakref.foreignKey.columns[0].columnName
); );
}); });
if (this.duplicator.driver.dialect.requireFromDual) {
dmp.put(' ^from ^dual');
}
}); });
const qrow = qres.rows[0]; const qrow = qres.rows[0];
return this.weakReferences.filter(x => qrow[x.columnName] == 0).map(x => x.columnName); return this.weakReferences.filter(x => qrow[x.columnName] == 0).map(x => x.columnName);