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

import SQL dump fixed

Browse Source
This commit is contained in:
Jan Prochazka
2022-04-21 17:30:16 +02:00
parent 82304f13e7
commit 5315a549b0
11 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/api/package.json
View File

@@ -25,7 +25,7 @@
"compare-versions": "^3.6.0",
"cors": "^2.8.5",
"cross-env": "^6.0.3",
"dbgate-query-splitter": "^4.8.3",
"dbgate-query-splitter": "^4.9.0",
"dbgate-sqltree": "^4.1.1",
"dbgate-tools": "^4.1.1",
"diff": "^5.0.0",

11
packages/api/src/shell/importDatabase.js
View File

@@ -1,5 +1,4 @@
const fs = require('fs');
const byline = require('byline');
const requireEngineDriver = require('../utility/requireEngineDriver');
const connectUtility = require('../utility/connectUtility');
const { splitQueryStream } = require('dbgate-query-splitter/lib/splitQueryStream');
@@ -20,6 +19,11 @@ class ImportStream extends stream.Transform {
}
cb();
}
_flush(cb) {
this.push('finish');
cb();
this.emit('end');
}
}
function awaitStreamEnd(stream) {
@@ -43,12 +47,11 @@ async function importDatabase({ connection = undefined, systemConnection = undef
const downloadedFile = await download(inputFile);
const fileStream = fs.createReadStream(downloadedFile, 'utf-8');
const lineStream = byline(fileStream);
const splittedStream = splitQueryStream(lineStream, driver.getQuerySplitterOptions());
const splittedStream = splitQueryStream(fileStream, driver.getQuerySplitterOptions());
const importStream = new ImportStream(pool, driver);
// @ts-ignore
splittedStream.pipe(importStream);
await awaitStreamEnd(splittedStream);
await awaitStreamEnd(importStream);
}
module.exports = importDatabase;

2
packages/tools/package.json
View File

@@ -32,7 +32,7 @@
},
"dependencies": {
"lodash": "^4.17.21",
"dbgate-query-splitter": "^4.8.3",
"dbgate-query-splitter": "^4.9.0",
"dbgate-sqltree": "^4.1.1",
"uuid": "^3.4.0"
}

2
packages/web/package.json
View File

@@ -24,7 +24,7 @@
"chartjs-adapter-moment": "^1.0.0",
"cross-env": "^7.0.3",
"dbgate-datalib": "^4.1.1",
"dbgate-query-splitter": "^4.8.3",
"dbgate-query-splitter": "^4.9.0",
"dbgate-sqltree": "^4.1.1",
"dbgate-tools": "^4.1.1",
"dbgate-types": "^4.1.1",

2
plugins/dbgate-plugin-mongo/package.json
View File

@@ -32,7 +32,7 @@
},
"devDependencies": {
"dbgate-plugin-tools": "^1.0.7",
"dbgate-query-splitter": "^4.8.3",
"dbgate-query-splitter": "^4.9.0",
"webpack": "^4.42.0",
"webpack-cli": "^3.3.11",
"dbgate-tools": "^4.1.1",

2
plugins/dbgate-plugin-mssql/package.json
View File

@@ -32,7 +32,7 @@
},
"devDependencies": {
"dbgate-plugin-tools": "^1.0.7",
"dbgate-query-splitter": "^4.8.3",
"dbgate-query-splitter": "^4.9.0",
"webpack": "^4.42.0",
"webpack-cli": "^3.3.11",
"dbgate-tools": "^4.1.1",

2
plugins/dbgate-plugin-mysql/package.json
View File

@@ -33,7 +33,7 @@
"devDependencies": {
"antares-mysql-dumper": "^0.0.1-alpha.2",
"dbgate-plugin-tools": "^1.0.7",
"dbgate-query-splitter": "^4.8.3",
"dbgate-query-splitter": "^4.9.0",
"dbgate-tools": "^4.1.1",
"mysql2": "^2.2.5",
"webpack": "^4.42.0",

2
plugins/dbgate-plugin-postgres/package.json
View File

@@ -31,7 +31,7 @@
},
"devDependencies": {
"dbgate-plugin-tools": "^1.0.7",
"dbgate-query-splitter": "^4.8.3",
"dbgate-query-splitter": "^4.9.0",
"dbgate-tools": "^4.1.1",
"lodash": "^4.17.21",
"pg": "^8.7.1",

2
plugins/dbgate-plugin-redis/package.json
View File

@@ -30,7 +30,7 @@
},
"devDependencies": {
"dbgate-plugin-tools": "^1.0.7",
"dbgate-query-splitter": "^4.8.3",
"dbgate-query-splitter": "^4.9.0",
"dbgate-tools": "^4.1.1",
"lodash": "^4.17.21",
"webpack": "^4.42.0",

2
plugins/dbgate-plugin-sqlite/package.json
View File

@@ -32,7 +32,7 @@
"devDependencies": {
"dbgate-tools": "^4.1.1",
"dbgate-plugin-tools": "^1.0.4",
"dbgate-query-splitter": "^4.8.3",
"dbgate-query-splitter": "^4.9.0",
"byline": "^5.0.0",
"webpack": "^4.42.0",
"webpack-cli": "^3.3.11"

18
yarn.lock
View File

@@ -1673,9 +1673,13 @@ ansi-styles@^5.0.0:
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
"antares-mysql-dumper@link:../antares-mysql-dumper":
version "0.0.0"
uid ""
antares-mysql-dumper@^0.0.1-alpha.2:
version "0.0.1-alpha.2"
resolved "https://registry.yarnpkg.com/antares-mysql-dumper/-/antares-mysql-dumper-0.0.1-alpha.2.tgz#6dc7ef85d43f2bfc7447b49e3c1709f4c8501e7e"
integrity sha512-ktn6Qwc5Strzjhp2cPunLvO4CYHF5CTti9uzgH2uJsxgAfLtGPMxi/eZrn7G7c8gN+BSgq22d4Awm++jNmD6Gg==
dependencies:
"@turf/helpers" "^6.5.0"
moment "^2.29.2"
anymatch@^2.0.0:
version "2.0.0"
@@ -3213,10 +3217,10 @@ dbgate-plugin-xml@^4.1.1:
resolved "https://registry.yarnpkg.com/dbgate-plugin-xml/-/dbgate-plugin-xml-4.7.2.tgz#4a1817a7fc3b1ac5191e45dc7b1016b2f97c3158"
integrity sha512-LA52/Wg+blaRp/H+v4ypT+l6kbi4sYsTD/JdPaTbfwErMXhGZew9wtDolvbDjKZZ/zfRig0TDXj9fhLILw2cGw==
dbgate-query-splitter@^4.8.3:
version "4.8.3"
resolved "https://registry.yarnpkg.com/dbgate-query-splitter/-/dbgate-query-splitter-4.8.3.tgz#d4c943154c325de4647f313b42996e731a3ae2e4"
integrity sha512-AjQiImY01p1qmgSRRiFo6szwKmLRWXlQTFG1LH9tJoQNPzvN+6B0P70VpHLsRDLSWQsPdy0S7LyQ+bkH4ib9EA==
dbgate-query-splitter@^4.9.0:
version "4.9.0"
resolved "https://registry.yarnpkg.com/dbgate-query-splitter/-/dbgate-query-splitter-4.9.0.tgz#37475929b76ebe60436fcc44f223d4d47d6483af"
integrity sha512-POifNiMDkeksA9YXaC82u5O6krYC21xyROoNjDh3ouKI4xeB37DG+cP/D4IdICWHYZudlgKiziQ4v3W+5+O1DA==
debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
version "2.6.9"