diff --git a/plugins/dbgate-plugin-clickhouse/package.json b/plugins/dbgate-plugin-clickhouse/package.json index d6a7c912e..19c40b689 100644 --- a/plugins/dbgate-plugin-clickhouse/package.json +++ b/plugins/dbgate-plugin-clickhouse/package.json @@ -32,6 +32,7 @@ "dependencies": { "@clickhouse/client": "^1.5.0", "dbgate-tools": "^5.0.0-alpha.1", - "json-stable-stringify": "^1.0.1" + "json-stable-stringify": "^1.0.1", + "lodash": "^4.17.21" } } diff --git a/plugins/dbgate-plugin-clickhouse/webpack-backend.config.js b/plugins/dbgate-plugin-clickhouse/webpack-backend.config.js index dbce40026..7c6239e49 100644 --- a/plugins/dbgate-plugin-clickhouse/webpack-backend.config.js +++ b/plugins/dbgate-plugin-clickhouse/webpack-backend.config.js @@ -23,6 +23,7 @@ var config = { '@clickhouse/client': 'commonjs @clickhouse/client', 'json-stable-stringify': 'commonjs json-stable-stringify', 'dbgate-tools': 'commonjs dbgate-tools', + lodash: 'commonjs lodash', }, }; diff --git a/plugins/dbgate-plugin-csv/src/backend/reader.js b/plugins/dbgate-plugin-csv/src/backend/reader.js index 53d0ad335..55ef181d9 100644 --- a/plugins/dbgate-plugin-csv/src/backend/reader.js +++ b/plugins/dbgate-plugin-csv/src/backend/reader.js @@ -1,4 +1,4 @@ -const zipObject = require('lodash/zipObject'); +const _ = require('lodash'); const csv = require('csv'); const fs = require('fs'); const stream = require('stream'); @@ -37,7 +37,7 @@ class CsvPrepareStream extends stream.Transform { _transform(chunk, encoding, done) { if (this.structure) { this.push( - zipObject( + _.zipObject( this.structure.columns.map((x) => x.columnName), chunk ) @@ -57,7 +57,7 @@ class CsvPrepareStream extends stream.Transform { }; this.push(this.structure); this.push( - zipObject( + _.zipObject( this.structure.columns.map((x) => x.columnName), chunk ) diff --git a/plugins/dbgate-plugin-mssql/package.json b/plugins/dbgate-plugin-mssql/package.json index dd506d88a..533ca69ff 100644 --- a/plugins/dbgate-plugin-mssql/package.json +++ b/plugins/dbgate-plugin-mssql/package.json @@ -39,6 +39,7 @@ "async-lock": "^1.2.6", "dbgate-query-splitter": "^4.11.2", "dbgate-tools": "^5.0.0-alpha.1", + "lodash": "^4.17.21", "tedious": "^18.2.0" }, "optionalDependencies": { diff --git a/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js b/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js index 1d47dd6f4..1eac0ea32 100644 --- a/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js +++ b/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js @@ -1,4 +1,3 @@ -const fp = require('lodash/fp'); const _ = require('lodash'); const sql = require('./sql'); diff --git a/plugins/dbgate-plugin-mssql/webpack-backend.config.js b/plugins/dbgate-plugin-mssql/webpack-backend.config.js index 0aa29cf93..cb2b45aa6 100644 --- a/plugins/dbgate-plugin-mssql/webpack-backend.config.js +++ b/plugins/dbgate-plugin-mssql/webpack-backend.config.js @@ -23,6 +23,7 @@ var config = { 'async-lock': 'commonjs async-lock', 'dbgate-query-splitter': 'commonjs dbgate-query-splitter', 'dbgate-tools': 'commonjs dbgate-tools', + lodash: 'commonjs lodash', tedious: 'commonjs tedious', }, }; diff --git a/plugins/dbgate-plugin-mysql/package.json b/plugins/dbgate-plugin-mysql/package.json index 797aa7b06..2377b0439 100644 --- a/plugins/dbgate-plugin-mysql/package.json +++ b/plugins/dbgate-plugin-mysql/package.json @@ -39,6 +39,7 @@ "antares-mysql-dumper": "^0.0.1", "dbgate-query-splitter": "^4.11.2", "dbgate-tools": "^5.0.0-alpha.1", + "lodash": "^4.17.21", "mysql2": "^3.11.3" } } diff --git a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js index fb18cc683..ae68e0ce2 100644 --- a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js @@ -1,4 +1,3 @@ -const fp = require('lodash/fp'); const _ = require('lodash'); const sql = require('./sql'); @@ -172,7 +171,7 @@ class Analyser extends DatabaseAnalyser { })), procedures: programmables.rows .filter(x => x.objectType == 'PROCEDURE') - .map(fp.omit(['objectType'])) + .map(x => _.omit(x, ['objectType'])) .map(x => ({ ...x, createSql: `DELIMITER //\n\nCREATE PROCEDURE \`${x.pureName}\`()\n${x.routineDefinition}\n\nDELIMITER ;\n`, @@ -181,7 +180,7 @@ class Analyser extends DatabaseAnalyser { })), functions: programmables.rows .filter(x => x.objectType == 'FUNCTION') - .map(fp.omit(['objectType'])) + .map(x => _.omit(x, ['objectType'])) .map(x => ({ ...x, createSql: `CREATE FUNCTION \`${x.pureName}\`()\nRETURNS ${x.returnDataType} ${ diff --git a/plugins/dbgate-plugin-mysql/webpack-backend.config.js b/plugins/dbgate-plugin-mysql/webpack-backend.config.js index c67da83bc..21556f075 100644 --- a/plugins/dbgate-plugin-mysql/webpack-backend.config.js +++ b/plugins/dbgate-plugin-mysql/webpack-backend.config.js @@ -18,6 +18,7 @@ var config = { 'dbgate-tools': 'commonjs dbgate-tools', 'dbgate-query-splitter': 'commonjs dbgate-query-splitter', 'antares-mysql-dumper': 'commonjs antares-mysql-dumper', + lodash: 'commonjs lodash', mysql2: 'commonjs mysql2', }, diff --git a/plugins/dbgate-plugin-oracle/src/backend/Analyser.js b/plugins/dbgate-plugin-oracle/src/backend/Analyser.js index 5b4b845c8..bbb851f28 100644 --- a/plugins/dbgate-plugin-oracle/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-oracle/src/backend/Analyser.js @@ -1,4 +1,3 @@ -const fp = require('lodash/fp'); const _ = require('lodash'); const sql = require('./sql'); diff --git a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js index 8fba8d643..84b67a858 100644 --- a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js @@ -1,4 +1,3 @@ -const fp = require('lodash/fp'); const _ = require('lodash'); const sql = require('./sql'); diff --git a/plugins/dbgate-plugin-sqlite/package.json b/plugins/dbgate-plugin-sqlite/package.json index b8bfbae3a..a297c9173 100644 --- a/plugins/dbgate-plugin-sqlite/package.json +++ b/plugins/dbgate-plugin-sqlite/package.json @@ -36,6 +36,7 @@ }, "dependencies": { "dbgate-tools": "^5.0.0-alpha.1", + "lodash": "^4.17.21", "dbgate-query-splitter": "^4.11.2" }, "optionalDependencies": { diff --git a/plugins/dbgate-plugin-sqlite/src/backend/Analyser.js b/plugins/dbgate-plugin-sqlite/src/backend/Analyser.js index e61bea08e..8e054fd56 100644 --- a/plugins/dbgate-plugin-sqlite/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-sqlite/src/backend/Analyser.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const { DatabaseAnalyser } = global.DBGATE_PACKAGES['dbgate-tools'];; +const { DatabaseAnalyser } = global.DBGATE_PACKAGES['dbgate-tools']; const indexcolsQuery = ` SELECT diff --git a/plugins/dbgate-plugin-sqlite/webpack-backend.config.js b/plugins/dbgate-plugin-sqlite/webpack-backend.config.js index 56bc2d710..7e76c3c96 100644 --- a/plugins/dbgate-plugin-sqlite/webpack-backend.config.js +++ b/plugins/dbgate-plugin-sqlite/webpack-backend.config.js @@ -22,6 +22,7 @@ var config = { 'dbgate-tools': 'commonjs dbgate-tools', 'dbgate-query-splitter': 'commonjs dbgate-query-splitter', 'better-sqlite3': 'commonjs better-sqlite3', + lodash: 'commonjs lodash', }, };