dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-17 22:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #981 from dbgate/feature/triggers-sqlite

Browse Source 
Feature/triggers sqlite
This commit is contained in:
Jan Prochazka
2025-01-07 13:23:36 +01:00
committed by GitHub
parent d9ca29b602 029f24b079
commit 03982d4ad2
20 changed files with 146 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
integration-tests/__tests__/object-analyse.spec.js
View File

@@ -100,46 +100,50 @@ describe('Object analyse', () => {
})
);
test.each(flatSourceParameters())(
'Test parameters simple analyse - %s - %s',
testWrapper(async (conn, driver, testName, parameter, engine) => {
for (const sql of initSql) await runCommandOnDriver(conn, driver, sql);
for (const sql of engine.parametersOtherSql) await runCommandOnDriver(conn, driver, sql);
const flatParameters = flatSourceParameters();
await runCommandOnDriver(conn, driver, parameter.create);
const structure = await driver.analyseFull(conn);
if (flatParameters.length > 0) {
test.each(flatParameters)(
'Test parameters simple analyse - %s - %s',
testWrapper(async (conn, driver, testName, parameter, engine) => {
for (const sql of initSql) await runCommandOnDriver(conn, driver, sql);
for (const sql of engine.parametersOtherSql) await runCommandOnDriver(conn, driver, sql);
const parameters = structure[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters;
await runCommandOnDriver(conn, driver, parameter.create);
const structure = await driver.analyseFull(conn);
expect(parameters.length).toEqual(parameter.list.length);
for (let i = 0; i < parameters.length; i += 1) {
expect(parameters[i]).toEqual(expect.objectContaining(parameter.list[i]));
}
})
);
const parameters = structure[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters;
test.each(flatSourceParameters())(
'Test parameters create SQL - %s - %s',
testWrapper(async (conn, driver, testName, parameter, engine) => {
for (const sql of initSql) await runCommandOnDriver(conn, driver, sql);
for (const sql of engine.parametersOtherSql) await runCommandOnDriver(conn, driver, sql);
expect(parameters.length).toEqual(parameter.list.length);
for (let i = 0; i < parameters.length; i += 1) {
expect(parameters[i]).toEqual(expect.objectContaining(parameter.list[i]));
}
})
);
await runCommandOnDriver(conn, driver, parameter.create);
const structure1 = await driver.analyseFull(conn);
await runCommandOnDriver(conn, driver, parameter.drop);
test.each(flatParameters)(
'Test parameters create SQL - %s - %s',
testWrapper(async (conn, driver, testName, parameter, engine) => {
for (const sql of initSql) await runCommandOnDriver(conn, driver, sql);
for (const sql of engine.parametersOtherSql) await runCommandOnDriver(conn, driver, sql);
const obj = structure1[parameter.objectTypeField].find(x => x.pureName == 'obj1');
await driver.script(conn, obj.createSql, { discardResult: true });
await runCommandOnDriver(conn, driver, parameter.create);
const structure1 = await driver.analyseFull(conn);
await runCommandOnDriver(conn, driver, parameter.drop);
const structure2 = await driver.analyseFull(conn);
const parameters = structure2[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters;
const obj = structure1[parameter.objectTypeField].find(x => x.pureName == 'obj1');
await driver.script(conn, obj.createSql, { discardResult: true });
expect(parameters.length).toEqual(parameter.list.length);
for (let i = 0; i < parameters.length; i += 1) {
expect(parameters[i]).toEqual(expect.objectContaining(parameter.list[i]));
}
})
);
const structure2 = await driver.analyseFull(conn);
const parameters = structure2[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters;
expect(parameters.length).toEqual(parameter.list.length);
for (let i = 0; i < parameters.length; i += 1) {
expect(parameters[i]).toEqual(expect.objectContaining(parameter.list[i]));
}
})
);
}
test.each(flatSourceTriggers())(
'Test triggers - %s - %s',

32
integration-tests/engines.js
View File

@@ -355,12 +355,12 @@ const sqlServerEngine = {
drop2: 'DROP PROCEDURE obj2',
},
{
type:'triggers',
type: 'triggers',
create1: 'CREATE TRIGGER obj1 ON t1 AFTER INSERT AS BEGIN SELECT * FROM t1 END',
create2: 'CREATE TRIGGER obj2 ON t2 AFTER INSERT AS BEGIN SELECT * FROM t2 END',
drop1: 'DROP TRIGGER obj1',
drop2: 'DROP TRIGGER obj2',
}
},
],
parametersOtherSql: ['CREATE PROCEDURE obj2 (@p1 int, @p2 int) AS SELECT id from t1'],
parameters: [
@@ -458,6 +458,30 @@ const sqliteEngine = {
objects: [views],
skipOnCI: false,
skipChangeColumn: true,
triggers: [
{
testName: 'triggers after each row insert',
create: `CREATE TRIGGER obj1 AFTER INSERT ON t1 FOR EACH ROW BEGIN SELECT * FROM t1; END;`,
drop: `DROP TRIGGER obj1;`,
objectTypeField: 'triggers',
expected: {
pureName: 'obj1',
eventType: 'INSERT',
triggerTiming: 'AFTER',
},
},
{
testName: 'triggers before each row update',
create: `CREATE TRIGGER obj1 BEFORE UPDATE ON t1 FOR EACH ROW BEGIN SELECT * FROM t1; END;`,
drop: `DROP TRIGGER obj1;`,
objectTypeField: 'triggers',
expected: {
pureName: 'obj1',
eventType: 'UPDATE',
triggerTiming: 'BEFORE',
},
},
],
};
const cockroachDbEngine = {
@@ -581,10 +605,10 @@ const enginesOnLocal = [
// mariaDbEngine,
// postgreSqlEngine,
// sqlServerEngine,
// sqliteEngine,
sqliteEngine,
// cockroachDbEngine,
// clickhouseEngine,
oracleEngine,
// oracleEngine,
];
module.exports = process.env.CITEST ? enginesOnCi : enginesOnLocal;

2
packages/api/package.json
View File

@@ -30,7 +30,7 @@
"cors": "^2.8.5",
"cross-env": "^6.0.3",
"dbgate-datalib": "^6.0.0-alpha.1",
"dbgate-query-splitter": "^4.11.2",
"dbgate-query-splitter": "^4.11.3",
"dbgate-sqltree": "^6.0.0-alpha.1",
"dbgate-tools": "^6.0.0-alpha.1",
"debug": "^4.3.4",

2
packages/tools/package.json
View File

@@ -31,7 +31,7 @@
"typescript": "^4.4.3"
},
"dependencies": {
"dbgate-query-splitter": "^4.11.2",
"dbgate-query-splitter": "^4.11.3",
"dbgate-sqltree": "^6.0.0-alpha.1",
"debug": "^4.3.4",
"json-stable-stringify": "^1.0.1",

2
packages/web/package.json
View File

@@ -25,7 +25,7 @@
"chartjs-adapter-moment": "^1.0.0",
"cross-env": "^7.0.3",
"dbgate-datalib": "^6.0.0-alpha.1",
"dbgate-query-splitter": "^4.11.2",
"dbgate-query-splitter": "^4.11.3",
"dbgate-sqltree": "^6.0.0-alpha.1",
"dbgate-tools": "^6.0.0-alpha.1",
"dbgate-types": "^6.0.0-alpha.1",

6
packages/web/src/appobj/AppObjectCore.svelte
View File

@@ -194,6 +194,12 @@
<slot />
<style>
.pin,
.pin-active {
position: absolute;
right: 0;
z-index: 150;
}
.main {
padding: 5px;
cursor: pointer;

2
plugins/dbgate-plugin-mongo/package.json
View File

@@ -37,7 +37,7 @@
},
"dependencies": {
"bson": "^6.8.0",
"dbgate-query-splitter": "^4.11.2",
"dbgate-query-splitter": "^4.11.3",
"dbgate-tools": "^6.0.0-alpha.1",
"is-promise": "^4.0.0",
"lodash": "^4.17.21",

2
plugins/dbgate-plugin-mssql/package.json
View File

@@ -37,7 +37,7 @@
},
"dependencies": {
"async-lock": "^1.2.6",
"dbgate-query-splitter": "^4.11.2",
"dbgate-query-splitter": "^4.11.3",
"dbgate-tools": "^6.0.0-alpha.1",
"lodash": "^4.17.21",
"tedious": "^18.2.0"

2
plugins/dbgate-plugin-mysql/package.json
View File

@@ -37,7 +37,7 @@
},
"dependencies": {
"antares-mysql-dumper": "^0.0.1",
"dbgate-query-splitter": "^4.11.2",
"dbgate-query-splitter": "^4.11.3",
"dbgate-tools": "^6.0.0-alpha.1",
"lodash": "^4.17.21",
"mysql2": "^3.11.3"

2
plugins/dbgate-plugin-oracle/package.json
View File

@@ -35,7 +35,7 @@
"webpack-cli": "^5.1.4"
},
"dependencies": {
"dbgate-query-splitter": "^4.11.2",
"dbgate-query-splitter": "^4.11.3",
"dbgate-tools": "^6.0.0-alpha.1",
"lodash": "^4.17.21"
},

2
plugins/dbgate-plugin-postgres/package.json
View File

@@ -37,7 +37,7 @@
"dependencies": {
"wkx": "^0.5.0",
"pg-copy-streams": "^6.0.6",
"dbgate-query-splitter": "^4.11.2",
"dbgate-query-splitter": "^4.11.3",
"dbgate-tools": "^6.0.0-alpha.1",
"lodash": "^4.17.21",
"pg": "^8.11.5"

2
plugins/dbgate-plugin-redis/package.json
View File

@@ -34,7 +34,7 @@
"webpack-cli": "^5.1.4"
},
"dependencies": {
"dbgate-query-splitter": "^4.11.2",
"dbgate-query-splitter": "^4.11.3",
"dbgate-tools": "^6.0.0-alpha.1",
"lodash": "^4.17.21",
"async": "^3.2.3",

2
plugins/dbgate-plugin-sqlite/package.json
View File

@@ -37,7 +37,7 @@
"dependencies": {
"dbgate-tools": "^6.0.0-alpha.1",
"lodash": "^4.17.21",
"dbgate-query-splitter": "^4.11.2"
"dbgate-query-splitter": "^4.11.3"
},
"optionalDependencies": {
"better-sqlite3": "9.6.0"

29
plugins/dbgate-plugin-sqlite/src/backend/Analyser.js
View File

@@ -1,19 +1,6 @@
const _ = require('lodash');
const { DatabaseAnalyser } = global.DBGATE_PACKAGES['dbgate-tools'];
const indexcolsQuery = `
SELECT
m.name as tableName,
il.name as constraintName,
il."unique" as isUnique,
ii.name as columnName,
il.origin
FROM sqlite_schema AS m,
pragma_index_list(m.name) AS il,
pragma_index_info(il.name) AS ii
WHERE m.type='table' AND il.origin <> 'pk'
ORDER BY ii.seqno, il.name
`;
const sql = require('./sql');
class Analyser extends DatabaseAnalyser {
constructor(dbhan, driver, version) {
@@ -26,8 +13,8 @@ class Analyser extends DatabaseAnalyser {
}
async _getFastSnapshot() {
const objects = await this.driver.query(this.dbhan, "select * from sqlite_master where type='table' or type='view'");
const indexcols = await this.driver.query(this.dbhan, indexcolsQuery);
const objects = await this.driver.query(this.dbhan, sql.objects);
const indexcols = await this.driver.query(this.dbhan, sql.indexcols);
return {
tables: objects.rows
@@ -53,10 +40,7 @@ class Analyser extends DatabaseAnalyser {
}
async _runAnalysis() {
const objects = await this.analyserQuery(
"select * from sqlite_master where (type='table' or type='view') and name =OBJECT_ID_CONDITION",
['tables', 'views']
);
const objects = await this.analyserQuery(sql.objectsConditioned, ['tables', 'views']);
const tables = objects.rows.filter((x) => x.type == 'table');
const views = objects.rows.filter((x) => x.type == 'view');
// console.log('TABLES', tables);
@@ -79,7 +63,7 @@ class Analyser extends DatabaseAnalyser {
createSql: x.sql,
}));
const indexcols = await this.driver.query(this.dbhan, indexcolsQuery);
const indexcols = await this.driver.query(this.dbhan, sql.indexcols);
for (const tableName of this.getRequestedObjectPureNames(
'tables',
@@ -165,9 +149,12 @@ class Analyser extends DatabaseAnalyser {
}));
}
const triggers = await this.driver.query(this.dbhan, sql.triggers);
return {
tables: tableList,
views: viewList,
triggers: triggers.rows,
};
}
}

11
plugins/dbgate-plugin-sqlite/src/backend/sql/index.js Normal file
View File

@@ -0,0 +1,11 @@
const objects = require('./objects.js');
const objectsConditioned = require('./objectsConditioned.js');
const indexcols = require('./indexcols.js');
const triggers = require('./triggers.js');
module.exports = {
objects,
objectsConditioned,
indexcols,
triggers,
};

14
plugins/dbgate-plugin-sqlite/src/backend/sql/indexcols.js Normal file
View File

@@ -0,0 +1,14 @@
module.exports = `
SELECT
m.name as tableName,
il.name as constraintName,
il."unique" as isUnique,
ii.name as columnName,
il.origin
FROM sqlite_schema AS m,
pragma_index_list(m.name) AS il,
pragma_index_info(il.name) AS ii
WHERE m.type='table' AND il.origin <> 'pk'
ORDER BY ii.seqno, il.name
`;

3
plugins/dbgate-plugin-sqlite/src/backend/sql/objects.js Normal file
View File

@@ -0,0 +1,3 @@
module.exports = `
select * from sqlite_master where (type='table' or type='view')
`;

3
plugins/dbgate-plugin-sqlite/src/backend/sql/objectsConditioned.js Normal file
View File

@@ -0,0 +1,3 @@
module.exports = `
select * from sqlite_master where (type='table' or type='view') and name =OBJECT_ID_CONDITION
`;

23
plugins/dbgate-plugin-sqlite/src/backend/sql/triggers.js Normal file
View File

@@ -0,0 +1,23 @@
module.exports = `
SELECT
rowid AS objectId,
name AS pureName,
CASE
WHEN sql LIKE '% AFTER %' THEN 'AFTER'
WHEN sql LIKE '% BEFORE %' THEN 'BEFORE'
WHEN sql LIKE '% INSTEAD OF %' THEN 'INSTEAD OF'
ELSE 'UNKNOWN'
END AS triggerTiming,
CASE
WHEN sql LIKE '% INSERT %' THEN 'INSERT'
WHEN sql LIKE '% UPDATE %' THEN 'UPDATE'
WHEN sql LIKE '% DELETE %' THEN 'DELETE'
ELSE NULL
END AS eventType,
tbl_name AS tableName,
sql AS createSql
FROM
sqlite_master
WHERE
type = 'trigger';
`;

8
yarn.lock
View File

@@ -4230,10 +4230,10 @@ dbgate-plugin-tools@^1.0.4, dbgate-plugin-tools@^1.0.7, dbgate-plugin-tools@^1.0
pacote "^11.1.13"
rimraf "^3.0.2"
dbgate-query-splitter@^4.11.2:
version "4.11.2"
resolved "https://registry.yarnpkg.com/dbgate-query-splitter/-/dbgate-query-splitter-4.11.2.tgz#f54e6bcb998de7630978cd45b347d6f329115171"
integrity sha512-LG326CAsTvb4IhJPDf6vbv92zOEhVza/Cncj1L4RSFchppIdlJMhwEyAekZzCm7U2NKzYObPJN5eWvF/QJrrKQ==
dbgate-query-splitter@^4.11.3:
version "4.11.3"
resolved "https://registry.yarnpkg.com/dbgate-query-splitter/-/dbgate-query-splitter-4.11.3.tgz#8391363be4cac1bd41793e1aebb8c85b5b296f28"
integrity sha512-rdAGiaQ3f02gvN2SPMX5j3DqojIL/WE+EArvc7OkVk5QuCDNojWvDjqSxJoOBG593+Ob3lQ8/FYbKRCOYhAVYg==
debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
version "2.6.9"