Use more precise source for primary key field

4 files changed, 5 insertions, 8 deletions

diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedTableDefinitionNodeMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedTableDefinitionNodeMatcher.java
index 6f8bdfc..d2b55d2 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedTableDefinitionNodeMatcher.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedTableDefinitionNodeMatcher.java
@@ -42,7 +42,7 @@ public final class UntypedTableDefinitionNodeMatcher implements org.zwobble.prec
         return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTableDefinitionNodeMatcher(submatchers);
     }
 
-    public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTableDefinitionNodeMatcher withPrimaryKey(org.zwobble.precisely.Matcher<? super String> primaryKey) {
+    public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTableDefinitionNodeMatcher withPrimaryKey(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeLevelReferenceNode> primaryKey) {
         var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTableDefinitionNode>>(this.submatchers);
         submatchers.add(org.zwobble.precisely.Matchers.has("primaryKey", org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTableDefinitionNode::primaryKey, (org.zwobble.precisely.Matcher) primaryKey));
         return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTableDefinitionNodeMatcher(submatchers);
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTableDefinitionTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTableDefinitionTests.java
index 3c3b259..cb1e1cb 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTableDefinitionTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/parser/ParserTableDefinitionTests.java
@@ -25,7 +25,7 @@ public class ParserTableDefinitionTests {
         assertThat(node, isUntypedTableDefinitionNode()
             .withName(equalTo("posts"))
             .withRowType(isUntypedTypeLevelReferenceNode().withName(equalTo("Post")))
-            .withPrimaryKey(equalTo("id"))
+            .withPrimaryKey(isUntypedTypeLevelReferenceNode().withName(equalTo("id")))
         );
     }
 }
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerDatabaseSchemaDefinitionTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerDatabaseSchemaDefinitionTests.java
index daecb54..63ed810 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerDatabaseSchemaDefinitionTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerDatabaseSchemaDefinitionTests.java
@@ -27,9 +27,8 @@ public class TypeCheckerDatabaseSchemaDefinitionTests {
                 .withName("authors")
                 .withRowType(UntypedTypeLevelReferenceNode.arbitrary()
                     .withName("Author")
-                    .build()
                 )
-                .withPrimaryKey("id")
+                .withPrimaryKey(UntypedTypeLevelReferenceNode.arbitrary().withName("id"))
                 .build()
             )
             .build();
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerTableDefinitionTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerTableDefinitionTests.java
index 0dd911b..9dbee97 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerTableDefinitionTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerTableDefinitionTests.java
@@ -26,9 +26,8 @@ public class TypeCheckerTableDefinitionTests {
             .withName("authors")
             .withRowType(UntypedTypeLevelReferenceNode.arbitrary()
                 .withName("Author")
-                .build()
             )
-            .withPrimaryKey("id")
+            .withPrimaryKey(UntypedTypeLevelReferenceNode.arbitrary().withName("id"))
             .build();
         var globalContext = TypeCheckerContextArb.globalContext();
         var namespaceContext = globalContext.enterNamespace(NamespaceName.of("App"));
@@ -85,9 +84,8 @@ public class TypeCheckerTableDefinitionTests {
             .withName("authors")
             .withRowType(UntypedTypeLevelReferenceNode.arbitrary()
                 .withName("Author")
-                .build()
             )
-            .withPrimaryKey("id")
+            .withPrimaryKey(UntypedTypeLevelReferenceNode.arbitrary().withName("id"))
             .build();
         var globalContext = TypeCheckerContextArb.globalContext();
         var namespaceContext = globalContext.enterNamespace(NamespaceName.of("App"));