Support ::date and ::uuid literals

Olivier Chédru · Olivier Chédru · commit 07371d6a38a0 · 2022-07-22T19:58:35.000+02:00
diff --git a/src/main/antlr4/org/dhatim/sql/lang/PSQLParser.g4 b/src/main/antlr4/org/dhatim/sql/lang/PSQLParser.g4
@@ -338,6 +338,7 @@ timestamp_literal
 
 date_literal
   : DATE date_string=Character_String_Literal
+  | date_string=Character_String_Literal CAST_EXPRESSION DATE
   ;
   
 interval_literal
@@ -350,6 +351,7 @@ boolean_literal
   
 uuid_literal
   : UUID uuid_string=Character_String_Literal
+  | uuid_string=Character_String_Literal CAST_EXPRESSION UUID
   ;
 
 /*
diff --git a/src/test/java/org/dhatim/sql/hamcrest/QueryMatchersTest.java b/src/test/java/org/dhatim/sql/hamcrest/QueryMatchersTest.java
@@ -72,11 +72,13 @@ public void testLike() {
     @Test
     public void testUUIDLiteral() {
         assertThat(sql("SELECT UUID 'c96ff414-8559-484c-bd43-c978130a5ee4'"), query(uuidLiteral("c96ff414-8559-484c-bd43-c978130a5ee4")));
+        assertThat(sql("SELECT 'c96ff414-8559-484c-bd43-c978130a5ee4'::uuid"), query(uuidLiteral("c96ff414-8559-484c-bd43-c978130a5ee4")));
     }
 
     @Test
     public void testDateLiteral() {
         assertThat(sql("SELECT DATE '2010-10-10'"), query(dateLiteral("2010-10-10")));
+        assertThat(sql("SELECT '2010-10-10'::date"), query(dateLiteral("2010-10-10")));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,7 @@ timestamp_literal`
`338`	`338`
`339`	`339`	`date_literal`
`340`	`340`	`: DATE date_string=Character_String_Literal`
	`341`	`+ \| date_string=Character_String_Literal CAST_EXPRESSION DATE`
`341`	`342`	`;`
`342`	`343`
`343`	`344`	`interval_literal`
`@@ -350,6 +351,7 @@ boolean_literal`
`350`	`351`
`351`	`352`	`uuid_literal`
`352`	`353`	`: UUID uuid_string=Character_String_Literal`
	`354`	`+ \| uuid_string=Character_String_Literal CAST_EXPRESSION UUID`
`353`	`355`	`;`
`354`	`356`
`355`	`357`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,13 @@ public void testLike() {`
`72`	`72`	`@Test`
`73`	`73`	`public void testUUIDLiteral() {`
`74`	`74`	`assertThat(sql("SELECT UUID 'c96ff414-8559-484c-bd43-c978130a5ee4'"), query(uuidLiteral("c96ff414-8559-484c-bd43-c978130a5ee4")));`
	`75`	`+ assertThat(sql("SELECT 'c96ff414-8559-484c-bd43-c978130a5ee4'::uuid"), query(uuidLiteral("c96ff414-8559-484c-bd43-c978130a5ee4")));`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`@Test`
`78`	`79`	`public void testDateLiteral() {`
`79`	`80`	`assertThat(sql("SELECT DATE '2010-10-10'"), query(dateLiteral("2010-10-10")));`
	`81`	`+ assertThat(sql("SELECT '2010-10-10'::date"), query(dateLiteral("2010-10-10")));`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`@Test`