#12037 Initialize variable rules at the very end

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

@@ -117,7 +117,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) {
+        if (position == RulePosition.FINAL) {
             rules.add(new SQLVariableRule(this));
         }
     }

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

@@ -315,7 +315,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) {
+        if (position == RulePosition.FINAL) {
             rules.add(new SQLVariableRule(this));
         }
         if (position == RulePosition.KEYWORDS) {

plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLRuleManager.java

@@ -244,6 +244,10 @@ public class SQLRuleManager {
             }
         }
 
+        if (ruleProvider != null) {
+            ruleProvider.extendRules(dataSourceContainer, rules, TPRuleProvider.RulePosition.FINAL);
+        }
+
         allRules = rules.toArray(new TPRule[0]);
     }
 

plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/text/parser/TPRuleProvider.java

@@ -31,6 +31,7 @@ public interface TPRuleProvider {
     enum RulePosition {
         PARTITION,
         INITIAL,
+        FINAL,
         CONTROL,
         QUOTES,
         KEYWORDS