handle different primary key

Author: lastlink

examples/adventureworks_mssql.sql

@@ -3,6 +3,18 @@
 */
 USE [AdventureWorksLT2019]
 GO
+/****** Object:  Table [dbo].[ErrorLog]    Script Date: 10/7/2022 9:47:21 PM ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE Persons (
+    Personid int IDENTITY(1,1) PRIMARY KEY,
+    LastName varchar(255) NOT NULL,
+    FirstName varchar(255),
+    Age int
+);
+GO
 /****** Object:  Table [dbo].[BuildVersion]    Script Date: 10/7/2022 9:47:21 PM ******/
 SET ANSI_NULLS ON
 GO

src/index.ts

@@ -180,8 +180,9 @@ export class SqlSimpleParser {
         }
 
         //Verify if this is a property that doesn't have a relationship (One minute of silence for the property)
+        // TODO: make primary key check a regex match/ contains w/ () space or not
         var normalProperty =
-          propertyType.indexOf(Primary_Key) == -1 &&
+          !propertyType.match(/PRIMARY KEY\s?\(/gi) &&
           propertyType.indexOf(Foreign_Key) == -1 &&
           propertyType.indexOf(CONSTRAINT_Primary_Key) == -1 &&
           propertyType.indexOf(CONSTRAINT_Foreign_Key) == -1;
@@ -255,33 +256,26 @@ export class SqlSimpleParser {
 
           //Add Property to table
           currentTableModel.Properties.push(propertyModel);
-        }
-
-        //Parse Primary Key
-        if (
-          propertyType.indexOf(Primary_Key) != -1 ||
-          propertyType.indexOf(CONSTRAINT_Primary_Key) != -1
-        ) {
-          if (!this.MODE_SQLSERVER) {
-            var primaryKey = name
-              .replace(/PRIMARY KEY\s?\(/gi, "")
-              .replace(")", "");
 
+          if (
+            ExtendedProperties.toLocaleLowerCase().indexOf(Primary_Key) > -1
+          ) {
             //Create Primary Key
             var primaryKeyModel = this.CreatePrimaryKey(
-              primaryKey,
+              name,
               currentTableModel.Name
             );
 
             //Add Primary Key to List
             this.primaryKeyList.push(primaryKeyModel);
-          } else {
-            // var start = i + 2;
-            // var end = 0;
-            if (
-              propertyRow.indexOf(Primary_Key) !== -1 &&
-              nameSkipCheck.indexOf("CLUSTERED") === -1
-            ) {
+          }
+        } else {
+          //Parse Primary Key
+          if (
+            propertyType.indexOf(Primary_Key) != -1 ||
+            propertyType.indexOf(CONSTRAINT_Primary_Key) != -1
+          ) {
+            if (!this.MODE_SQLSERVER) {
               var primaryKey = name
                 .replace(/PRIMARY KEY\s?\(/gi, "")
                 .replace(")", "");
@@ -295,38 +289,56 @@ export class SqlSimpleParser {
               //Add Primary Key to List
               this.primaryKeyList.push(primaryKeyModel);
             } else {
-              var startIndex =
-                name.toLocaleLowerCase().indexOf("(");
-              var endIndex = name.indexOf(")") + 1;
-              var primaryKey = name
-                .substring(startIndex, endIndex)
-                .replace("(", "")
-                .replace(")", "")
-                .replace(/ASC/gi, "")
-                .trim();
-
-              const columnQuantifiers = this.GetColumnQuantifiers();
-              //Get delimiter of column name
-              var firstSpaceIndex =
-                primaryKey[0] == columnQuantifiers.Start &&
-                primaryKey.indexOf(columnQuantifiers.End + " ") !== -1
-                  ? primaryKey.indexOf(columnQuantifiers.End + " ")
-                  : primaryKey.indexOf(" ");
-
-              var primaryKeyRow =
-                firstSpaceIndex == -1
-                  ? primaryKey
-                  : primaryKey.substring(firstSpaceIndex + 1).trim();
+              // var start = i + 2;
+              // var end = 0;
+              if (
+                propertyRow.indexOf(Primary_Key) !== -1 &&
+                nameSkipCheck.indexOf("CLUSTERED") === -1
+              ) {
+                var primaryKey = name
+                  .replace(/PRIMARY KEY\s?\(/gi, "")
+                  .replace(")", "");
 
-              //Create Primary Key
-              var primaryKeyModel = this.CreatePrimaryKey(
-                primaryKeyRow,
-                currentTableModel.Name
-              );
+                //Create Primary Key
+                var primaryKeyModel = this.CreatePrimaryKey(
+                  primaryKey,
+                  currentTableModel.Name
+                );
 
-              //Add Primary Key to List
-              this.primaryKeyList.push(primaryKeyModel);
-              /*
+                //Add Primary Key to List
+                this.primaryKeyList.push(primaryKeyModel);
+              } else {
+                var startIndex = name.toLocaleLowerCase().indexOf("(");
+                var endIndex = name.indexOf(")") + 1;
+                var primaryKey = name
+                  .substring(startIndex, endIndex)
+                  .replace("(", "")
+                  .replace(")", "")
+                  .replace(/ASC/gi, "")
+                  .trim();
+
+                const columnQuantifiers = this.GetColumnQuantifiers();
+                //Get delimiter of column name
+                var firstSpaceIndex =
+                  primaryKey[0] == columnQuantifiers.Start &&
+                  primaryKey.indexOf(columnQuantifiers.End + " ") !== -1
+                    ? primaryKey.indexOf(columnQuantifiers.End + " ")
+                    : primaryKey.indexOf(" ");
+
+                var primaryKeyRow =
+                  firstSpaceIndex == -1
+                    ? primaryKey
+                    : primaryKey.substring(firstSpaceIndex + 1).trim();
+
+                //Create Primary Key
+                var primaryKeyModel = this.CreatePrimaryKey(
+                  primaryKeyRow,
+                  currentTableModel.Name
+                );
+
+                //Add Primary Key to List
+                this.primaryKeyList.push(primaryKeyModel);
+                /*
               while (end === 0) {
                 var primaryKeyRow = lines[start].trim();
 
@@ -352,6 +364,7 @@ export class SqlSimpleParser {
                 this.primaryKeyList.push(primaryKeyModel);
               }
               */
+              }
             }
           }
         }

tests/examples_models.spec.ts

@@ -65,4 +65,25 @@ describe("Example Sql Parsing", () => {
     await runSample();
     expect(1).toBeTruthy();
   });
+  it("Run Parser postgres Ex", async () => {
+    const filePath = "examples/adventureworks_mssql.sql";
+    async function runSample() {
+      // load sql
+      var sql = await fs.readFileSync(filePath, "utf8");
+      console.log(sql);
+
+      // run parser
+      const parser = new SqlSimpleParser('sqlserver')
+
+      // get models
+      const models = parser
+        .feed(sql)
+        .ToModel();
+
+      // write to json file
+      await fs.writeFileSync("output-mssql.json", JSON.stringify(models, null, '\t'));
+    }
+    await runSample();
+    expect(1).toBeTruthy();
+  });
 });