generate-dac 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generate-dac",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/DAC_Utils.ts

@@ -314,7 +314,8 @@ export function dac_generate_dataServiceObject(tableName: string, schemas: Colum
   const classTemplate = text_from_file(`${TEMPLATE_DIR}/templates/DataServiceObjects_Class_Template.cs`);
 
   const strProperties = schemas.map((e, i) => {
-    return `public ${get_SqlDbType(e.type).codeType} ${e.col_name.replace(/[ _]+/g, '')} { get; set; }`;
+    // Use enum if enum is defined
+    return `public ${e.enum || get_SqlDbType(e.type).codeType} ${e.col_name.replace(/[ _]+/g, '')} { get; set; }`;
   }).join('\n' + repeat("\t", 2));
 
   let created_by_user = '';
@@ -374,7 +375,7 @@ export function dac_generate_conversions(tableName: string, schemas: ColumnSchem
   const methodTemplate = text_from_file(`${TEMPLATE_DIR}/templates/MakeDSO_Template_Method.cs`);
 
   const dsoFields = schemas.map((e, i) => {
-    return `ds${className}.${e.colName} = db${className}.${e.col_name};`;
+    return `ds${className}.${e.colName} =${e.enum ? `(${e.enum})` : ''} db${className}.${e.col_name};`;
   }).join('\n' + repeat("\t", 3));
 
   const dbFields = schemas.map((e, i) => {
@@ -387,7 +388,7 @@ export function dac_generate_conversions(tableName: string, schemas: ColumnSchem
       return `db${className}.${e.col_name} = DateTimeHelper.MakeDBDefaultValue(ds${className}.${e.colName});`;
     }
 
-    return `db${className}.${e.col_name} = ds${className}.${e.colName};`;
+    return `db${className}.${e.col_name} = ds${className}.${e.colName}${e.enum ? `.GetHashCode()` : ''};`;
   }).join('\n' + repeat("\t", 3));
 
   let created_by_user = '';
@@ -709,10 +710,9 @@ export function DAC_Generate_From_XLSX(filePath: string, sheetIndex: number = 0)
       content: schemas.join("\n\n\n")
     });
 
-    const content = `
-${dropConstrains.join("\n")}
+    const content = `${dropConstrains.filter(e => e).join("\nGO\n")}
     
-${dropTables.join("\n")}`;
+${dropTables.join("\nGO\n")}`;
 
     files.push({
       name: 'table_schema_reset.sql',

package/src/interface.ts

@@ -7,5 +7,6 @@ export interface ColumnSchema {
   allow_null: 'yes' | 'no',
   foreign_table?: string,
   foreign_column?: string,
-  primary_key?: 'yes' | 'no'
+  primary_key?: 'yes' | 'no',
+  enum?: string,
 }