WIP #122 support CQL comments

cql-ast/src/main/scala/troy/cql/ast/Statements.scala

@@ -75,4 +75,4 @@ final case class CreateType(
   ifNotExists: Boolean,
   typeName: TypeName,
   fields: Seq[Field]
-) extends DataDefinition
+) extends DataDefinition

cql-parser/src/main/scala/troy/cql/parser/CqlParser.scala

@@ -74,11 +74,14 @@ object CqlParser extends JavaTokenParsers
 
     str | blob | uuid | floats | int | boolean | nullConst
   }
+
+  // Ignores comments
+  protected override val whiteSpace = """(\s|//.*|--.*|(?m)/\*(\*(?!/)|[^*])*\*/)+""".r
+
   def identifier: Parser[Identifier] = "[a-zA-Z0-9_]+".r.filter(k => !Keywords.contains(k.toUpperCase))
 
   def optionInstruction: Parser[OptionInstruction] = {
     def identifierOption = identifier ~ ("=".i ~> identifier) ^^^^ IdentifierOption
-
     def constantOption = identifier ~ ("=".i ~> constant) ^^^^ ConstantOption
     def mapLiteralOption = identifier ~ ("=".i ~> mapLiteral) ^^^^ MapLiteralOption
 

cql-parser/src/test/scala/troy/cql/parser/ddl/CreateTableParserTest.scala

@@ -115,7 +115,11 @@ class CreateTableParserTest extends FlatSpec with Matchers {
           user_age int static,
           user_weight float,
           user_gender smallint,
-          user_ip inet
+          user_ip inet,
+          user_time time,
+          user_status boolean,
+          user_balance double,
+          user_trans_id bigint
         );
       """
     )
@@ -126,7 +130,39 @@ class CreateTableParserTest extends FlatSpec with Matchers {
       Table.Column("user_age", DataType.Int, true, false),
       Table.Column("user_weight", DataType.Float, false, false),
       Table.Column("user_gender", DataType.Smallint, false, false),
-      Table.Column("user_ip", DataType.Inet, false, false)
+      Table.Column("user_ip", DataType.Inet, false, false),
+      Table.Column("user_time", DataType.Time, false, false),
+      Table.Column("user_status", DataType.Boolean, false, false),
+      Table.Column("user_balance", DataType.Double, false, false),
+      Table.Column("user_trans_id", DataType.BigInt, false, false)
+    )
+    statement.primaryKey.isEmpty shouldBe true // Primary is defined inline instead
+    statement.options.isEmpty shouldBe true
+  }
+
+  it should "parse multi-fields create table with comments" in {
+    val statement = parseSchemaAs[CreateTable](
+      """
+         /*
+          Test
+          multiline
+          comments
+         */
+
+        CREATE TABLE test.users (
+          user_id text PRIMARY KEY,   -- Singleline dash comment
+          user_name text static,
+          user_age int static,
+          user_weight float          // Singleline slash comment
+        );
+      """
+    )
+    statement.ifNotExists shouldBe false
+    statement.columns shouldBe Seq(
+      Table.Column("user_id", DataType.Text, false, true),
+      Table.Column("user_name", DataType.Text, true, false),
+      Table.Column("user_age", DataType.Int, true, false),
+      Table.Column("user_weight", DataType.Float, false, false)
     )
     statement.primaryKey.isEmpty shouldBe true // Primary is defined inline instead
     statement.options.isEmpty shouldBe true

cql-parser/src/test/scala/troy/cql/parser/dml/SelectStatementParserTest.scala

@@ -96,6 +96,34 @@ class SelectStatementParserTest extends FlatSpec with Matchers {
     selection.items(1).as.isEmpty shouldBe true
   }
 
+  it should "parse simple select statements with order by ASC" in {
+    val statement = parseQuery("SELECT name, occupation FROM test.users ORDER BY name ASC;").asInstanceOf[SelectStatement]
+    statement.from.keyspace.get.name shouldBe "test"
+    statement.from.table shouldBe "users"
+    statement.mod.isEmpty shouldBe true
+    statement.where.isEmpty shouldBe true
+    statement.orderBy.isDefined shouldBe true
+    statement.orderBy.get.orderings.size shouldBe 1
+
+    val orderings = statement.orderBy.get.orderings(0)
+    orderings.columnName.name shouldBe "name"
+    orderings.direction.isDefined shouldBe true
+    orderings.direction.get shouldBe OrderBy.Ascending
+
+    statement.perPartitionLimit.isEmpty shouldBe true
+    statement.limit.isEmpty shouldBe true
+    statement.allowFiltering shouldBe false
+
+    val selection = statement.selection.asInstanceOf[Select.SelectClause]
+    selection.items.size shouldBe 2
+
+    selection.items(0).selector shouldBe Select.ColumnName("name")
+    selection.items(0).as.isEmpty shouldBe true
+
+    selection.items(1).selector shouldBe Select.ColumnName("occupation")
+    selection.items(1).as.isEmpty shouldBe true
+  }
+
   it should "parse simple select statements with JSON" in {
     val statement = parseQuery("SELECT JSON name, occupation FROM users;").asInstanceOf[SelectStatement]
     statement.from.table shouldBe "users"

troy-schema/src/test/resources/test.cql

@@ -1,7 +1,13 @@
+/*
+This is
+Multiline
+Comments test
+*/
+
 CREATE KEYSPACE test WITH replication = {'class': 'SimpleStrategy' , 'replication_factor': '1'};
 
 CREATE TABLE test.posts (
-  author_id uuid,
+  author_id uuid, // Single line comment test with slash
   post_id uuid,
   author_name text static,
   post_title text,
@@ -12,7 +18,7 @@ CREATE TABLE test.post_details (
   author_id uuid,
   id uuid,
   rating int,
-  title text,
+  title text, -- Single line comment test with dash
   someField text,
   tags set<text>,
   comment_ids set<int>,