oracle fix + package optimalization

This commit is contained in:
Jan Prochazka
2024-08-21 09:54:10 +02:00
parent 1cbeeac7cd
commit 2b9fa9a70f
17 changed files with 17 additions and 23 deletions

View File

@@ -1,4 +1,4 @@
const { DatabaseAnalyser } = require('dbgate-tools'); const { DatabaseAnalyser } = global.DBGATE_PACKAGES['dbgate-tools'];
class Analyser extends DatabaseAnalyser { class Analyser extends DatabaseAnalyser {
constructor(pool, driver, version) { constructor(pool, driver, version) {

View File

@@ -2,8 +2,7 @@ const fp = require('lodash/fp');
const _ = require('lodash'); const _ = require('lodash');
const sql = require('./sql'); const sql = require('./sql');
const { DatabaseAnalyser } = require('dbgate-tools'); const { DatabaseAnalyser, isTypeString, isTypeNumeric } = global.DBGATE_PACKAGES['dbgate-tools'];
const { isTypeString, isTypeNumeric } = require('dbgate-tools');
function objectTypeToField(type) { function objectTypeToField(type) {
switch (type.trim()) { switch (type.trim()) {

View File

@@ -1,4 +1,4 @@
const { createBulkInsertStreamBase } = require('dbgate-tools'); const { createBulkInsertStreamBase } = global.DBGATE_PACKAGES['dbgate-tools'];
function runBulkInsertBatch(pool, tableName, writable, rows) { function runBulkInsertBatch(pool, tableName, writable, rows) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

View File

@@ -1,4 +1,4 @@
const { createBulkInsertStreamBase } = require('dbgate-tools'); const { createBulkInsertStreamBase } = global.DBGATE_PACKAGES['dbgate-tools'];
const tedious = require('tedious'); const tedious = require('tedious');
const getConcreteType = require('./getConcreteType'); const getConcreteType = require('./getConcreteType');
const _ = require('lodash'); const _ = require('lodash');

View File

@@ -2,8 +2,7 @@ const fp = require('lodash/fp');
const _ = require('lodash'); const _ = require('lodash');
const sql = require('./sql'); const sql = require('./sql');
const { DatabaseAnalyser } = require('dbgate-tools'); const { DatabaseAnalyser, isTypeString, isTypeNumeric } = global.DBGATE_PACKAGES['dbgate-tools'];
const { isTypeString, isTypeNumeric } = require('dbgate-tools');
function quoteDefaultValue(value) { function quoteDefaultValue(value) {
if (value == null) return value; if (value == null) return value;

View File

@@ -3,9 +3,8 @@ const stream = require('stream');
const driverBases = require('../frontend/drivers'); const driverBases = require('../frontend/drivers');
const Analyser = require('./Analyser'); const Analyser = require('./Analyser');
const mysql2 = require('mysql2'); const mysql2 = require('mysql2');
const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools'); const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];
const { MySqlDumper } = require('antares-mysql-dumper'); const { MySqlDumper } = require('antares-mysql-dumper');
const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
const logger = getLogger('mysqlDriver'); const logger = getLogger('mysqlDriver');

View File

@@ -2,8 +2,7 @@ const fp = require('lodash/fp');
const _ = require('lodash'); const _ = require('lodash');
const sql = require('./sql'); const sql = require('./sql');
const { DatabaseAnalyser } = require('dbgate-tools'); const { DatabaseAnalyser, isTypeString, isTypeNumeric } = global.DBGATE_PACKAGES['dbgate-tools'];
const { isTypeString, isTypeNumeric } = require('dbgate-tools');
function normalizeTypeName(dataType) { function normalizeTypeName(dataType) {
if (dataType == 'character varying') return 'varchar'; if (dataType == 'character varying') return 'varchar';

View File

@@ -1,4 +1,4 @@
const { createBulkInsertStreamBase } = require('dbgate-tools'); const { createBulkInsertStreamBase } = global.DBGATE_PACKAGES['dbgate-tools'];
const _ = require('lodash'); const _ = require('lodash');
/** /**

View File

@@ -3,7 +3,7 @@ const stream = require('stream');
const driverBase = require('../frontend/driver'); const driverBase = require('../frontend/driver');
const Analyser = require('./Analyser'); const Analyser = require('./Analyser');
const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools'); const { createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];
const createOracleBulkInsertStream = require('./createOracleBulkInsertStream'); const createOracleBulkInsertStream = require('./createOracleBulkInsertStream');
const { platform } = require('os'); const { platform } = require('os');

View File

@@ -84,6 +84,7 @@ const dialect = {
/** @type {import('dbgate-types').EngineDriver} */ /** @type {import('dbgate-types').EngineDriver} */
const oracleDriver = { const oracleDriver = {
...driverBase,
engine: 'oracle@dbgate-plugin-oracle', engine: 'oracle@dbgate-plugin-oracle',
title: 'OracleDB', title: 'OracleDB',
defaultPort: 1521, defaultPort: 1521,

View File

@@ -2,8 +2,7 @@ const fp = require('lodash/fp');
const _ = require('lodash'); const _ = require('lodash');
const sql = require('./sql'); const sql = require('./sql');
const { DatabaseAnalyser } = require('dbgate-tools'); const { DatabaseAnalyser, isTypeString, isTypeNumeric } = global.DBGATE_PACKAGES['dbgate-tools'];
const { isTypeString, isTypeNumeric } = require('dbgate-tools');
function normalizeTypeName(dataType) { function normalizeTypeName(dataType) {
if (dataType == 'character varying') return 'varchar'; if (dataType == 'character varying') return 'varchar';

View File

@@ -4,8 +4,7 @@ const stream = require('stream');
const driverBases = require('../frontend/drivers'); const driverBases = require('../frontend/drivers');
const Analyser = require('./Analyser'); const Analyser = require('./Analyser');
const pg = require('pg'); const pg = require('pg');
const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools'); const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];;
const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
const logger = getLogger('postreDriver'); const logger = getLogger('postreDriver');

View File

@@ -1,4 +1,4 @@
const { DatabaseAnalyser } = require('dbgate-tools'); const { DatabaseAnalyser } = global.DBGATE_PACKAGES['dbgate-tools'];;
class Analyser extends DatabaseAnalyser { class Analyser extends DatabaseAnalyser {
constructor(pool, driver) { constructor(pool, driver) {

View File

@@ -5,7 +5,7 @@ const driverBase = require('../frontend/driver');
const Analyser = require('./Analyser'); const Analyser = require('./Analyser');
const Redis = require('ioredis'); const Redis = require('ioredis');
const RedisDump = require('node-redis-dump2'); const RedisDump = require('node-redis-dump2');
const { filterName } = require('dbgate-tools'); const { filterName } = global.DBGATE_PACKAGES['dbgate-tools'];
function splitCommandLine(str) { function splitCommandLine(str) {
let results = []; let results = [];

View File

@@ -1,4 +1,4 @@
const { SqlDumper } = require('dbgate-tools'); const { SqlDumper } = global.DBGATE_PACKAGES['dbgate-tools'];
class Dumper extends SqlDumper { class Dumper extends SqlDumper {
} }

View File

@@ -1,5 +1,5 @@
const _ = require('lodash'); const _ = require('lodash');
const { DatabaseAnalyser } = require('dbgate-tools'); const { DatabaseAnalyser } = global.DBGATE_PACKAGES['dbgate-tools'];;
const indexcolsQuery = ` const indexcolsQuery = `
SELECT SELECT

View File

@@ -3,8 +3,7 @@ const stream = require('stream');
const driverBase = require('../frontend/driver'); const driverBase = require('../frontend/driver');
const Analyser = require('./Analyser'); const Analyser = require('./Analyser');
const { splitQuery, sqliteSplitterOptions } = require('dbgate-query-splitter'); const { splitQuery, sqliteSplitterOptions } = require('dbgate-query-splitter');
const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools'); const { getLogger, createBulkInsertStreamBase, makeUniqueColumnNames } = global.DBGATE_PACKAGES['dbgate-tools'];
const { getLogger } = global.DBGATE_PACKAGES['dbgate-tools'];
const logger = getLogger('sqliteDriver'); const logger = getLogger('sqliteDriver');