#12037 Use dialect to validate identifier

plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANASQLDialect.java

@@ -118,7 +118,7 @@ public class HANASQLDialect extends GenericSQLDialect implements TPRuleProvider
     @Override
     public void extendRules(@Nullable DBPDataSourceContainer dataSource, @NotNull List<TPRule> rules, @NotNull RulePosition position) {
         if (position == RulePosition.INITIAL) {
-            rules.add(new SQLVariableRule());
+            rules.add(new SQLVariableRule(this));
         }
     }
 }

plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDialect.java

@@ -306,7 +306,7 @@ public class SQLServerDialect extends JDBCSQLDialect implements TPRuleProvider {
     @Override
     public void extendRules(@Nullable DBPDataSourceContainer dataSource, @NotNull List<TPRule> rules, @NotNull RulePosition position) {
         if (position == RulePosition.INITIAL) {
-            rules.add(new SQLVariableRule());
+            rules.add(new SQLVariableRule(this));
         }
         if (position == RulePosition.KEYWORDS) {
             final TPTokenDefault keywordToken = new TPTokenDefault(SQLTokenType.T_KEYWORD);

plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/rules/SQLVariableRule.java

@@ -16,6 +16,8 @@
  */
 package org.jkiss.dbeaver.model.sql.parser.rules;
 
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.sql.SQLDialect;
 import org.jkiss.dbeaver.model.sql.parser.tokens.SQLVariableToken;
 import org.jkiss.dbeaver.model.text.parser.TPCharacterScanner;
 import org.jkiss.dbeaver.model.text.parser.TPPredicateRule;
@@ -27,7 +29,13 @@ import org.jkiss.dbeaver.model.text.parser.TPTokenAbstract;
  */
 public class SQLVariableRule implements TPPredicateRule {
 
-    private final TPToken token = new SQLVariableToken();
+    private final SQLDialect dialect;
+    private final TPToken token;
+
+    public SQLVariableRule(@NotNull SQLDialect dialect) {
+        this.dialect = dialect;
+        this.token = new SQLVariableToken();
+    }
 
     @Override
     public TPToken getSuccessToken() {
@@ -41,7 +49,7 @@ public class SQLVariableRule implements TPPredicateRule {
         int ch = scanner.read();
         int read = 0;
 
-        if (!Character.isJavaIdentifierPart(ch)) {
+        if (!dialect.validIdentifierPart((char) ch, false)) {
             ch = scanner.read();
             read++;
 
@@ -49,7 +57,7 @@ public class SQLVariableRule implements TPPredicateRule {
                 do {
                     ch = scanner.read();
                     read++;
-                } while (Character.isJavaIdentifierPart(ch));
+                } while (dialect.validIdentifierPart((char) ch, false));
 
                 if (read > 2) {
                     scanner.unread();