From 835e754bfc92ab79e5d735ee81fbe5573406a326 Mon Sep 17 00:00:00 2001
From: datomo <dave.lengw@gmail.com>
Date: Fri, 22 Dec 2023 09:08:03 +0100
Subject: [PATCH] fixed graph aggregation syntax

---
 build.gradle                                             | 1 -
 plugins/cypher-language/src/main/codegen/CypherParser.jj | 5 ++++-
 settings.gradle                                          | 6 ------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 306b615f4a..176312441e 100644
--- 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
index b8f4517ac4..8b0c671a94 100644
--- 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
index ba0026ba49..fe70c58714 100644
--- 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'