dbgate-datalib 5.5.4-alpha.8 → 5.5.5

package/lib/ChangeSet.d.ts

@@ -54,3 +54,56 @@ export declare function changeSetInsertNewRow(changeSet: ChangeSet, name?: Named
 export declare function changeSetInsertDocuments(changeSet: ChangeSet, documents: any[], name?: NamedObjectInfo, insertIfNotExistsFieldNames?: string[]): ChangeSet;
 export declare function changeSetContainsChanges(changeSet: ChangeSet): boolean;
 export declare function changeSetChangedCount(changeSet: ChangeSet): number;
+export declare function removeSchemaFromChangeSet(changeSet: ChangeSet): {
+    inserts: {
+        schemaName: any;
+        pureName: string;
+        insertedRowIndex?: number;
+        existingRowIndex?: number;
+        document?: any;
+        condition?: {
+            [column: string]: string;
+        };
+        fields?: {
+            [column: string]: string;
+        };
+        insertIfNotExistsFields?: {
+            [column: string]: string;
+        };
+    }[];
+    updates: {
+        schemaName: any;
+        pureName: string;
+        insertedRowIndex?: number;
+        existingRowIndex?: number;
+        document?: any;
+        condition?: {
+            [column: string]: string;
+        };
+        fields?: {
+            [column: string]: string;
+        };
+        insertIfNotExistsFields?: {
+            [column: string]: string;
+        };
+    }[];
+    deletes: {
+        schemaName: any;
+        pureName: string;
+        insertedRowIndex?: number;
+        existingRowIndex?: number;
+        document?: any;
+        condition?: {
+            [column: string]: string;
+        };
+        fields?: {
+            [column: string]: string;
+        };
+        insertIfNotExistsFields?: {
+            [column: string]: string;
+        };
+    }[];
+    structure?: TableInfo;
+    dataUpdateCommands?: JsonDataObjectUpdateCommand[];
+    setColumnMode?: "fixed" | "variable";
+};

package/lib/ChangeSet.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeSetChangedCount = exports.changeSetContainsChanges = exports.changeSetInsertDocuments = exports.changeSetInsertNewRow = exports.getChangeSetInsertedRows = exports.deleteChangeSetRows = exports.revertChangeSetRowChanges = exports.changeSetToSql = exports.extractChangeSetCondition = exports.batchUpdateChangeSet = exports.setChangeSetRowData = exports.setChangeSetValue = exports.findExistingChangeSetItem = exports.createChangeSet = void 0;
+exports.removeSchemaFromChangeSet = exports.changeSetChangedCount = exports.changeSetContainsChanges = exports.changeSetInsertDocuments = exports.changeSetInsertNewRow = exports.getChangeSetInsertedRows = exports.deleteChangeSetRows = exports.revertChangeSetRowChanges = exports.changeSetToSql = exports.extractChangeSetCondition = exports.batchUpdateChangeSet = exports.setChangeSetRowData = exports.setChangeSetValue = exports.findExistingChangeSetItem = exports.createChangeSet = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 function createChangeSet() {
     return {
@@ -392,3 +392,7 @@ function changeSetChangedCount(changeSet) {
     return changeSet.deletes.length + changeSet.updates.length + changeSet.inserts.length;
 }
 exports.changeSetChangedCount = changeSetChangedCount;
+function removeSchemaFromChangeSet(changeSet) {
+    return Object.assign(Object.assign({}, changeSet), { inserts: changeSet.inserts.map(x => (Object.assign(Object.assign({}, x), { schemaName: undefined }))), updates: changeSet.updates.map(x => (Object.assign(Object.assign({}, x), { schemaName: undefined }))), deletes: changeSet.deletes.map(x => (Object.assign(Object.assign({}, x), { schemaName: undefined }))) });
+}
+exports.removeSchemaFromChangeSet = removeSchemaFromChangeSet;

package/lib/GridDisplay.js

@@ -95,10 +95,10 @@ class GridDisplay {
                 }
                 const { field, uniqueName, isIncluded } = modification;
                 if (isIncluded) {
-                    res = Object.assign(Object.assign({}, res), { [field]: [...(cfg[field] || []), uniqueName] });
+                    res = Object.assign(Object.assign({}, res), { [field]: lodash_1.default.uniq([...(cfg[field] || []), uniqueName]) });
                 }
                 else {
-                    res = Object.assign(Object.assign({}, res), { [field]: (cfg[field] || []).filter(x => x != uniqueName) });
+                    res = Object.assign(Object.assign({}, res), { [field]: lodash_1.default.uniq((cfg[field] || []).filter(x => x != uniqueName)) });
                 }
             }
             return res;

package/lib/JslGridDisplay.d.ts

@@ -1,5 +1,6 @@
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
 import { GridConfig, GridCache } from './GridConfig';
+import { EngineDriver } from 'dbgate-types';
 export declare class JslGridDisplay extends GridDisplay {
-    constructor(jslid: any, structure: any, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, rows: any, isDynamicStructure: boolean, supportsReload: boolean, editable?: boolean);
+    constructor(jslid: any, structure: any, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, rows: any, isDynamicStructure: boolean, supportsReload: boolean, editable?: boolean, driver?: EngineDriver);
 }

package/lib/JslGridDisplay.js

@@ -9,9 +9,9 @@ const GridDisplay_1 = require("./GridDisplay");
 const CollectionGridDisplay_1 = require("./CollectionGridDisplay");
 const dbgate_tools_1 = require("dbgate-tools");
 class JslGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(jslid, structure, config, setConfig, cache, setCache, rows, isDynamicStructure, supportsReload, editable = false) {
+    constructor(jslid, structure, config, setConfig, cache, setCache, rows, isDynamicStructure, supportsReload, editable = false, driver = null) {
         var _a;
-        super(config, setConfig, cache, setCache, null);
+        super(config, setConfig, cache, setCache, driver);
         this.filterable = true;
         this.sortable = true;
         this.supportsReload = supportsReload;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.5.4-alpha.8",
+  "version": "5.5.5",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,13 +13,13 @@
     "lib"
   ],
   "dependencies": {
-    "dbgate-sqltree": "^5.5.4-alpha.8",
-    "dbgate-tools": "^5.5.4-alpha.8",
-    "dbgate-filterparser": "^5.5.4-alpha.8",
+    "dbgate-sqltree": "^5.5.5",
+    "dbgate-tools": "^5.5.5",
+    "dbgate-filterparser": "^5.5.5",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
-    "dbgate-types": "^5.5.4-alpha.8",
+    "dbgate-types": "^5.5.5",
     "@types/node": "^13.7.0",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",