dbgate-tools 6.1.2 → 6.1.4

package/lib/DatabaseAnalyser.js

@@ -21,7 +21,16 @@ const getLogger_1 = require("./getLogger");
 const schemaInfoTools_1 = require("./schemaInfoTools");
 const stringTools_1 = require("./stringTools");
 const logger = (0, getLogger_1.getLogger)('dbAnalyser');
-const STRUCTURE_FIELDS = ['tables', 'collections', 'views', 'matviews', 'functions', 'procedures', 'triggers'];
+const STRUCTURE_FIELDS = [
+    'tables',
+    'collections',
+    'views',
+    'matviews',
+    'functions',
+    'procedures',
+    'triggers',
+    'schedulerEvents',
+];
 const fp_pick = arg => array => (0, pick_1.default)(array, arg);
 function mergeTableRowCounts(info, rowCounts) {
     return Object.assign(Object.assign({}, info), { tables: (info.tables || []).map(table => {
@@ -241,6 +250,7 @@ class DatabaseAnalyser {
             ...this.getDeletedObjectsForField(snapshot, 'procedures'),
             ...this.getDeletedObjectsForField(snapshot, 'functions'),
             ...this.getDeletedObjectsForField(snapshot, 'triggers'),
+            ...this.getDeletedObjectsForField(snapshot, 'schedulerEvents'),
         ];
     }
     feedback(obj) {
@@ -336,6 +346,7 @@ class DatabaseAnalyser {
             functions: [],
             procedures: [],
             triggers: [],
+            schedulerEvents: [],
         };
     }
     static byTableFilter(table) {

package/lib/SqlDumper.d.ts

@@ -1,4 +1,4 @@
-import type { ColumnInfo, ConstraintInfo, EngineDriver, ForeignKeyInfo, FunctionInfo, NamedObjectInfo, PrimaryKeyInfo, ProcedureInfo, SqlDialect, TableInfo, TransformType, TriggerInfo, ViewInfo, IndexInfo, UniqueInfo, CheckInfo, AlterProcessor, SqlObjectInfo, CallableObjectInfo } from 'dbgate-types';
+import type { ColumnInfo, ConstraintInfo, EngineDriver, ForeignKeyInfo, FunctionInfo, NamedObjectInfo, PrimaryKeyInfo, ProcedureInfo, SqlDialect, TableInfo, TransformType, TriggerInfo, ViewInfo, IndexInfo, UniqueInfo, CheckInfo, AlterProcessor, SqlObjectInfo, CallableObjectInfo, SchedulerEventInfo } from 'dbgate-types';
 export declare class SqlDumper implements AlterProcessor {
     s: string;
     driver: EngineDriver;
@@ -75,6 +75,10 @@ export declare class SqlDumper implements AlterProcessor {
     alterTrigger(obj: TriggerInfo): void;
     changeTriggerSchema(obj: TriggerInfo, newSchema: string): void;
     renameTrigger(obj: TriggerInfo, newSchema: string): void;
+    createSchedulerEvent(obj: SchedulerEventInfo): void;
+    dropSchedulerEvent(obj: SchedulerEventInfo, { testIfExists }: {
+        testIfExists?: boolean;
+    }): void;
     dropConstraintCore(cnt: ConstraintInfo): void;
     dropConstraint(cnt: ConstraintInfo): void;
     createConstraint(cnt: ConstraintInfo): void;
@@ -113,7 +117,7 @@ export declare class SqlDumper implements AlterProcessor {
     dropConstraints(table: TableInfo, dropReferences?: boolean): void;
     recreateTable(oldTable: TableInfo, newTable: TableInfo): void;
     createSqlObject(obj: SqlObjectInfo): void;
-    getSqlObjectSqlName(ojectTypeField: string): "PROCEDURE" | "VIEW" | "FUNCTION" | "TRIGGER" | "MATERIALIZED VIEW";
+    getSqlObjectSqlName(ojectTypeField: string): "PROCEDURE" | "VIEW" | "FUNCTION" | "TRIGGER" | "MATERIALIZED VIEW" | "EVENT";
     dropSqlObject(obj: SqlObjectInfo): void;
     setTableOption(table: TableInfo, optionName: string, optionValue: string): void;
     setTableOptionCore(table: TableInfo, optionName: string, optionValue: string, formatString: string): void;

package/lib/SqlDumper.js

@@ -392,6 +392,13 @@ class SqlDumper {
     }
     changeTriggerSchema(obj, newSchema) { }
     renameTrigger(obj, newSchema) { }
+    createSchedulerEvent(obj) {
+        this.putRaw(obj.createSql);
+        this.endCommand();
+    }
+    dropSchedulerEvent(obj, { testIfExists = false }) {
+        this.putCmd('^drop ^event  %f', obj);
+    }
     dropConstraintCore(cnt) {
         this.putCmd('^alter ^table %f ^drop ^constraint %i', cnt, cnt.constraintName);
     }
@@ -617,6 +624,8 @@ class SqlDumper {
                 return 'TRIGGER';
             case 'matviews':
                 return 'MATERIALIZED VIEW';
+            case 'schedulerEvents':
+                return 'EVENT';
         }
     }
     dropSqlObject(obj) {

package/lib/SqlGenerator.d.ts

@@ -28,11 +28,14 @@ interface SqlGeneratorOptions {
     dropTriggers: boolean;
     checkIfTriggerExists: boolean;
     createTriggers: boolean;
+    dropSchedulerEvents: boolean;
+    checkIfSchedulerEventExists: boolean;
+    createSchedulerEvents: boolean;
 }
 interface SqlGeneratorObject {
     schemaName: string;
     pureName: string;
-    objectTypeField: 'tables' | 'views' | 'procedures' | 'functions';
+    objectTypeField: 'tables' | 'views' | 'procedures' | 'functions' | 'triggers' | 'schedulerEvents';
 }
 export declare class SqlGenerator {
     options: SqlGeneratorOptions;
@@ -46,6 +49,7 @@ export declare class SqlGenerator {
     private procedures;
     private functions;
     private triggers;
+    private schedulerEvents;
     dbinfo: DatabaseInfo;
     isTruncated: boolean;
     isUnhandledException: boolean;

package/lib/SqlGenerator.js

@@ -39,6 +39,7 @@ class SqlGenerator {
         this.procedures = this.extract('procedures');
         this.functions = this.extract('functions');
         this.triggers = this.extract('triggers');
+        this.schedulerEvents = this.extract('schedulerEvents');
     }
     dump() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -57,6 +58,9 @@ class SqlGenerator {
                 if (this.checkDumper())
                     return;
                 this.dropObjects(this.triggers, 'Trigger');
+                if (this.checkDumper())
+                    return;
+                this.dropObjects(this.schedulerEvents, 'SchedulerEvent');
                 if (this.checkDumper())
                     return;
                 this.dropTables();
@@ -89,6 +93,9 @@ class SqlGenerator {
                 this.createObjects(this.triggers, 'Trigger');
                 if (this.checkDumper())
                     return;
+                this.createObjects(this.schedulerEvents, 'SchedulerEvent');
+                if (this.checkDumper())
+                    return;
             }
             finally {
                 process.off('uncaughtException', this.handleException);
@@ -230,7 +237,8 @@ class SqlGenerator {
         });
     }
     extract(objectTypeField) {
-        return this.dbinfo[objectTypeField].filter(x => this.objects.find(y => x.pureName == y.pureName && x.schemaName == y.schemaName && y.objectTypeField == objectTypeField));
+        var _a, _b;
+        return ((_b = (_a = this.dbinfo[objectTypeField]) === null || _a === void 0 ? void 0 : _a.filter(x => this.objects.find(y => x.pureName == y.pureName && x.schemaName == y.schemaName && y.objectTypeField == objectTypeField))) !== null && _b !== void 0 ? _b : []);
     }
     enableConstraints(enabled) {
         if (this.options.disableConstraints) {

package/lib/dbKeysLoader.d.ts

@@ -0,0 +1,35 @@
+export interface DbKeysNodeModelBase {
+    text?: string;
+    count?: number;
+    level: number;
+}
+export interface DbKeysLeafNodeModel extends DbKeysNodeModelBase {
+    key: string;
+    type: 'string' | 'hash' | 'set' | 'list' | 'zset' | 'stream' | 'binary' | 'ReJSON-RL';
+}
+export interface DbKeysFolderNodeModel extends DbKeysNodeModelBase {
+    root: string;
+    type: 'dir';
+    maxShowCount?: number;
+    isExpanded?: boolean;
+    shouldLoadNext?: boolean;
+    hasNext?: boolean;
+}
+export interface DbKeysTreeModel {
+    root: DbKeysFolderNodeModel;
+    dirsByKey: {
+        [key: string]: DbKeysFolderNodeModel;
+    };
+    childrenByKey: {
+        [key: string]: DbKeysNodeModel[];
+    };
+    refreshAll?: boolean;
+}
+export type DbKeysNodeModel = DbKeysLeafNodeModel | DbKeysFolderNodeModel;
+export type DbKeysLoadFunction = (root: string, limit: number) => Promise<DbKeysNodeModel[]>;
+export type DbKeysChangeModelFunction = (func: (model: DbKeysTreeModel) => DbKeysTreeModel) => void;
+export declare function dbKeys_loadMissing(tree: DbKeysTreeModel, loader: DbKeysLoadFunction): Promise<DbKeysTreeModel>;
+export declare function dbKeys_markNodeExpanded(tree: DbKeysTreeModel, root: string, isExpanded: boolean): DbKeysTreeModel;
+export declare function dbKeys_refreshAll(tree?: DbKeysTreeModel): DbKeysTreeModel;
+export declare function dbKeys_reloadFolder(tree: DbKeysTreeModel, root: string): DbKeysTreeModel;
+export declare function dbKeys_getFlatList(tree: DbKeysTreeModel): DbKeysNodeModel[];

package/lib/dbKeysLoader.js

@@ -0,0 +1,132 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dbKeys_getFlatList = exports.dbKeys_reloadFolder = exports.dbKeys_refreshAll = exports.dbKeys_markNodeExpanded = exports.dbKeys_loadMissing = void 0;
+const omit_1 = __importDefault(require("lodash/omit"));
+const SHOW_INCREMENT = 100;
+// function dbKeys_findFolderNode(node: DbKeysNodeModel, root: string) {
+//   if (node.type != 'dir') {
+//     return null;
+//   }
+//   if (node.root === root) {
+//     return node;
+//   }
+//   for (const child of node.children ?? []) {
+//     const res = dbKeys_findFolderNode(child, root);
+//     if (res) {
+//       return res;
+//     }
+//   }
+//   return null;
+// }
+// export async function dbKeys_loadKeysFromNode(
+//   tree: DbKeysTreeModel,
+//   callingRoot: string,
+//   separator: string,
+//   loader: DbKeysLoadFunction
+// ): Promise<DbKeysTreeModel> {
+//   const callingRootNode = tree.dirsByKey[callingRoot];
+//   if (!callingRootNode) {
+//     return tree;
+//   }
+//   const newItems = await loader(callingRoot, callingRootNode.maxShowCount ?? SHOW_INCREMENT);
+//   return {
+//     ...tree,
+//     childrenByKey: {
+//       ...tree.childrenByKey,
+//       [callingRoot]: newItems,
+//     },
+//   };
+// }
+function dbKeys_loadMissing(tree, loader) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const childrenByKey = Object.assign({}, tree.childrenByKey);
+        const dirsByKey = Object.assign({}, tree.dirsByKey);
+        for (const root in tree.dirsByKey) {
+            const dir = tree.dirsByKey[root];
+            if (dir.isExpanded && dir.shouldLoadNext) {
+                if (!tree.childrenByKey[root] || dir.hasNext) {
+                    const loadCount = dir.maxShowCount && dir.shouldLoadNext ? dir.maxShowCount + SHOW_INCREMENT : SHOW_INCREMENT;
+                    const items = yield loader(root, loadCount + 1);
+                    childrenByKey[root] = items.slice(0, loadCount);
+                    dirsByKey[root] = Object.assign(Object.assign({}, dir), { shouldLoadNext: false, maxShowCount: loadCount, hasNext: items.length > loadCount });
+                    for (const child of items.slice(0, loadCount)) {
+                        if (child.type == 'dir' && !dirsByKey[child.root]) {
+                            dirsByKey[child.root] = {
+                                shouldLoadNext: false,
+                                maxShowCount: null,
+                                hasNext: false,
+                                isExpanded: false,
+                                type: 'dir',
+                                level: dir.level + 1,
+                                root: child.root,
+                                text: child.text,
+                            };
+                        }
+                    }
+                }
+                else {
+                    dirsByKey[root] = Object.assign(Object.assign({}, dir), { shouldLoadNext: false });
+                }
+            }
+        }
+        return Object.assign(Object.assign({}, tree), { dirsByKey,
+            childrenByKey, refreshAll: false });
+    });
+}
+exports.dbKeys_loadMissing = dbKeys_loadMissing;
+function dbKeys_markNodeExpanded(tree, root, isExpanded) {
+    const node = tree.dirsByKey[root];
+    if (!node) {
+        return tree;
+    }
+    return Object.assign(Object.assign({}, tree), { dirsByKey: Object.assign(Object.assign({}, tree.dirsByKey), { [root]: Object.assign(Object.assign({}, node), { isExpanded, shouldLoadNext: isExpanded }) }) });
+}
+exports.dbKeys_markNodeExpanded = dbKeys_markNodeExpanded;
+function dbKeys_refreshAll(tree) {
+    const root = {
+        isExpanded: true,
+        level: 0,
+        root: '',
+        type: 'dir',
+        shouldLoadNext: true,
+    };
+    return Object.assign(Object.assign({}, tree), { childrenByKey: {}, dirsByKey: {
+            '': root,
+        }, refreshAll: true, root });
+}
+exports.dbKeys_refreshAll = dbKeys_refreshAll;
+function dbKeys_reloadFolder(tree, root) {
+    return Object.assign(Object.assign({}, tree), { childrenByKey: (0, omit_1.default)(tree.childrenByKey, root), dirsByKey: Object.assign(Object.assign({}, tree.dirsByKey), { [root]: Object.assign(Object.assign({}, tree.dirsByKey[root]), { shouldLoadNext: true, hasNext: undefined }) }) });
+}
+exports.dbKeys_reloadFolder = dbKeys_reloadFolder;
+function addFlatItems(tree, root, res) {
+    const item = tree.dirsByKey[root];
+    if (!item.isExpanded) {
+        return false;
+    }
+    const children = tree.childrenByKey[root] || [];
+    for (const child of children) {
+        res.push(child);
+        if (child.type == 'dir') {
+            addFlatItems(tree, child.root, res);
+        }
+    }
+}
+function dbKeys_getFlatList(tree) {
+    const res = [];
+    addFlatItems(tree, '', res);
+    return res;
+}
+exports.dbKeys_getFlatList = dbKeys_getFlatList;

package/lib/diffTools.js

@@ -42,12 +42,12 @@ function generateObjectPairingId(obj) {
     return obj;
 }
 function generateDbPairingId(db) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     if (!db)
         return db;
     return Object.assign(Object.assign({}, db), { 
         // ..._.mapValues(db, v => (_.isArray(v) ? v.map(generateObjectPairingId) : v)),
-        tables: (_a = db.tables) === null || _a === void 0 ? void 0 : _a.map(generateTablePairingId), views: (_b = db.views) === null || _b === void 0 ? void 0 : _b.map(generateObjectPairingId), procedures: (_c = db.procedures) === null || _c === void 0 ? void 0 : _c.map(generateObjectPairingId), functions: (_d = db.functions) === null || _d === void 0 ? void 0 : _d.map(generateObjectPairingId), triggers: (_e = db.triggers) === null || _e === void 0 ? void 0 : _e.map(generateObjectPairingId), matviews: (_f = db.matviews) === null || _f === void 0 ? void 0 : _f.map(generateObjectPairingId) });
+        tables: (_a = db.tables) === null || _a === void 0 ? void 0 : _a.map(generateTablePairingId), views: (_b = db.views) === null || _b === void 0 ? void 0 : _b.map(generateObjectPairingId), procedures: (_c = db.procedures) === null || _c === void 0 ? void 0 : _c.map(generateObjectPairingId), functions: (_d = db.functions) === null || _d === void 0 ? void 0 : _d.map(generateObjectPairingId), triggers: (_e = db.triggers) === null || _e === void 0 ? void 0 : _e.map(generateObjectPairingId), schedulerEvents: (_f = db.schedulerEvents) === null || _f === void 0 ? void 0 : _f.map(generateObjectPairingId), matviews: (_g = db.matviews) === null || _g === void 0 ? void 0 : _g.map(generateObjectPairingId) });
 }
 exports.generateDbPairingId = generateDbPairingId;
 function getNameWithoutDeletedPrefix(name, opts, deletedPrefix) {
@@ -519,7 +519,15 @@ function sortViewsByDependency(views) {
 }
 function createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver) {
     const plan = new alterPlan_1.AlterPlan(wholeOldDb, wholeNewDb, driver.dialect, opts);
-    for (const objectTypeField of ['tables', 'views', 'procedures', 'matviews', 'functions', 'triggers']) {
+    for (const objectTypeField of [
+        'tables',
+        'views',
+        'procedures',
+        'matviews',
+        'functions',
+        'triggers',
+        'schedulerEvents',
+    ]) {
         for (const oldobj of oldDb[objectTypeField] || []) {
             const newobj = (newDb[objectTypeField] || []).find(x => x.pairingId == oldobj.pairingId);
             if (objectTypeField == 'tables') {

package/lib/index.d.ts

@@ -24,3 +24,4 @@ export * from './getConnectionLabel';
 export * from './detectSqlFilterBehaviour';
 export * from './filterBehaviours';
 export * from './schemaInfoTools';
+export * from './dbKeysLoader';

package/lib/index.js

@@ -40,3 +40,4 @@ __exportStar(require("./getConnectionLabel"), exports);
 __exportStar(require("./detectSqlFilterBehaviour"), exports);
 __exportStar(require("./filterBehaviours"), exports);
 __exportStar(require("./schemaInfoTools"), exports);
+__exportStar(require("./dbKeysLoader"), exports);

package/lib/structureTools.d.ts

@@ -28,4 +28,5 @@ export declare function skipDbGateInternalObjects(db: DatabaseInfo): {
     procedures: import("dbgate-types").ProcedureInfo[];
     functions: import("dbgate-types").FunctionInfo[];
     triggers: import("dbgate-types").TriggerInfo[];
+    schedulerEvents: import("dbgate-types").SchedulerEventInfo[];
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.1.2",
+  "version": "6.1.4",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,14 +25,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.1.2",
+    "dbgate-types": "^6.1.4",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "dbgate-query-splitter": "^4.11.2",
-    "dbgate-sqltree": "^6.1.2",
+    "dbgate-query-splitter": "^4.11.3",
+    "dbgate-sqltree": "^6.1.4",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",