Implement remaining functionality (#1)

surrealdb · Sep 16, 2024 · 782bbc2 · 782bbc2
1 parent 7288b02
commit 782bbc2
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/packages/lezer-surrealql/src/surrealql.grammar b/packages/lezer-surrealql/src/surrealql.grammar
@@ -246,6 +246,7 @@ defineUserOptions {
 	OnRootNsDbClause
 	( ( password | passhash ) String )
 	( roles commaSep<Ident> )
+	DurationClause?
 }
 
 // Alter statement
@@ -350,8 +351,7 @@ InsertStatement {
 	insert
 	ignore?
 	relation?
-	into
-	Ident
+	(into Ident)?
 	(
 		Object |
 		( "[" commaSep<Object> "]" ) |
@@ -361,10 +361,12 @@ InsertStatement {
 			commaSep<(
 				"(" commaSep<value> ")"
 			)>
-			on duplicate key update
-			commaSep<FieldAssignment>
 		)
 	)
+	(
+		on duplicate key update
+		commaSep<FieldAssignment>
+	)?
 }
 
 IfElseStatement {
@@ -610,7 +612,7 @@ ObjectProperty {
 }
 
 ObjectContent {
-	commaSep<ObjectProperty>
+	commaSepTrailing<ObjectProperty>
 }
 
 Object {
@@ -1011,8 +1013,12 @@ CommentClause {
 	String
 }
 
+DurationValue {
+	(for token Duration) | (for session Duration)
+}
+
 DurationClause {
-	duration ( for token Duration ) ","? ( for session Duration )
+	duration commaSep<DurationValue>
 }
 
 TokenTypeClause {
@@ -1226,6 +1232,10 @@ commaSep<content> {
 	content ("," content)*
 }
 
+commaSepTrailing<content> {
+	content ("," content)* ","?
+}
+
 piped<content> {
 	content ("|" content)*
 }