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

Merge branch 'master' into tableeditor2

Browse Source
This commit is contained in:
Jan Prochazka
2021-07-18 07:59:31 +02:00
parent 35eb5716a5 32d05edb6a
commit 71e1ea5736
19 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/dbgate-plugin-mongo/src/frontend/driver.js
View File

@@ -1,3 +1,4 @@
const _isString = require('lodash/isString');
const { driverBase } = global.DBGATE_TOOLS;
const Dumper = require('./Dumper');
const { noSplitSplitterOptions } = require('dbgate-query-splitter/lib/options');
@@ -5,7 +6,7 @@ const { noSplitSplitterOptions } = require('dbgate-query-splitter/lib/options');
const mongoIdRegex = /^[0-9a-f]{24}$/;
function getConditionPreview(condition) {
if (condition && _.isString(condition._id) && condition._id.match(mongoIdRegex)) {
if (condition && _isString(condition._id) && condition._id.match(mongoIdRegex)) {
return `{ _id: ObjectId('${condition._id}') }`;
}
return JSON.stringify(condition);

10
plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js
View File

@@ -88,7 +88,7 @@ class MsSqlAnalyser extends DatabaseAnalyser {
const tables = tablesRows.rows.map(row => ({
...row,
contentHash: row.modifyDate.toISOString(),
contentHash: row.modifyDate && row.modifyDate.toISOString(),
columns: columnsRows.rows.filter(col => col.objectId == row.objectId).map(getColumnInfo),
primaryKey: DatabaseAnalyser.extractPrimaryKeys(row, pkColumnsRows.rows),
foreignKeys: DatabaseAnalyser.extractForeignKeys(row, fkColumnsRows.rows),
@@ -96,7 +96,7 @@ class MsSqlAnalyser extends DatabaseAnalyser {
const views = viewsRows.rows.map(row => ({
...row,
contentHash: row.modifyDate.toISOString(),
contentHash: row.modifyDate && row.modifyDate.toISOString(),
createSql: getCreateSql(row),
columns: viewColumnRows.rows.filter(col => col.objectId == row.objectId).map(getColumnInfo),
}));
@@ -105,7 +105,7 @@ class MsSqlAnalyser extends DatabaseAnalyser {
.filter(x => x.sqlObjectType.trim() == 'P')
.map(row => ({
...row,
contentHash: row.modifyDate.toISOString(),
contentHash: row.modifyDate && row.modifyDate.toISOString(),
createSql: getCreateSql(row),
}));
@@ -113,7 +113,7 @@ class MsSqlAnalyser extends DatabaseAnalyser {
.filter(x => ['FN', 'IF', 'TF'].includes(x.sqlObjectType.trim()))
.map(row => ({
...row,
contentHash: row.modifyDate.toISOString(),
contentHash: row.modifyDate && row.modifyDate.toISOString(),
createSql: getCreateSql(row),
}));
@@ -137,7 +137,7 @@ class MsSqlAnalyser extends DatabaseAnalyser {
res[field].push({
objectId,
contentHash: modifyDate.toISOString(),
contentHash: modifyDate && modifyDate.toISOString(),
schemaName,
pureName,
});

4
plugins/dbgate-plugin-mysql/src/backend/Analyser.js
View File

@@ -128,14 +128,14 @@ class Analyser extends DatabaseAnalyser {
.map(x => ({
...x,
objectId: x.pureName,
contentHash: x.modifyDate.toISOString(),
contentHash: x.modifyDate && x.modifyDate.toISOString(),
})),
views: tableModificationsQueryData.rows
.filter(x => x.objectType == 'VIEW')
.map(x => ({
...x,
objectId: x.pureName,
contentHash: x.modifyDate.toISOString(),
contentHash: x.modifyDate && x.modifyDate.toISOString(),
})),
procedures: procedureModificationsQueryData.rows.map(x => ({
contentHash: x.Modified,

6
plugins/dbgate-plugin-postgres/src/frontend/Dumper.js
View File

@@ -86,6 +86,12 @@ class Dumper extends SqlDumper {
}
}
}
putValue(value) {
if (value === true) this.putRaw('true');
else if (value === false) this.putRaw('false');
else super.putValue(value);
}
}
module.exports = Dumper;