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 from postgres dump

Browse Source
This commit is contained in:
Jan Prochazka
2024-09-27 08:08:13 +02:00
parent ae599ac6f6
commit 5287a86397
13 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/api/package.json
View File

@@ -27,7 +27,7 @@
"cors": "^2.8.5",
"cross-env": "^6.0.3",
"dbgate-datalib": "^5.0.0-alpha.1",
"dbgate-query-splitter": "^4.10.4",
"dbgate-query-splitter": "^4.10.5",
"dbgate-sqltree": "^5.0.0-alpha.1",
"dbgate-tools": "^5.0.0-alpha.1",
"debug": "^4.3.4",

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

@@ -19,10 +19,14 @@ class ImportStream extends stream.Transform {
try {
if (chunk.specialMarker == 'copy_stdin_start') {
this.writeQueryStream = await this.driver.writeQueryFromStream(this.dbhan, chunk.text);
} else if (chunk.specialMarker == 'copy_stdin_data') {
} else if (chunk.specialMarker == 'copy_stdin_line') {
this.writeQueryStream.write(chunk.text);
} else if (chunk.specialMarker == 'copy_stdin_end') {
this.writeQueryStream.end();
await new Promise((resolve, reject) => {
this.writeQueryStream.on('finish', resolve);
this.writeQueryStream.on('error', reject);
});
this.writeQueryStream = null;
} else {
await this.driver.script(this.dbhan, chunk.text, { queryOptions: { importSqlDump: true } });

2
packages/tools/package.json
View File

@@ -31,7 +31,7 @@
"typescript": "^4.4.3"
},
"dependencies": {
"dbgate-query-splitter": "^4.10.4",
"dbgate-query-splitter": "^4.10.5",
"dbgate-sqltree": "^5.0.0-alpha.1",
"debug": "^4.3.4",
"json-stable-stringify": "^1.0.1",

2
packages/web/package.json
View File

@@ -25,7 +25,7 @@
"chartjs-adapter-moment": "^1.0.0",
"cross-env": "^7.0.3",
"dbgate-datalib": "^5.0.0-alpha.1",
"dbgate-query-splitter": "^4.10.4",
"dbgate-query-splitter": "^4.10.5",
"dbgate-sqltree": "^5.0.0-alpha.1",
"dbgate-tools": "^5.0.0-alpha.1",
"dbgate-types": "^5.0.0-alpha.1",

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

@@ -33,7 +33,7 @@
"devDependencies": {
"bson": "^6.8.0",
"dbgate-plugin-tools": "^1.0.7",
"dbgate-query-splitter": "^4.10.4",
"dbgate-query-splitter": "^4.10.5",
"dbgate-tools": "^5.0.0-alpha.1",
"is-promise": "^4.0.0",
"lodash": "^4.17.21",

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

@@ -33,7 +33,7 @@
"devDependencies": {
"async-lock": "^1.2.6",
"dbgate-plugin-tools": "^1.0.7",
"dbgate-query-splitter": "^4.10.4",
"dbgate-query-splitter": "^4.10.5",
"dbgate-tools": "^5.0.0-alpha.1",
"tedious": "^18.2.0",
"webpack": "^5.91.0",

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

@@ -33,7 +33,7 @@
"devDependencies": {
"antares-mysql-dumper": "^0.0.1",
"dbgate-plugin-tools": "^1.0.7",
"dbgate-query-splitter": "^4.10.4",
"dbgate-query-splitter": "^4.10.5",
"dbgate-tools": "^5.0.0-alpha.1",
"mysql2": "^3.11.0",
"webpack": "^5.91.0",

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

@@ -52,7 +52,7 @@ const drivers = driverBases.map(driverBase => ({
const dbhan = {
client,
database,
}
};
if (isReadOnly) {
await this.query(dbhan, 'SET SESSION TRANSACTION READ ONLY');
}
@@ -69,7 +69,11 @@ const drivers = driverBases.map(driverBase => ({
};
}
if (options?.importSqlDump && sql.trim().startsWith('/*!') && sql.includes('character_set_client')) {
if (
options?.importSqlDump &&
(sql.trim().startsWith('/*!') || sql.trim().startsWith('/*M!')) &&
(sql.includes('character_set_client') || sql.includes('NOTE_VERBOSITY'))
) {
// skip this in SQL dumps
return {
rows: [],

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

@@ -31,7 +31,7 @@
},
"devDependencies": {
"dbgate-plugin-tools": "^1.0.8",
"dbgate-query-splitter": "^4.10.4",
"dbgate-query-splitter": "^4.10.5",
"dbgate-tools": "^5.0.0-alpha.1",
"lodash": "^4.17.21",
"webpack": "^5.91.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.10.4",
"dbgate-query-splitter": "^4.10.5",
"dbgate-tools": "^5.0.0-alpha.1",
"lodash": "^4.17.21",
"pg": "^8.11.5",

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

@@ -30,7 +30,7 @@
},
"devDependencies": {
"dbgate-plugin-tools": "^1.0.7",
"dbgate-query-splitter": "^4.10.4",
"dbgate-query-splitter": "^4.10.5",
"dbgate-tools": "^5.0.0-alpha.1",
"lodash": "^4.17.21",
"webpack": "^5.91.0",

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

@@ -32,7 +32,7 @@
"devDependencies": {
"dbgate-tools": "^5.0.0-alpha.1",
"dbgate-plugin-tools": "^1.0.4",
"dbgate-query-splitter": "^4.10.4",
"dbgate-query-splitter": "^4.10.5",
"byline": "^5.0.0",
"webpack": "^5.91.0",
"webpack-cli": "^5.1.4"

8
yarn.lock
View File

@@ -3224,10 +3224,10 @@ dbgate-plugin-xml@^5.0.0-alpha.1:
resolved "https://registry.yarnpkg.com/dbgate-plugin-xml/-/dbgate-plugin-xml-5.2.7.tgz#0762af51ba6f100e75a63907ea6c679e827c9f7c"
integrity sha512-gBXy4qetf7eJQW6lM01B+OKLnKB8MKesojdYKysD9oZ+YpQCX8Tq7aHJCrN14FiyIDinpX61kmFH1+LGJ2RkxQ==
dbgate-query-splitter@^4.10.4:
version "4.10.4"
resolved "https://registry.yarnpkg.com/dbgate-query-splitter/-/dbgate-query-splitter-4.10.4.tgz#38c7f98f6ce5a8c9cf34391d9f32490978bd978d"
integrity sha512-JVO0PSskF5dNnrYC8325HtEAxP3LhN1HQuKsOf4c+OXGocwWB3N7GPDc81cuyDTVCKb/oBHRE6akwAGKIyHkVA==
dbgate-query-splitter@^4.10.5:
version "4.10.5"
resolved "https://registry.yarnpkg.com/dbgate-query-splitter/-/dbgate-query-splitter-4.10.5.tgz#bef9f2c2232b14aab6d3a0d490739ad216a1b45b"
integrity sha512-AWcKcU3hbS8rAYrA52bwzdwtLv1llZgJ7Ut8AVPVWm5i38J4EdRFA2nMnx4Y5GLPqA1SRSUFsjBsNWWaHa/BAg==
debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
version "2.6.9"