diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLCompletionContextScriptParser.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLCompletionContextScriptParser.java index c8731f118b..0fa553a5fe 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLCompletionContextScriptParser.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLCompletionContextScriptParser.java @@ -17,9 +17,10 @@ package io.cloudbeaver.service.sql; +import io.cloudbeaver.model.session.WebSession; import org.eclipse.jface.text.Document; import org.jkiss.code.NotNull; -import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; +import org.jkiss.dbeaver.model.sql.SQLModelPreferences; import org.jkiss.dbeaver.model.sql.completion.SQLCompletionRequest; import org.jkiss.dbeaver.model.sql.parser.SQLParserContext; import org.jkiss.dbeaver.model.sql.parser.SQLScriptParser; @@ -33,7 +34,7 @@ public class WebSQLCompletionContextScriptParser { @NotNull public static SQLQueryCompletionContext obtainCompletionContext( - DBRProgressMonitor monitor, + WebSession webSession, @NotNull String query, int position, SQLCompletionRequest request @@ -56,10 +57,10 @@ public class WebSQLCompletionContextScriptParser { for (var item : scriptItems) { var model = SQLQueryModelRecognizer.recognizeQuery( new SQLQueryRecognitionContext( - monitor, + webSession.getProgressMonitor(), request.getContext().getExecutionContext(), true, - false, + webSession.getUserPreferenceStore().getBoolean(SQLModelPreferences.VALIDATE_FUNCTIONS), request.getContext().getSyntaxManager(), request.getContext().getDataSource().getSQLDialect() ), diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java index 207b1438da..1bd77903d2 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java @@ -175,7 +175,7 @@ public class WebServiceSQL implements DBWServiceSQL { if (!useDefaultCompletionEngine) { SQLQueryCompletionAnalyzer analyzer = new SQLQueryCompletionAnalyzer( m -> WebSQLCompletionContextScriptParser.obtainCompletionContext( - webSession.getProgressMonitor(), query, position, request), + webSession, query, position, request), request, request::getDocumentOffset );