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

safe mysql analyser

Browse Source
This commit is contained in:
Jan Prochazka
2022-02-03 17:32:40 +01:00
parent 2958eb372a
commit c14d0fa360
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/tools/src/DatabaseAnalyser.ts
View File

@@ -229,6 +229,17 @@ export class DatabaseAnalyser {
return [..._compact(res), ...this.getDeletedObjects(snapshot)]; return [..._compact(res), ...this.getDeletedObjects(snapshot)];
} }
async safeQuery(sql) {
try {
return await this.driver.query(this.pool, sql);
} catch (err) {
console.log('Error running analyser query', err.message);
return {
rows: [],
};
}
}
static createEmptyStructure(): DatabaseInfo { static createEmptyStructure(): DatabaseInfo {
return { return {
tables: [], tables: [],

15
plugins/dbgate-plugin-mysql/src/backend/Analyser.js
View File

@@ -65,17 +65,14 @@ class Analyser extends DatabaseAnalyser {
async _runAnalysis() { async _runAnalysis() {
const tables = await this.driver.query(this.pool, this.createQuery('tables', ['tables'])); const tables = await this.driver.query(this.pool, this.createQuery('tables', ['tables']));
const columns = await this.driver.query(this.pool, this.createQuery('columns', ['tables', 'views'])); const columns = await this.driver.query(this.pool, this.createQuery('columns', ['tables', 'views']));
const pkColumns = await this.driver.query(this.pool, this.createQuery('primaryKeys', ['tables'])); const pkColumns = await this.safeQuery(this.createQuery('primaryKeys', ['tables']));
const fkColumns = await this.driver.query(this.pool, this.createQuery('foreignKeys', ['tables'])); const fkColumns = await this.safeQuery(this.createQuery('foreignKeys', ['tables']));
const views = await this.driver.query(this.pool, this.createQuery('views', ['views'])); const views = await this.safeQuery(this.createQuery('views', ['views']));
const programmables = await this.driver.query( const programmables = await this.safeQuery(this.createQuery('programmables', ['procedures', 'functions']));
this.pool,
this.createQuery('programmables', ['procedures', 'functions'])
);
const viewTexts = await this.getViewTexts(views.rows.map(x => x.pureName)); const viewTexts = await this.getViewTexts(views.rows.map(x => x.pureName));
const indexes = await this.driver.query(this.pool, this.createQuery('indexes', ['tables'])); const indexes = await this.safeQuery(this.createQuery('indexes', ['tables']));
const uniqueNames = await this.driver.query(this.pool, this.createQuery('uniqueNames', ['tables'])); const uniqueNames = await this.safeQuery(this.createQuery('uniqueNames', ['tables']));
return { return {
tables: tables.rows.map(table => ({ tables: tables.rows.map(table => ({