generate-dac 1.0.6 → 1.0.8

package/dist/DAC_Utils.js

@@ -60,6 +60,14 @@ function get_SqlDbType(type) {
             codeType: 'int'
         };
     }
+    if (type === 'ntext') {
+        return {
+            type: 'NText',
+            codeGetMethodType: 'GetString',
+            sqlType: 'ntext',
+            codeType: 'string'
+        };
+    }
     var nvarcharReg = /NVARCHAR\(([^\(\)]+)\)/i;
     if (nvarcharReg.test(type)) {
         var match = nvarcharReg.exec(type);
@@ -475,7 +483,6 @@ function DAC_Generate_From_XLSX(filePath, sheetIndex) {
     var outputFolder = (0, file_utils_1.get_filename_without_extension)(filePath);
     console.log("DAC_Generate_From_XLSX: ".concat(outputFolder).yellow);
     var sheets = (0, excel_utils_1.json_read_all_sheets_from_excel)(filePath, { sheetIndex: sheetIndex, transformColumnName: true });
-    (0, excel_utils_1.json_to_file)(filePath.replace('xlsx', 'json'), sheets);
     var schemas = [];
     var stores = [];
     var dropTables = [];

package/dist/convert-table.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var colors_1 = __importDefault(require("colors"));
+var file_utils_1 = require("./utils/file_utils");
+var table_utils_1 = require("./tables/table-utils");
+var excel_utils_1 = require("./utils/excel-utils");
+colors_1.default.enable();
+var SOURCE_FILE_NAME = 'BCSDev_Schema.sql';
+var SOURCE_FILE_PATH = "./input/".concat(SOURCE_FILE_NAME);
+var sourceSchemaData = (0, file_utils_1.text_from_file)(SOURCE_FILE_PATH);
+var sourceTables = (0, table_utils_1.schema_to_table_models)(sourceSchemaData);
+console.log("sourceTables=".concat(sourceTables.length).green);
+(0, excel_utils_1.json_to_file)("./output/source-schema.json", sourceTables);
+var TARGET_FILE_NAME = 'LCRESQA_Schema_11_09_24.sql';
+var TARGET_FILE_PATH = "./input/".concat(TARGET_FILE_NAME);
+var targetSchemaData = (0, file_utils_1.text_from_file)(TARGET_FILE_PATH);
+var targetTables = (0, table_utils_1.schema_to_table_models)(targetSchemaData);
+console.log("targetTables=".concat(targetTables.length).green);
+(0, excel_utils_1.json_to_file)("./output/target-schema.json", targetTables);
+var changes = (0, table_utils_1.table_compares)(sourceTables, targetTables);
+var newTable = changes.filter(function (e) { return e.action === 'new'; });
+console.log("changes ".concat(changes.length, ", newTable=").concat(newTable.length).yellow);
+(0, excel_utils_1.json_to_file)("./output/changes-schema.json", changes);

package/dist/tables/sql-interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/tables/table-utils.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.table_change = exports.table_compares = exports.schema_to_table_models = void 0;
+var utils_1 = require("../utils/utils");
+function schema_to_table_models(content) {
+    var tableStrs = split_to_table_schema(content);
+    console.log("Table split ".concat(tableStrs.length).green);
+    var tables = tableStrs.map(function (e) { return parse_table(e); }).filter(function (e) { return e; });
+    return tables;
+}
+exports.schema_to_table_models = schema_to_table_models;
+function split_to_table_schema(content) {
+    var result = content.split(/\/\*\*\*\*\*\*\s*Object\s*:\s*Table\s*\[dbo\]\.\[[^\[\]]+\]/i).filter(function (e) { return /CREATE\s+TABLE/i.test(e); }).map(function (e) { return e.trim(); });
+    return result;
+}
+function parse_table(content) {
+    var result = {
+        tableName: parse_table_name(content),
+        columns: [],
+        content: content,
+    };
+    if (/^_/.test(result.tableName)) {
+        console.log("Ignore table ".concat(result.tableName).yellow);
+        return null;
+    }
+    var columnMatchs = split_to_column_content(content);
+    var columns = columnMatchs.map(function (e) { return parse_table_column(e); }).filter(function (e) { return e; });
+    result.columns = columns;
+    return result;
+}
+function parse_table_name(content) {
+    var reg = /CREATE\s*TABLE\s*\[dbo\]\.\[([^\[\]]+)\]/i;
+    if (reg.test(content)) {
+        var match = reg.exec(content);
+        return match[1];
+    }
+    return '';
+}
+function split_to_column_content(content) {
+    var result = (0, utils_1.match_all)(/\[([^\[\]]+)\][ ]+\[([^\[\]]+)\][ ]*(.*)$/gm, content);
+    return result;
+}
+function parse_table_column(match) {
+    var content = match[0];
+    var type = match[2].toLowerCase();
+    var result = {
+        columnName: match[1],
+        type: type,
+        content: content,
+        isNull: true,
+    };
+    if (type === 'nvarchar' || type === 'decimal') {
+        var reg = /\[(nvarchar|decimal)\](\([^\(\)]+\))/i;
+        if (reg.test(content)) {
+            var match_1 = reg.exec(content);
+            result.typeArgs = match_1[2];
+        }
+    }
+    if (/NOT[ ]+NULL/i.test(content)) {
+        result.isNull = false;
+    }
+    if (/IDENTITY/i.test(content)) {
+        result.isPrimary = true;
+    }
+    return result;
+}
+function table_compares(tables, targetTables) {
+    var changes = [];
+    tables.forEach(function (source) {
+        var target = targetTables.find(function (e) { return e.tableName === source.tableName; });
+        if (!target) {
+            changes.push({
+                action: 'new',
+                source: source,
+            });
+        }
+        else {
+            var change = table_change(source, target);
+            if (change) {
+                changes.push(change);
+            }
+        }
+    });
+    return changes;
+}
+exports.table_compares = table_compares;
+function table_change(source, target) {
+    var result = {
+        source: source,
+        target: target,
+        action: 'modify',
+    };
+    var changes = [];
+    source.columns.forEach(function (sourceCol) {
+        var targetCol = target.columns.find(function (e) { return e.columnName === sourceCol.columnName; });
+        if (!targetCol) {
+            changes.push({
+                action: 'new',
+                source: sourceCol,
+            });
+        }
+        else {
+            if (sourceCol.type !== targetCol.type
+                || sourceCol.typeArgs !== targetCol.typeArgs
+                || sourceCol.isNull !== targetCol.isNull) {
+                changes.push({
+                    action: 'modify',
+                    source: sourceCol,
+                    target: targetCol,
+                });
+            }
+        }
+    });
+    result.columnChanges = changes;
+    return changes.length ? result : null;
+}
+exports.table_change = table_change;

package/dist/utils/utils.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.roundTo2Decimals = void 0;
+exports.match_all = exports.roundTo2Decimals = void 0;
 function roundTo2Decimals(str) {
     var num = parseFloat(str);
     return Math.round(num * 100) / 100;
 }
 exports.roundTo2Decimals = roundTo2Decimals;
+function match_all(reg, content) {
+    var result = [];
+    var match;
+    while ((match = reg.exec(content)) !== null) {
+        result.push(match);
+    }
+    return result;
+}
+exports.match_all = match_all;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generate-dac",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -19,6 +19,7 @@
     "@types/encoding-japanese": "^2.0.1",
     "@types/fs-extra": "^11.0.1",
     "@types/uuid": "^8.3.4",
+    "canvas": "^2.11.2",
     "colors": "^1.4.0",
     "command-line-args": "^5.2.1",
     "dayjs": "^1.11.10",

package/src/DAC_Utils.ts

@@ -27,7 +27,7 @@ export function binding_template(content: string, data: any){
   return result;
 }
 
-export type SqlDbTypeType = '' | 'Int' | 'TinyInt' | 'NVarChar' | 'DateTime' | 'Bit' | 'Money' | 'Decimal' | 'Date';
+export type SqlDbTypeType = '' | 'Int' | 'TinyInt' | 'NVarChar' | 'DateTime' | 'Bit' | 'Money' | 'Decimal' | 'Date' | 'NText';
 export type CSharpType = 'int' | 'string' | 'DateTime' | 'bool' | 'decimal';
 export type CShareGetMethodType = '' | 'GetDateTime' | 'GetInt32' | 'GetBoolean' | 'GetString' | 'GetByte' | 'GetDecimal';
 
@@ -78,6 +78,14 @@ export function get_SqlDbType(type: string): SqlDbType{
       codeType: 'int'
     };
   }
+  if(type === 'ntext'){
+    return {
+      type: 'NText',
+      codeGetMethodType: 'GetString',
+      sqlType: 'ntext',
+      codeType: 'string'
+    };
+  }
   const nvarcharReg = /NVARCHAR\(([^\(\)]+)\)/i;
   if(nvarcharReg.test(type)){
     const match = nvarcharReg.exec(type);
@@ -622,8 +630,6 @@ export function DAC_Generate_From_XLSX(filePath: string, sheetIndex: number = 0)
 
   const sheets: SheetData[] = json_read_all_sheets_from_excel(filePath, { sheetIndex: sheetIndex, transformColumnName: true });
 
-  json_to_file(filePath.replace('xlsx', 'json'), sheets);
-
   const schemas: string[] = [];
   const stores: string[] = [];
   const dropTables: string[] = [];

package/src/convert-table.ts

@@ -0,0 +1,33 @@
+import colors from 'colors';
+import fs from 'fs';
+
+import { text_from_file } from "./utils/file_utils";
+import { schema_to_table_models, table_compares } from './tables/table-utils';
+import { json_to_file } from './utils/excel-utils';
+import { createCanvas } from 'canvas';
+import { SQLTable } from './tables/sql-interface';
+
+colors.enable();
+
+const SOURCE_FILE_NAME = 'BCSDev_Schema.sql';
+const SOURCE_FILE_PATH = `./input/${SOURCE_FILE_NAME}`;
+
+const sourceSchemaData = text_from_file(SOURCE_FILE_PATH);
+const sourceTables = schema_to_table_models(sourceSchemaData);
+console.log(`sourceTables=${sourceTables.length}`.green);
+json_to_file(`./output/source-schema.json`, sourceTables);
+
+const TARGET_FILE_NAME = 'LCRESQA_Schema_11_09_24.sql';
+const TARGET_FILE_PATH = `./input/${TARGET_FILE_NAME}`;
+
+const targetSchemaData = text_from_file(TARGET_FILE_PATH);
+const targetTables = schema_to_table_models(targetSchemaData);
+
+console.log(`targetTables=${targetTables.length}`.green);
+json_to_file(`./output/target-schema.json`, targetTables);
+
+const changes = table_compares(sourceTables, targetTables);
+const newTable = changes.filter(e => e.action === 'new');
+console.log(`changes ${changes.length}, newTable=${newTable.length}`.yellow);
+
+json_to_file(`./output/changes-schema.json`, changes);

package/src/index.ts

@@ -13,6 +13,4 @@ colors.enable();
 
 const INPUT_DIR = './input/';
 
-start_generate_dac_for_new_table(INPUT_DIR);
-
-// startProcess({inputFolder: INPUT_DIR});
+start_generate_dac_for_new_table(INPUT_DIR);

package/src/tables/sql-interface.ts

@@ -0,0 +1,31 @@
+export interface SQLColumn{
+  content: string,
+  columnName: string,
+  type: SQLType,
+  typeArgs?: string,
+  isNull?: boolean,
+  isPrimary?: boolean,
+}
+
+export interface SQLTable{
+  tableName: string,
+  content: string,
+  columns: SQLColumn[],
+}
+
+export type SQLType = 'decimal' | 'tinyint' | 'datetime' | 'int' | 'nvarchar' | 'ntext';
+
+export type SQLTableChangeAction = 'new' | 'modify' | 'deleted';
+
+export interface SQLTableChange{
+  source: SQLTable,
+  target?: SQLTable,
+  action: SQLTableChangeAction,
+  columnChanges?: SQLColumnChange[],
+}
+
+export interface SQLColumnChange{
+  action: SQLTableChangeAction,
+  source?: SQLColumn,
+  target?: SQLColumn,
+}

package/src/tables/table-utils.ts

@@ -0,0 +1,141 @@
+import { match_all } from "../utils/utils";
+import { SQLColumn, SQLColumnChange, SQLTable, SQLTableChange, SQLType } from "./sql-interface";
+
+export function schema_to_table_models(content: string): SQLTable[]{
+  const tableStrs: string[] = split_to_table_schema(content);
+  console.log(`Table split ${tableStrs.length}`.green);
+  const tables = tableStrs.map(e => parse_table(e)).filter(e => e);
+
+  return tables;
+}
+
+function split_to_table_schema(content: string): string[]{
+  // /****** Object:  Table [dbo].[Profile_Application_Step]
+  let result: string[] = content.split(/\/\*\*\*\*\*\*\s*Object\s*:\s*Table\s*\[dbo\]\.\[[^\[\]]+\]/i).filter(e => /CREATE\s+TABLE/i.test(e)).map(e => e.trim());
+
+    return result;
+}
+
+function parse_table(content: string): SQLTable | null{
+  let result: SQLTable = {
+    tableName: parse_table_name(content),
+    columns: [],
+    content: content,
+  };
+
+  // Ignore table begin with "_"
+  if(/^_/.test(result.tableName)){
+    console.log(`Ignore table ${result.tableName}`.yellow);
+    return null;
+  }
+
+  const columnMatchs: any[] = split_to_column_content(content);
+  const columns = columnMatchs.map(e => parse_table_column(e)).filter(e => e);
+  result.columns = columns;
+
+  return result;
+}
+
+function parse_table_name(content: string): string{
+  // CREATE TABLE [dbo].[_imp_Insp_Template_Stage]
+  const reg = /CREATE\s*TABLE\s*\[dbo\]\.\[([^\[\]]+)\]/i;
+  if(reg.test(content)){
+    const match = reg.exec(content);
+    return match[1];
+  }
+  return '';
+}
+
+function split_to_column_content(content: string): any[]{
+  // [Create_DateTime] [datetime] NULL,
+  const result = match_all(/\[([^\[\]]+)\][ ]+\[([^\[\]]+)\][ ]*(.*)$/gm, content);
+  return result;
+}
+
+function parse_table_column(match: string[]): SQLColumn | null{
+  const content = match[0];
+  const type = match[2].toLowerCase() as SQLType;
+  let result: SQLColumn = {
+    columnName: match[1],
+    type: type,
+    content: content,
+    isNull: true,
+  };
+
+  // [nvarchar](255)
+  // [decimal](18, 2)
+  if(type === 'nvarchar' || type === 'decimal'){
+    const reg = /\[(nvarchar|decimal)\](\([^\(\)]+\))/i;
+    if(reg.test(content)){
+      const match = reg.exec(content);
+      result.typeArgs = match[2];
+    }
+  }
+
+  // NULL
+  if(/NOT[ ]+NULL/i.test(content)){
+    result.isNull = false;
+  }
+
+  // IDENTITY
+  if(/IDENTITY/i.test(content)){
+    result.isPrimary = true;
+  }
+
+  return result;
+}
+
+export function table_compares(tables: SQLTable[], targetTables: SQLTable[]): SQLTableChange[]{
+  const changes: SQLTableChange[] = [];
+  tables.forEach(source => {
+    const target = targetTables.find(e => e.tableName === source.tableName);
+    if(!target){
+      changes.push({
+        action: 'new',
+        source: source,
+      })
+    }
+    else{
+      const change = table_change(source, target);
+      if(change){
+        changes.push(change);
+      }
+    }
+  });
+
+  return changes;
+}
+
+export function table_change(source: SQLTable, target: SQLTable): SQLTableChange | null{
+  const result: SQLTableChange = {
+    source: source,
+    target: target,
+    action: 'modify',
+  };
+  const changes: SQLColumnChange[] = [];
+  source.columns.forEach((sourceCol) => {
+    const targetCol = target.columns.find(e => e.columnName === sourceCol.columnName);
+    if(!targetCol){
+      changes.push({
+        action: 'new',
+        source: sourceCol,
+      })
+    }
+    else{
+      if(sourceCol.type !== targetCol.type 
+        || sourceCol.typeArgs !== targetCol.typeArgs
+        || sourceCol.isNull !== targetCol.isNull
+      ){
+        changes.push({
+          action: 'modify',
+          source: sourceCol,
+          target: targetCol,
+        })
+      }
+    }
+  })
+
+  result.columnChanges = changes;
+
+  return changes.length ? result : null;
+}

package/src/utils/utils.ts

@@ -3,3 +3,13 @@ export function roundTo2Decimals(str: any) {
 
   return Math.round(num * 100) / 100;
 }
+
+export function match_all(reg: RegExp, content: string): any[]{
+  let result: any[] = [];
+  let match: any;
+  while ((match = reg.exec(content)) !== null) {
+    result.push(match);
+  }
+  
+  return result;
+}