GIS #462: push commits before rebase with refactor

polypheny · Dec 25, 2023 · 0a4ee0e · 0a4ee0e
1 parent 942ea7c
commit 0a4ee0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java b/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
@@ -127,7 +127,7 @@ public class PolyphenyDb {
     public boolean daemonMode = false;
 
     @Option(name = { "-defaultStore" }, description = "Type of default storeId")
-    public String defaultStoreName = "postgresql";
+    public String defaultStoreName = "hsqldb";
 
     @Option(name = { "-defaultSource" }, description = "Type of default source")
     public String defaultSourceName = "csv";

diff --git a/plugins/cypher-language/src/main/codegen/CypherParser.jj b/plugins/cypher-language/src/main/codegen/CypherParser.jj
@@ -323,6 +323,7 @@ TOKEN [IGNORE_CASE] :
     | < FUNCTION: "FUNCTION" >
     | < FUNCTIONS: "FUNCTIONS" >
     | < GE: ">=" >
+    | < GEOMETRY: "GEOMETRY" >
     | < GRANT: "GRANT">
     | < GRAPH: "GRAPH" >
     | < GRAPHS: "GRAPHS" >
@@ -5419,6 +5420,7 @@ Token UnescapedSymbolicNameString() :
         | t=<FULLTEXT>
         | t=<FUNCTION>
         | t=<FUNCTIONS>
+        | t=<GEOMETRY>
         | t=<GRANT>
         | t=<GRAPH>
         | t=<GRAPHS>