generate-dac 1.0.8 → 1.1.0

package/dist/DAC_Utils.js

@@ -36,6 +36,22 @@ function get_SqlDbType(type) {
             sqlType: 'int'
         };
     }
+    if (type === 'bigint') {
+        return {
+            type: 'BigInt',
+            codeType: 'long',
+            codeGetMethodType: 'GetInt64',
+            sqlType: 'bigint'
+        };
+    }
+    if (type === 'smallint') {
+        return {
+            type: 'SmallInt',
+            codeType: 'int',
+            codeGetMethodType: 'GetInt16',
+            sqlType: 'smallint'
+        };
+    }
     if (type === 'date') {
         return {
             type: 'Date',
@@ -80,16 +96,28 @@ function get_SqlDbType(type) {
             sqlType: "nvarchar(".concat(length_1, ")")
         };
     }
+    var varcharReg = /VARCHAR\(([^\(\)]+)\)/i;
+    if (varcharReg.test(type)) {
+        var match = varcharReg.exec(type);
+        var length_2 = match ? match[1] : 250;
+        return {
+            type: 'VarChar',
+            option: length_2,
+            codeType: 'string',
+            codeGetMethodType: 'GetString',
+            sqlType: "varchar(".concat(length_2, ")")
+        };
+    }
     var decimalReg = /Decimal\(([^\(\)]+)\)/i;
     if (decimalReg.test(type)) {
         var match = decimalReg.exec(type);
-        var length_2 = match ? match[1] : 250;
+        var length_3 = match ? match[1] : 250;
         return {
             type: 'Decimal',
-            option: length_2,
+            option: length_3,
             codeType: 'decimal',
             codeGetMethodType: 'GetDecimal',
-            sqlType: "decimal(".concat(length_2, ")")
+            sqlType: "decimal(".concat(length_3, ")")
         };
     }
     if (/DateTime/i.test(type)) {

package/dist/convert-table.js

@@ -8,13 +8,13 @@ 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_NAME = 'source_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_NAME = 'target_schema.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);

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "generate-dac",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "",
   "main": "index.js",
   "scripts": {
     "test": "jest",
     "start": "ts-node ./src/index.ts",
     "build": "tsc --skipLibCheck",
-    "test-build": "node ./dist/index.js"
+    "test-build": "node ./dist/index.js",
+    "schema:compare": "ts-node ./src/convert-table.ts"
   },
   "bin": {
     "generate-dac": "dist/index.js"
@@ -19,7 +20,6 @@
     "@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,9 +27,9 @@ export function binding_template(content: string, data: any){
   return result;
 }
 
-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';
+export type SqlDbTypeType = '' | 'Int' | 'TinyInt' | 'NVarChar' | 'DateTime' | 'Bit' | 'Money' | 'Decimal' | 'Date' | 'NText' | 'VarChar' | 'BigInt' | 'SmallInt';
+export type CSharpType = 'int' | 'string' | 'DateTime' | 'bool' | 'decimal' | 'long';
+export type CShareGetMethodType = '' | 'GetDateTime' | 'GetInt32' | 'GetBoolean' | 'GetString' | 'GetByte' | 'GetDecimal' | 'GetInt64' | 'GetInt16';
 
 
 export interface SqlDbType{
@@ -52,6 +52,24 @@ export function get_SqlDbType(type: string): SqlDbType{
     };
   }
 
+  if(type === 'bigint'){
+    return {
+      type: 'BigInt',
+      codeType: 'long',
+      codeGetMethodType: 'GetInt64',
+      sqlType: 'bigint'
+    };
+  }
+
+  if(type === 'smallint'){
+    return {
+      type: 'SmallInt',
+      codeType: 'int',
+      codeGetMethodType: 'GetInt16',
+      sqlType: 'smallint'
+    };
+  }
+
   if(type === 'date'){
     return {
       type: 'Date',
@@ -99,6 +117,19 @@ export function get_SqlDbType(type: string): SqlDbType{
     };
   }
 
+  const varcharReg = /VARCHAR\(([^\(\)]+)\)/i;
+  if(varcharReg.test(type)){
+    const match = varcharReg.exec(type);
+    const length = match ? match[1] : 250;
+    return {
+      type: 'VarChar',
+      option: length,
+      codeType: 'string',
+      codeGetMethodType: 'GetString',
+      sqlType: `varchar(${length})`
+    };
+  }
+
   const decimalReg = /Decimal\(([^\(\)]+)\)/i;
   if(decimalReg.test(type)){
     const match = decimalReg.exec(type);

package/src/convert-table.ts

@@ -4,12 +4,12 @@ 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 { createCanvas } from 'canvas';
 import { SQLTable } from './tables/sql-interface';
 
 colors.enable();
 
-const SOURCE_FILE_NAME = 'BCSDev_Schema.sql';
+const SOURCE_FILE_NAME = 'source_schema.sql';
 const SOURCE_FILE_PATH = `./input/${SOURCE_FILE_NAME}`;
 
 const sourceSchemaData = text_from_file(SOURCE_FILE_PATH);
@@ -17,7 +17,7 @@ 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_NAME = 'target_schema.sql';
 const TARGET_FILE_PATH = `./input/${TARGET_FILE_NAME}`;
 
 const targetSchemaData = text_from_file(TARGET_FILE_PATH);

package/templates/DAC_Template.generated.cs

@@ -119,46 +119,6 @@ namespace XHS.DataAccess
 			}
 
 		}
-        
-		public int Delete({Table_Name_Plural} obj{Table_Name_Plural})
-		{
-			int intRowsAffected = 0;
-
-			if (obj{Table_Name_Plural}.Collection.Length == 0)
-				return 0;
-
-			SqlTransaction dbTransaction = objDBConnection.BeginTransaction();
-
-			try
-			{
-				SqlCommand dbCommand = new SqlCommand();
-
-				dbCommand.Connection = objDBConnection;
-				dbCommand.CommandTimeout = 30;
-				dbCommand.CommandType = CommandType.StoredProcedure;
-				dbCommand.CommandText = "xhs_sp_del_{table_name_lower}";
-				dbCommand.Transaction = dbTransaction;
-
-				for (int i = 0; i < obj{Table_Name_Plural}.Collection.Length; i++)
-				{
-					dbCommand.Parameters.Clear();
-					
-					CreateParameter(dbCommand, "@ID", SqlDbType.Int, obj{Table_Name_Plural}.Collection[i].ID);
-
-					intRowsAffected += dbCommand.ExecuteNonQuery();
-				}
-
-				dbTransaction.Commit();
-				dbCommand.Dispose();
-				return intRowsAffected;
-			}
-
-			catch (Exception e)
-			{
-				dbTransaction.Rollback();
-				throw new ApplicationException("Error occurred during attempt to delete record into XHS {Table_Name} table and has been rolled-back.", e);
-			}
-		}
 			
 		protected void Fill(SqlDataReader objDataReader, ref {Table_Name} obj{Table_Name})
 		{
@@ -267,6 +227,47 @@ namespace XHS.DataAccess
 				throw new ApplicationException("Error occurred during attempt to read record from XHS {Table_Name} table.", e);
 			}
 
-		} 
+		}
+
+		public int SoftDelete({Table_Name_Plural} obj{Table_Name_Plural}, int userAccountID)
+		{
+			int intRowsAffected = 0;
+
+			if (obj{Table_Name_Plural}.Collection.Length == 0)
+				return 0;
+
+			SqlTransaction dbTransaction = objDBConnection.BeginTransaction();
+
+			try
+			{
+				SqlCommand dbCommand = new SqlCommand();
+
+				dbCommand.Connection = objDBConnection;
+				dbCommand.CommandTimeout = 30;
+				dbCommand.CommandType = CommandType.StoredProcedure;
+				dbCommand.CommandText = "xhs_sp_soft_del_{table_name_lower}";
+				dbCommand.Transaction = dbTransaction;
+
+				for (int i = 0; i < obj{Table_Name_Plural}.Collection.Length; i++)
+				{
+					dbCommand.Parameters.Clear();
+					
+					CreateParameter(dbCommand, "@ID", SqlDbType.Int, obj{Table_Name_Plural}.Collection[i].ID);
+					CreateParameter(dbCommand, "@UserAccountID", SqlDbType.Int, userAccountID);
+
+					intRowsAffected += dbCommand.ExecuteNonQuery();
+				}
+
+				dbTransaction.Commit();
+				dbCommand.Dispose();
+				return intRowsAffected;
+			}
+
+			catch (Exception e)
+			{
+				dbTransaction.Rollback();
+				throw new ApplicationException("Error occurred during attempt to soft delete record into XHS {Table_Name} table and has been rolled-back.", e);
+			}
+		}
   }
 }

