Fix rendering logic for primary key (#240)

anz-bank · Oct 7, 2020 · 20fa66e · 20fa66e
1 parent 9b46729
commit 20fa66e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/internal/arrai/bindata.go b/internal/arrai/bindata.go
diff --git a/pkg/importer/avro/transformer_cli.arraiz b/pkg/importer/avro/transformer_cli.arraiz
diff --git a/pkg/importer/spanner/import_migrations.arraiz b/pkg/importer/spanner/import_migrations.arraiz
diff --git a/pkg/importer/spanner/import_spanner_sql.arraiz b/pkg/importer/spanner/import_spanner_sql.arraiz
diff --git a/pkg/importer/spanner/sysl.arrai b/pkg/importer/spanner/sysl.arrai
@@ -37,7 +37,7 @@ let attributePatterns = \entity \attr
             $`${k}="${v}"`,
         };
     let pk = cond {
-        (entity.primary_key where //seq.contains(attr.name, .@item)):
+        entity.primary_key where attr.name = //seq.split("(", .@item rank (:.@))(0):
             $`~pk${cond {sortingOrder(entity, attr):$`, ~${sortingOrder(entity, attr) ::}`}}`
     };
     let fk = cond { matchingFKs(entity, attr): '~fk' };

diff --git a/pkg/importer/spanner/tests/spanner.sql b/pkg/importer/spanner/tests/spanner.sql
@@ -33,6 +33,7 @@ CREATE INDEX InterleaveIndex ON Customer (AccountNum, CustomerID) INTERLEAVE IN
 
 CREATE TABLE CustomerHasAccount (
     CustomerID  STRING(36) NOT NULL,
+    Customer    STRING(36) NOT NULL,
     AccountNum  STRING(23) NOT NULL,
     LegalRole   STRING(10) NOT NULL,
     BranchID    STRING(6)  NOT NULL,

diff --git a/pkg/importer/spanner/tests/spanner.sysl b/pkg/importer/spanner/tests/spanner.sysl
@@ -31,6 +31,7 @@ customeraccounts [spanner_spec="1.0", package="com.example.package"]:
 
     !table CustomerHasAccount [primary_key="AccountNum(asc),CustomerID", foreign_keys=[["columns:CustomerID"],["constraint:FK_AccountNum","columns:AccountNum,BranchID"]]]:
         CustomerID <: Customer.CustomerID [~pk, ~fk]
+        Customer <: string(36)
         AccountNum <: Account.AccountNum [~pk, ~asc, ~fk]
         LegalRole <: string(10)
         BranchID <: Account.BSB [~fk]