diff --git a/integration-tests/__tests__/schema-tests.spec.js b/integration-tests/__tests__/schema-tests.spec.js index 71cc97992..c92212544 100644 --- a/integration-tests/__tests__/schema-tests.spec.js +++ b/integration-tests/__tests__/schema-tests.spec.js @@ -63,7 +63,7 @@ describe('Schema tests', () => { const schemaConnDef = { ...extractConnection(engine), - database: `${conn.__database_name__}::myschema`, + database: `${conn.__dbgate_database_name__}::myschema`, }; const schemaConn = await driver.connect(schemaConnDef); diff --git a/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js b/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js index 486891f86..fa176fb60 100644 --- a/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js @@ -24,7 +24,7 @@ class Analyser extends DatabaseAnalyser { createQuery(resFileName, typeFields, replacements = {}) { let res = sql[resFileName]; - res = res.replace('#DATABASE#', this.pool.__database_name__); + res = res.replace('#DATABASE#', this.pool.__dbgate_database_name__); return super.createQuery(res, typeFields, replacements); } @@ -83,7 +83,7 @@ class Analyser extends DatabaseAnalyser { const { pureName } = this.singleObjectFilter; const resId = await this.driver.query( this.pool, - `SELECT uuid as id FROM system.tables WHERE database = '${this.pool.__database_name__}' AND name='${pureName}'` + `SELECT uuid as id FROM system.tables WHERE database = '${this.pool.__dbgate_database_name__}' AND name='${pureName}'` ); this.singleObjectId = resId.rows[0]?.id; } diff --git a/plugins/dbgate-plugin-clickhouse/src/backend/driver.js b/plugins/dbgate-plugin-clickhouse/src/backend/driver.js index f30acf928..26dbc1d72 100644 --- a/plugins/dbgate-plugin-clickhouse/src/backend/driver.js +++ b/plugins/dbgate-plugin-clickhouse/src/backend/driver.js @@ -19,7 +19,7 @@ const driver = { database, }); - client.__database_name__ = database; + client.__dbgate_database_name__ = database; return client; }, // called for retrieve data (eg. browse in data grid) and for update database diff --git a/plugins/dbgate-plugin-mssql/src/backend/driver.js b/plugins/dbgate-plugin-mssql/src/backend/driver.js index 42f6ef371..335789fe6 100644 --- a/plugins/dbgate-plugin-mssql/src/backend/driver.js +++ b/plugins/dbgate-plugin-mssql/src/backend/driver.js @@ -85,7 +85,7 @@ const driver = { : await tediousConnect(conn); if (result) { - result.__database_name__ = conn.database; + result.__dbgate_database_name__ = conn.database; } return result; diff --git a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js index 4333272de..676687c2e 100644 --- a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js @@ -68,7 +68,7 @@ class Analyser extends DatabaseAnalyser { createQuery(resFileName, typeFields, replacements = {}) { let res = sql[resFileName]; - res = res.replace('#DATABASE#', this.pool.__database_name__); + res = res.replace('#DATABASE#', this.pool.__dbgate_database_name__); return super.createQuery(res, typeFields, replacements); } diff --git a/plugins/dbgate-plugin-mysql/src/backend/drivers.js b/plugins/dbgate-plugin-mysql/src/backend/drivers.js index 68f2be7d1..20c001be1 100644 --- a/plugins/dbgate-plugin-mysql/src/backend/drivers.js +++ b/plugins/dbgate-plugin-mysql/src/backend/drivers.js @@ -49,7 +49,7 @@ const drivers = driverBases.map(driverBase => ({ }; const connection = mysql2.createConnection(options); - connection.__database_name__ = database; + connection.__dbgate_database_name__ = database; if (isReadOnly) { await this.query(connection, 'SET SESSION TRANSACTION READ ONLY'); } diff --git a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js index 35f91e422..36a5c8cdd 100644 --- a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js @@ -57,7 +57,7 @@ class Analyser extends DatabaseAnalyser { createQuery(resFileName, typeFields, replacements = {}) { const query = super.createQuery(sql[resFileName], typeFields, replacements); - const dbname = this.pool.__database_name__; + const dbname = this.pool.__dbgate_database_name__; const schemaCondition = isCompositeDbName(dbname) ? `= '${splitCompositeDbName(dbname).schema}' ` : ' IS NOT NULL '; diff --git a/plugins/dbgate-plugin-postgres/src/backend/drivers.js b/plugins/dbgate-plugin-postgres/src/backend/drivers.js index e2e73d7da..535e35dfd 100644 --- a/plugins/dbgate-plugin-postgres/src/backend/drivers.js +++ b/plugins/dbgate-plugin-postgres/src/backend/drivers.js @@ -90,7 +90,7 @@ const drivers = driverBases.map(driverBase => ({ await this.query(client, 'SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY'); } - client.__database_name__ = database; + client.__dbgate_database_name__ = database; return client; }, async close(pool) {