dbeaver/pro#6284 read validate function from pref (#3643)

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
This commit is contained in:
Ruslan Musaev
2025-08-11 09:30:45 +02:00
committed by GitHub
co-authored by Daria Marutkina
parent 9ee4701fd0
commit 94e70f2d16
2 changed files with 6 additions and 5 deletions
@@ -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()
),
@@ -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
);