fix: $ must be escaped in future Cypher versions.

neo4j · Dec 12, 2024 · cdf8b41 · cdf8b41
1 parent fd0db21
commit cdf8b41
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 41 deletions.
diff --git a/neo4j-cypher-dsl-parser/src/main/java/module-info.java b/neo4j-cypher-dsl-parser/src/main/java/module-info.java
diff --git a/neo4j-cypher-dsl-parser/src/main/java/org/neo4j/cypherdsl/parser/CypherDslASTFactory.java b/neo4j-cypher-dsl-parser/src/main/java/org/neo4j/cypherdsl/parser/CypherDslASTFactory.java
@@ -1059,7 +1059,6 @@ public Statement showAliases(InputPosition p, DatabaseName aliasName, Clause yie
 
 	@Override
 	public void addDeprecatedIdentifierUnicodeNotification(InputPosition p, Character character, String identifier) {
-		throw new UnsupportedOperationException();
 	}
 
 	@Override

diff --git a/...j-cypher-dsl-parser/src/test/java/org/neo4j/cypherdsl/parser/CypherDslASTFactoryTest.java b/...j-cypher-dsl-parser/src/test/java/org/neo4j/cypherdsl/parser/CypherDslASTFactoryTest.java
@@ -104,7 +104,7 @@ class HandleNewMethods {
 		@ParameterizedTest
 		@ValueSource(strings = { "showAliases", "createLocalDatabaseAlias", "createRemoteDatabaseAlias",
 			"alterLocalDatabaseAlias", "alterRemoteDatabaseAlias", "fixedPathQuantifier",
-			"useGraph", "setOwnPassword", "addDeprecatedIdentifierUnicodeNotification",
+			"useGraph", "setOwnPassword",
 			"showAllPrivileges", "showRolePrivileges", "showUserPrivileges", "createDatabase",
 			"createCompositeDatabase", "dropDatabase",
 			"showDatabase", "startDatabase", "stopDatabase", "createUser", "dropUser", "alterUser", "renameUser",

diff --git a/neo4j-cypher-dsl-parser/src/test/java/org/neo4j/cypherdsl/parser/CypherParserTest.java b/neo4j-cypher-dsl-parser/src/test/java/org/neo4j/cypherdsl/parser/CypherParserTest.java
@@ -838,4 +838,9 @@ void optionalSubquery() {
 				CypherParser.parse("MATCH (n) OPTIONAL CALL() {MATCH (m)}"))
 			.withMessage("Cannot render optional subquery clause");
 	}
+
+	@Test
+	void unescapedThings() {
+		assertThat(CypherParser.parse("RETURN 1 AS v$_id").getCypher()).isEqualTo("RETURN 1 AS `v$_id`");
+	}
 }
diff --git a/...chema-name-support/src/main/java/org/neo4j/cypherdsl/support/schema_name/SchemaNames.java b/...chema-name-support/src/main/java/org/neo4j/cypherdsl/support/schema_name/SchemaNames.java
@@ -239,15 +239,16 @@ private static boolean isIdentifier(CharSequence name) {
 
 		String id = name.toString();
 		int cp = id.codePointAt(0);
-		if (!Character.isJavaIdentifierStart(cp)) {
+		if (!Character.isJavaIdentifierStart(cp) || '$' == cp) {
 			return false;
 		}
 		for (int i = Character.charCount(cp); i < id.length(); i += Character.charCount(cp)) {
 			cp = id.codePointAt(i);
-			if (!Character.isJavaIdentifierPart(cp)) {
+			if (!Character.isJavaIdentifierPart(cp) || '$' == cp) {
 				return false;
 			}
 		}
+
 		return true;
 	}