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

try to fix test

Browse Source
This commit is contained in:
Jan Prochazka
2024-09-19 18:23:25 +02:00
parent b1118c7f43
commit be17301c91
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ describe('Schema tests', () => {
const schemaConnDef = { const schemaConnDef = {
...extractConnection(engine), ...extractConnection(engine),
database: `${conn._database_name}::myschema`, database: `${conn.__database_name__}::myschema`,
}; };
const schemaConn = await driver.connect(schemaConnDef); const schemaConn = await driver.connect(schemaConnDef);

4
plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js
View File

@@ -24,7 +24,7 @@ class Analyser extends DatabaseAnalyser {
createQuery(resFileName, typeFields, replacements = {}) { createQuery(resFileName, typeFields, replacements = {}) {
let res = sql[resFileName]; let res = sql[resFileName];
res = res.replace('#DATABASE#', this.pool._database_name); res = res.replace('#DATABASE#', this.pool.__database_name__);
return super.createQuery(res, typeFields, replacements); return super.createQuery(res, typeFields, replacements);
} }
@@ -83,7 +83,7 @@ class Analyser extends DatabaseAnalyser {
const { pureName } = this.singleObjectFilter; const { pureName } = this.singleObjectFilter;
const resId = await this.driver.query( const resId = await this.driver.query(
this.pool, 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.__database_name__}' AND name='${pureName}'`
); );
this.singleObjectId = resId.rows[0]?.id; this.singleObjectId = resId.rows[0]?.id;
} }

2
plugins/dbgate-plugin-clickhouse/src/backend/driver.js
View File

@@ -19,7 +19,7 @@ const driver = {
database, database,
}); });
client._database_name = database; client.__database_name__ = database;
return client; return client;
}, },
// called for retrieve data (eg. browse in data grid) and for update database // called for retrieve data (eg. browse in data grid) and for update database

2
plugins/dbgate-plugin-mssql/src/backend/driver.js
View File

@@ -85,7 +85,7 @@ const driver = {
: await tediousConnect(conn); : await tediousConnect(conn);
if (result) { if (result) {
result._database_name = conn.database; result.__database_name__ = conn.database;
} }
return result; return result;

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

@@ -68,7 +68,7 @@ class Analyser extends DatabaseAnalyser {
createQuery(resFileName, typeFields, replacements = {}) { createQuery(resFileName, typeFields, replacements = {}) {
let res = sql[resFileName]; let res = sql[resFileName];
res = res.replace('#DATABASE#', this.pool._database_name); res = res.replace('#DATABASE#', this.pool.__database_name__);
return super.createQuery(res, typeFields, replacements); return super.createQuery(res, typeFields, replacements);
} }

2
plugins/dbgate-plugin-mysql/src/backend/drivers.js
View File

@@ -49,7 +49,7 @@ const drivers = driverBases.map(driverBase => ({
}; };
const connection = mysql2.createConnection(options); const connection = mysql2.createConnection(options);
connection._database_name = database; connection.__database_name__ = database;
if (isReadOnly) { if (isReadOnly) {
await this.query(connection, 'SET SESSION TRANSACTION READ ONLY'); await this.query(connection, 'SET SESSION TRANSACTION READ ONLY');
} }

10
plugins/dbgate-plugin-postgres/src/backend/Analyser.js
View File

@@ -57,11 +57,11 @@ class Analyser extends DatabaseAnalyser {
createQuery(resFileName, typeFields, replacements = {}) { createQuery(resFileName, typeFields, replacements = {}) {
const query = super.createQuery(sql[resFileName], typeFields, replacements); const query = super.createQuery(sql[resFileName], typeFields, replacements);
// const dbname = this.pool._database_name; const dbname = this.pool.__database_name__;
// const schemaCondition = isCompositeDbName(dbname) const schemaCondition = isCompositeDbName(dbname)
// ? `= '${splitCompositeDbName(dbname).schema}' ` ? `= '${splitCompositeDbName(dbname).schema}' `
// : ' IS NOT NULL '; : ' IS NOT NULL ';
const schemaCondition = ' IS NOT NULL '; // const schemaCondition = ' IS NOT NULL ';
return query?.replace(/=SCHEMA_NAME_CONDITION/g, schemaCondition); return query?.replace(/=SCHEMA_NAME_CONDITION/g, schemaCondition);
} }