Merge pull request #33 from funktechno/f/lastlink

improved composite key pk lookup

Author: lastlink

README.md

@@ -93,7 +93,7 @@ const models = parser
           "TableName": "humanresources_employeedepartmenthistory",
           "ForeignKey": [],
           "IsForeignKey": false,
-          "IsPrimaryKey": false
+          "IsPrimaryKey": true
         },
         {
           "Name": "departmentid",
@@ -109,23 +109,23 @@ const models = parser
             }
           ],
           "IsForeignKey": true,
-          "IsPrimaryKey": false
+          "IsPrimaryKey": true
         },
         {
           "Name": "shiftid",
           "ColumnProperties": "int(2) NOT NULL",
           "TableName": "humanresources_employeedepartmenthistory",
           "ForeignKey": [],
           "IsForeignKey": false,
-          "IsPrimaryKey": false
+          "IsPrimaryKey": true
         },
         {
           "Name": "startdate",
           "ColumnProperties": "date NOT NULL",
           "TableName": "humanresources_employeedepartmenthistory",
           "ForeignKey": [],
           "IsForeignKey": false,
-          "IsPrimaryKey": false
+          "IsPrimaryKey": true
         },
         {
           "Name": "enddate",
@@ -170,7 +170,19 @@ const models = parser
     },
     {
       "PrimaryKeyTableName": "humanresources_employeedepartmenthistory",
-      "PrimaryKeyName": "businessentityid,departmentid,shiftid,startdate"
+      "PrimaryKeyName": "businessentityid"
+    },
+    {
+      "PrimaryKeyTableName": "humanresources_employeedepartmenthistory",
+      "PrimaryKeyName": "departmentid"
+    },
+    {
+      "PrimaryKeyTableName": "humanresources_employeedepartmenthistory",
+      "PrimaryKeyName": "shiftid"
+    },
+    {
+      "PrimaryKeyTableName": "humanresources_employeedepartmenthistory",
+      "PrimaryKeyName": "startdate"
     }
   ]
 }

src/index.ts

@@ -273,7 +273,7 @@ export class SqlSimpleParser {
             );
 
             //Add Primary Key to List
-            this.primaryKeyList.push(primaryKeyModel);
+            this.primaryKeyList = this.primaryKeyList.concat(primaryKeyModel);
           }
         } else {
           //Parse Primary Key
@@ -293,7 +293,7 @@ export class SqlSimpleParser {
               );
 
               //Add Primary Key to List
-              this.primaryKeyList.push(primaryKeyModel);
+              this.primaryKeyList = this.primaryKeyList.concat(primaryKeyModel);
             } else {
               // let start = i + 2;
               // let end = 0;
@@ -312,7 +312,7 @@ export class SqlSimpleParser {
                 );
 
                 //Add Primary Key to List
-                this.primaryKeyList.push(primaryKeyModel);
+                this.primaryKeyList = this.primaryKeyList.concat(primaryKeyModel);
               } else {
                 const startIndex = name.toLocaleLowerCase().indexOf("(");
                 const endIndex = name.indexOf(")") + 1;
@@ -343,7 +343,7 @@ export class SqlSimpleParser {
                 );
 
                 //Add Primary Key to List
-                this.primaryKeyList.push(primaryKeyModel);
+                this.primaryKeyList = this.primaryKeyList.concat(primaryKeyModel);
                 /*
               while (end === 0) {
                 let primaryKeyRow = lines[start].trim();
@@ -503,13 +503,22 @@ export class SqlSimpleParser {
   private CreatePrimaryKey(
     primaryKeyName: string,
     primaryKeyTableName: string
-  ) {
-    const primaryKey: PrimaryKeyModel = {
-      PrimaryKeyTableName: primaryKeyTableName,
-      PrimaryKeyName: this.RemoveNameQuantifiers(primaryKeyName),
-    };
+  ):PrimaryKeyModel[] {
+    const primaryKeyNames = this.RemoveNameQuantifiers(primaryKeyName)
+      .split(",")
+      .filter((n) => n)
+      // remove multiple spaces
+      .map((n) => n.replace(/\s+/g, " ").trim());
+    const primaryKeys:PrimaryKeyModel[] = [];
+    primaryKeyNames.forEach(name => {
+      const primaryKey: PrimaryKeyModel = {
+        PrimaryKeyTableName: primaryKeyTableName,
+        PrimaryKeyName: name,
+      };
+      primaryKeys.push(primaryKey);
+    });
 
-    return primaryKey;
+    return primaryKeys;
   }
 
   private CreateProperty(