fixed graph aggregation syntax

polypheny · Dec 22, 2023 · 835e754 · 835e754
1 parent 706f2aa
commit 835e754
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,7 +56,6 @@ allprojects {
     java {
         toolchain {
             languageVersion = JavaLanguageVersion.of(17)
-            vendor = JvmVendorSpec.ADOPTIUM
         }
     }
 

diff --git a/plugins/cypher-language/src/main/codegen/CypherParser.jj b/plugins/cypher-language/src/main/codegen/CypherParser.jj
@@ -1764,7 +1764,10 @@ CypherClause MatchClause() :
     CypherWhere where = null;
 }
 {
-    ( optionalT=<OPTIONAL> { optional = true; } )? t=<MATCH> ("(*)" {fullScan = true;} | patterns=PatternList() hints=Hints()) ( where=WhereClause() )?
+    ( optionalT=<OPTIONAL> { optional = true; } )? t=<MATCH> (
+    LOOKAHEAD( 3 ) <LPAREN> <TIMES> <RPAREN> {fullScan = true;} |
+    ( patterns=PatternList() hints=Hints() ))
+    ( where=WhereClause() )?
     {
         return CypherFactory.createMatch( pos( optionalT != null ? optionalT : t ), optional, patterns, pos( t.next ), hints, where, fullScan );
     }

diff --git a/settings.gradle b/settings.gradle
@@ -65,9 +65,3 @@ include 'plugins:excel-adapter'
 // other plugins
 include 'plugins:notebooks'
 
-// disabled adapter plugins
-//include 'plugins:pig-adapter'
-//include 'plugins:html-adapter'
-//include 'plugins:druid-adapter'
-//include 'plugins:elasticsearch-adapter'
-//include 'plugins:geode-adapter'
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,6 @@ allprojects { @@
         java {
             toolchain {
                 languageVersion = JavaLanguageVersion.of(17)
-                vendor = JvmVendorSpec.ADOPTIUM
             }
         }
@@ Expand Down @@