dbgate-tools 6.5.4 → 6.5.6

package/lib/stringTools.js

@@ -619,6 +619,8 @@ function parseNumberSafe(value) {
 exports.parseNumberSafe = parseNumberSafe;
 const frontMatterRe = /^--\ >>>[ \t\r]*\n(.*)\n-- <<<[ \t\r]*\n/s;
 function getSqlFrontMatter(text, yamlModule) {
+    if (!text || !(0, isString_1.default)(text))
+        return null;
     const match = text.match(frontMatterRe);
     if (!match)
         return null;
@@ -627,6 +629,8 @@ function getSqlFrontMatter(text, yamlModule) {
 }
 exports.getSqlFrontMatter = getSqlFrontMatter;
 function removeSqlFrontMatter(text) {
+    if (!text || !(0, isString_1.default)(text))
+        return null;
     return text.replace(frontMatterRe, '');
 }
 exports.removeSqlFrontMatter = removeSqlFrontMatter;
@@ -646,6 +650,6 @@ function setSqlFrontMatter(text, data, yamlModule) {
         .map(line => '-- ' + line)
         .join('\n');
     const frontMatterContent = `-- >>>\n${yamlContentMapped}\n-- <<<\n`;
-    return frontMatterContent + textClean;
+    return frontMatterContent + (textClean || '');
 }
 exports.setSqlFrontMatter = setSqlFrontMatter;

package/lib/structureTools.d.ts

@@ -1,4 +1,4 @@
-import type { DatabaseInfo, TableInfo, ApplicationDefinition, ViewInfo, CollectionInfo } from 'dbgate-types';
+import type { DatabaseInfo, TableInfo, ApplicationDefinition, ViewInfo, CollectionInfo, EngineDriver } from 'dbgate-types';
 export declare function addTableDependencies(db: DatabaseInfo): DatabaseInfo;
 export declare function extendTableInfo(table: TableInfo): TableInfo;
 export declare function extendDatabaseInfo(db: DatabaseInfo): DatabaseInfo;
@@ -30,3 +30,4 @@ export declare function skipDbGateInternalObjects(db: DatabaseInfo): {
     triggers: import("dbgate-types").TriggerInfo[];
     schedulerEvents: import("dbgate-types").SchedulerEventInfo[];
 };
+export declare function adaptDatabaseInfo(db: DatabaseInfo, driver: EngineDriver): DatabaseInfo;

package/lib/structureTools.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.skipDbGateInternalObjects = exports.removePreloadedRowsFromStructure = exports.detectChangesInPreloadedRows = exports.skipNamesInStructureByRegex = exports.replaceSchemaInStructure = exports.getSchemasUsedByStructure = exports.filterStructureBySchema = exports.isCollectionInfo = exports.isViewInfo = exports.isTableInfo = exports.isTableColumnUnique = exports.extendDatabaseInfoFromApps = exports.extendDatabaseInfo = exports.extendTableInfo = exports.addTableDependencies = void 0;
+exports.adaptDatabaseInfo = exports.skipDbGateInternalObjects = exports.removePreloadedRowsFromStructure = exports.detectChangesInPreloadedRows = exports.skipNamesInStructureByRegex = exports.replaceSchemaInStructure = exports.getSchemasUsedByStructure = exports.filterStructureBySchema = exports.isCollectionInfo = exports.isViewInfo = exports.isTableInfo = exports.isTableColumnUnique = exports.extendDatabaseInfoFromApps = exports.extendDatabaseInfo = exports.extendTableInfo = exports.addTableDependencies = void 0;
 const flatten_1 = __importDefault(require("lodash/flatten"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
 const keys_1 = __importDefault(require("lodash/keys"));
@@ -293,3 +293,11 @@ function skipDbGateInternalObjects(db) {
     };
 }
 exports.skipDbGateInternalObjects = skipDbGateInternalObjects;
+function adaptDatabaseInfo(db, driver) {
+    const modelAdapted = {
+        ...db,
+        tables: db.tables.map(table => driver.adaptTableInfo(table)),
+    };
+    return modelAdapted;
+}
+exports.adaptDatabaseInfo = adaptDatabaseInfo;

package/lib/yamlModelConv.d.ts

@@ -23,12 +23,17 @@ export interface IndexInfoYaml {
     columns: string[];
     included?: string[];
 }
+export interface UniqueInfoYaml {
+    name: string;
+    columns: string[];
+}
 export interface TableInfoYaml {
     name: string;
     columns: ColumnInfoYaml[];
     primaryKey?: string[];
     sortingKey?: string[];
     indexes?: IndexInfoYaml[];
+    uniques?: UniqueInfoYaml[];
     insertKey?: string[];
     insertOnly?: string[];
     data?: any[];

package/lib/yamlModelConv.js

@@ -46,7 +46,7 @@ function columnInfoFromYaml(column, table) {
     return res;
 }
 function tableInfoToYaml(table) {
-    var _a;
+    var _a, _b;
     const tableCopy = (0, cloneDeep_1.default)(table);
     const res = {
         name: tableCopy.pureName,
@@ -74,6 +74,12 @@ function tableInfoToYaml(table) {
             return idx;
         });
     }
+    if (((_b = tableCopy.uniques) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+        res.uniques = tableCopy.uniques.map(unique => ({
+            name: unique.constraintName,
+            columns: unique.columns.map(x => x.columnName),
+        }));
+    }
     return res;
 }
 exports.tableInfoToYaml = tableInfoToYaml;
@@ -97,7 +103,7 @@ function convertForeignKeyFromYaml(col, table, allTables) {
     };
 }
 function tableInfoFromYaml(table, allTables) {
-    var _a;
+    var _a, _b;
     const res = {
         pureName: table.name,
         columns: table.columns.map(c => columnInfoFromYaml(c, table)),
@@ -113,6 +119,12 @@ function tableInfoFromYaml(table, allTables) {
                 ...(index.included || []).map(columnName => ({ columnName, isIncludedColumn: true })),
             ],
         })),
+        uniques: (_b = table.uniques) === null || _b === void 0 ? void 0 : _b.map(unique => ({
+            constraintName: unique.name,
+            pureName: table.name,
+            constraintType: 'unique',
+            columns: unique.columns.map(columnName => ({ columnName })),
+        })),
     };
     if (table.primaryKey) {
         res.primaryKey = {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.5.4",
+  "version": "6.5.6",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,14 +26,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.5.4",
+    "dbgate-types": "^6.5.6",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "dbgate-query-splitter": "^4.11.5",
-    "dbgate-sqltree": "^6.5.4",
+    "dbgate-sqltree": "^6.5.6",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",