diff --git a/integration-tests/__tests__/db-import.spec.js b/integration-tests/__tests__/db-import.spec.js index 78393f7c5..6177ae3a3 100644 --- a/integration-tests/__tests__/db-import.spec.js +++ b/integration-tests/__tests__/db-import.spec.js @@ -5,6 +5,7 @@ const tableWriter = require('dbgate-api/src/shell/tableWriter'); const copyStream = require('dbgate-api/src/shell/copyStream'); const importDatabase = require('dbgate-api/src/shell/importDatabase'); const fakeObjectReader = require('dbgate-api/src/shell/fakeObjectReader'); +const { runQueryOnDriver } = require('dbgate-tools'); function createImportStream() { const pass = new stream.PassThrough({ @@ -37,7 +38,7 @@ describe('DB Import', () => { }); await copyStream(reader, writer); - const res = await driver.query(conn, `select count(*) as cnt from t1`); + const res = await runQueryOnDriver(conn, driver, dmp => dmp.put(`select count(*) as ~cnt from ~t1`)); expect(res.rows[0].cnt.toString()).toEqual('6'); }) ); @@ -65,10 +66,10 @@ describe('DB Import', () => { }); await copyStream(reader2, writer2); - const res1 = await driver.query(conn, `select count(*) as cnt from t1`); + const res1 = await runQueryOnDriver(conn, driver, dmp => dmp.put(`select count(*) as ~cnt from ~t1`)); expect(res1.rows[0].cnt.toString()).toEqual('6'); - const res2 = await driver.query(conn, `select count(*) as cnt from t2`); + const res2 = await runQueryOnDriver(conn, driver, dmp => dmp.put(`select count(*) as ~cnt from ~t2`)); expect(res2.rows[0].cnt.toString()).toEqual('6'); }) ); diff --git a/plugins/dbgate-plugin-oracle/src/backend/driver.js b/plugins/dbgate-plugin-oracle/src/backend/driver.js index c85840fb3..6506cc4e2 100644 --- a/plugins/dbgate-plugin-oracle/src/backend/driver.js +++ b/plugins/dbgate-plugin-oracle/src/backend/driver.js @@ -107,6 +107,7 @@ const driver = { sql = mtrim[1]; } + // console.log('EXECUTE SQL:', sql); const res = await dbhan.client.execute(sql); try { const columns = extractOracleColumns(res.metaData); diff --git a/plugins/dbgate-plugin-oracle/src/frontend/driver.js b/plugins/dbgate-plugin-oracle/src/frontend/driver.js index 2c3e242e8..446b83f89 100644 --- a/plugins/dbgate-plugin-oracle/src/frontend/driver.js +++ b/plugins/dbgate-plugin-oracle/src/frontend/driver.js @@ -13,7 +13,7 @@ const dialect = { ilike: true, // stringEscapeChar: '\\', stringEscapeChar: "'", - fallbackDataType: 'varchar', + fallbackDataType: 'varchar(250)', anonymousPrimaryKey: false, enableConstraintsPerTable: true, dropColumnDependencies: ['dependencies'],