diff --git a/api/src/engines/mysql/MySqlAnalyser.js b/api/src/engines/mysql/MySqlAnalyser.js index 64406040b..85df767fb 100644 --- a/api/src/engines/mysql/MySqlAnalyser.js +++ b/api/src/engines/mysql/MySqlAnalyser.js @@ -23,7 +23,6 @@ class MySqlAnalyser extends DatabaseAnalayser { functions = false, triggers = false ) { - console.log('DB', this.pool._database_name); let res = await loadQuery(resFileName); res = res.replace('=[OBJECT_NAME_CONDITION]', ' is not null'); res = res.replace('#DATABASE#', this.pool._database_name); diff --git a/api/src/engines/mysql/index.js b/api/src/engines/mysql/index.js index dc893e791..77b1523c6 100644 --- a/api/src/engines/mysql/index.js +++ b/api/src/engines/mysql/index.js @@ -21,7 +21,7 @@ const driver = { return new Promise((resolve, reject) => { connection.query(sql, function(error, results, fields) { if (error) reject(error); - resolve({ rows: results }); + resolve({ rows: results, columns: fields }); }); }); }, diff --git a/api/src/proc/databaseConnectionProcess.js b/api/src/proc/databaseConnectionProcess.js index a55af8729..d83335e9b 100644 --- a/api/src/proc/databaseConnectionProcess.js +++ b/api/src/proc/databaseConnectionProcess.js @@ -41,7 +41,6 @@ async function handleTableData({ msgid, schemaName, pureName }) { select.from = { schemaName, pureName }; select.selectAll = true; const sql = select.toSql(driver); - console.log('SQL', sql); const res = await driver.query(systemConnection, sql); process.send({ msgtype: 'response', msgid, ...res }); diff --git a/types/engines.d.ts b/types/engines.d.ts index c7b8ee57c..8c3ff7aa6 100644 --- a/types/engines.d.ts +++ b/types/engines.d.ts @@ -10,12 +10,6 @@ export interface EngineDriver { user, password, database - }: { - server: any; - port: any; - user: any; - password: any; - database: any; }): any; query(pool: any, sql: string): Promise; getVersion(pool: any): Promise<{ version: string }>; diff --git a/types/query.d.ts b/types/query.d.ts index 1080e57b5..3d60c7ce3 100644 --- a/types/query.d.ts +++ b/types/query.d.ts @@ -3,6 +3,11 @@ export interface RangeDefinition { limit: number; } +export interface QueryResultColumn { + name: string; +} + export interface QueryResult { rows: any[]; + columns: QueryResultColumn[]; }