feat: add support for inline PRIMARY KEYs

Author: nielm

src/main/java/com/google/cloud/solutions/spannerddl/parser/ASTcolumn_def.java

@@ -81,6 +81,9 @@ public String toString() {
             getGenerationClause(),
             getColumnDefaultClause(),
             (isHidden() ? "HIDDEN" : null),
+            AstTreeUtils.getOptionalChildByType(children, ASTprimary_key.class) == null
+                ? null
+                : "PRIMARY KEY",
             getOptionsClause());
   }
 

src/main/java/com/google/cloud/solutions/spannerddl/parser/ASTcreate_table_statement.java

@@ -80,9 +80,6 @@ public synchronized ASTprimary_key getPrimaryKey() {
     //  nothing (no primary keys)
     ASTprimary_key primary_key =
         AstTreeUtils.getOptionalChildByType(children, ASTprimary_key.class);
-    if (primary_key == null) {
-      throw new UnsupportedOperationException("not implemented");
-    }
     return primary_key;
   }
 
@@ -136,7 +133,8 @@ public String toStringOptionalExistClause(boolean includeExists) {
                     (withConstraints
                         ? getOptionalChildByType(children, ASTrow_deletion_policy_clause.class)
                         : null),
-                    getOptions()));
+                    getOptions()))
+        .trim();
   }
 
   public ASToptions_clause getOptions() {

src/main/java/com/google/cloud/solutions/spannerddl/parser/ASTprimary_key.java

@@ -18,6 +18,7 @@
 
 import com.google.cloud.solutions.spannerddl.diff.AstTreeUtils;
 import com.google.common.base.Joiner;
+import java.util.List;
 
 /** Abstract Syntax Tree parser object for "primary_Key" token */
 public class ASTprimary_key extends SimpleNode {
@@ -32,8 +33,11 @@ public ASTprimary_key(DdlParser p, int id) {
 
   @Override
   public String toString() {
-    return "PRIMARY KEY ("
-        + Joiner.on(", ").join(AstTreeUtils.getChildrenAssertType(children, ASTkey_part.class))
-        + ")";
+    List<ASTkey_part> keyparts = AstTreeUtils.getChildrenAssertType(children, ASTkey_part.class);
+    if (keyparts.size() > 0) {
+      return "PRIMARY KEY (" + Joiner.on(", ").join(keyparts) + ")";
+    } else {
+      return "PRIMARY KEY";
+    }
   }
 }

src/test/java/com/google/cloud/solutions/spannerddl/parser/DDLParsertValidateDdlFromFileTest.java

@@ -43,11 +43,10 @@ public void validateDDL() {
       DdlParser parser = new DdlParser(in);
       parser.ddl_statement();
       ASTddl_statement parsedStatement = (ASTddl_statement) parser.jjtree.rootNode();
-
       assertWithMessage("Mismatch for section %s:", segmentName)
           .that(parsedStatement.toString())
           .isEqualTo(ddlStatement);
-    } catch (Throwable e) {
+    } catch (ParseException | UnsupportedOperationException | IllegalArgumentException e) {
       System.err.println("Exception in section " + segmentName);
       e.printStackTrace(System.err);
       assertWithMessage(

src/test/resources/ddlParserUnsupported.txt

@@ -222,20 +222,6 @@ CREATE TABLE test1 (
   value STRING(MAX) NOT NULL PLACEMENT KEY
 ) PRIMARY KEY (keycol ASC)
 
-== Test 27 create table inline primary key
-
-CREATE TABLE test1 (
-  keycol INT64 NOT NULL PRIMARY KEY,
-  value INT64 PLACEMENT KEY
-)
-
-== Test 28 create table optional primary key
-
-CREATE TABLE test1 (
-  keycol INT64,
-  value INT64 DEFAULT (keycol * 100 + PI ( ))
-)
-
 == Test 30 create table column on update clause
 
 CREATE TABLE test1 (

src/test/resources/ddlParserValidation.txt

@@ -207,4 +207,12 @@ CREATE TABLE test1 (
 
 CREATE INDEX myIndex ON mytable ( key ASC, index ASC ) STORING ( table ) , INTERLEAVE IN parent_table OPTIONS (some_option='enabled')
 
+== Test 22 create table inline primary key
+
+CREATE TABLE test1 ( keycol INT64 NOT NULL PRIMARY KEY, value INT64 )
+
+== Test 23 create table optional primary key
+
+CREATE TABLE test1 ( keycol INT64, value INT64 )
+
 ==