From bb9cac82803a55f0996f72d60739363d71ef0b32 Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Thu, 27 Jan 2022 15:59:23 +0300 Subject: [PATCH] CB-1214 use parsed sql query to determinate end query index --- .../src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 d397e7fd98..616cfca666 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 @@ -35,7 +35,10 @@ import org.jkiss.dbeaver.model.exec.DBCLogicalOperator; import org.jkiss.dbeaver.model.exec.DBExecUtils; import org.jkiss.dbeaver.model.navigator.DBNNode; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.model.sql.*; +import org.jkiss.dbeaver.model.sql.SQLDialect; +import org.jkiss.dbeaver.model.sql.SQLQuery; +import org.jkiss.dbeaver.model.sql.SQLScriptElement; +import org.jkiss.dbeaver.model.sql.SQLUtils; import org.jkiss.dbeaver.model.sql.completion.SQLCompletionAnalyzer; import org.jkiss.dbeaver.model.sql.completion.SQLCompletionProposalBase; import org.jkiss.dbeaver.model.sql.completion.SQLCompletionRequest; @@ -407,7 +410,7 @@ public class WebServiceSQL implements DBWServiceSQL { } List queries = SQLScriptParser.parseScript(dataSource, sqlScript); List queriesInfo = queries.stream() - .map(query -> new WebSQLQueryInfo(query.getOffset(), query.getLength() + query.getOffset())) + .map(query -> new WebSQLQueryInfo(query.getOffset(), query.getOffset() + query.getText().length())) .collect(Collectors.toList()); return new WebSQLScriptInfo(queriesInfo); }