Merge pull request #638 from dbeaver/feature/CB-1214

CB-1214 use parsed sql query to determinate end query index
This commit is contained in:
Serge Rider
2022-01-27 16:07:04 +03:00
committed by GitHub
@@ -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<SQLScriptElement> queries = SQLScriptParser.parseScript(dataSource, sqlScript);
List<WebSQLQueryInfo> 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);
}