package/templates/sp_stores_template_with_create_user.generated.sql

@@ -61,26 +61,6 @@ BEGIN
 END
 GO
 
-/****** Object:  StoredProcedure [dbo].[xhs_sp_del_{table_name_lower}]    Script Date: {datetime} ******/
-IF EXISTS (select * from dbo.sysobjects where id = object_id(N'[dbo].[xhs_sp_del_{table_name_lower}]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-  DROP PROCEDURE [dbo].[xhs_sp_del_{table_name_lower}]
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-CREATE PROCEDURE [dbo].[xhs_sp_del_{table_name_lower}]
-
-	@ID int
-
-AS
-
-	DELETE [dbo].[{table_name}]
-	WHERE
-		[ID] = @ID
-GO
-
 /****** Object:  StoredProcedure [dbo].[xhs_sp_get_{table_name_lower}_all]    Script Date: {datetime} ******/
 IF EXISTS (select * from dbo.sysobjects where id = object_id(N'[dbo].[xhs_sp_get_{table_name_lower}_all]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
 DROP PROCEDURE [dbo].[xhs_sp_get_{table_name_lower}_all]
@@ -128,5 +108,24 @@ AS
 		t1.[ID] = @ID
 GO
 
+/****** Object:  StoredProcedure [dbo].[xhs_sp_soft_del_{table_name_lower}]    Script Date: {datetime} ******/
+IF EXISTS (select * from dbo.sysobjects where id = object_id(N'[dbo].[xhs_sp_soft_del_{table_name_lower}]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+  DROP PROCEDURE [dbo].[xhs_sp_soft_del_{table_name_lower}]
+GO
 
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE PROCEDURE [dbo].[xhs_sp_soft_del_{table_name_lower}]
 
+	@ID int,
+	@UserAccountID int
+
+AS
+
+	UPDATE [dbo].[{table_name}]
+	SET Record_Status = 2, Update_DateTime = GETUTCDATE(), Update_User_Account_ID = @UserAccountID
+	WHERE
+		[ID] = @ID
+GO