From c1a79ec74e8fc001028447305f4a96b7dc3d83db Mon Sep 17 00:00:00 2001
From: Ainur Yagudin <ainur.yagudin@dbeaver-benua.local>
Date: Tue, 1 Mar 2022 09:48:15 +0300
Subject: [PATCH] CB-1708 add parseQuery function

---
 .../schema/service.sql.graphqls                     |  2 +-
 .../io/cloudbeaver/service/sql/DBWServiceSQL.java   |  2 +-
 .../cloudbeaver/service/sql/impl/WebServiceSQL.java |  1 +
 .../src/queries/sql-editor/parseSQLQuery.gql        | 13 -------------
 4 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 webapp/packages/core-sdk/src/queries/sql-editor/parseSQLQuery.gql

diff --git a/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
index d31d936ca4..3be9c7a141 100644
--- a/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
+++ b/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
@@ -243,7 +243,7 @@ extend type Query {
 
     sqlParseQuery(
         connectionId: ID!,
-        script: String!
+        script: String!,
         position: Int!
     ): SQLScriptQuery!
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java
index bf5571c09e..3149e06497 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java
@@ -132,5 +132,5 @@ public interface DBWServiceSQL extends DBWService {
     WebSQLScriptInfo parseSqlScript(@NotNull WebConnectionInfo connectionInfo, @NotNull String sqlScript) throws DBWebException;
 
     @WebAction
-    WebSQLQueryInfo parseSqlQuery(@NotNull WebConnectionInfo connectionInfo, @NotNull String sqlScript, int currentPosition) throws DBWebException;
+    WebSQLQueryInfo parseSqlQuery(@NotNull WebConnectionInfo connectionInfo, @NotNull String sqlScript, int cursorPosition) throws DBWebException;
 }
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 7e53592556..ae1cd4b978 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
@@ -438,6 +438,7 @@ public class WebServiceSQL implements DBWServiceSQL {
                 .collect(Collectors.toList());
         return new WebSQLScriptInfo(queriesInfo);
     }
+
     @Override
     public WebSQLQueryInfo parseSqlQuery(@NotNull WebConnectionInfo connectionInfo, @NotNull String sqlScript, int cursorPosition) throws DBWebException {
         SQLDialect dialect = getSqlDialectFromConnection(connectionInfo.getDataSourceContainer());
diff --git a/webapp/packages/core-sdk/src/queries/sql-editor/parseSQLQuery.gql b/webapp/packages/core-sdk/src/queries/sql-editor/parseSQLQuery.gql
deleted file mode 100644
index f7f103fdcd..0000000000
--- a/webapp/packages/core-sdk/src/queries/sql-editor/parseSQLQuery.gql
+++ /dev/null
@@ -1,13 +0,0 @@
-query parseSQLQuery(
-    $connectionId: ID!
-    $script: String!
-    $position: Int!
-) {
-    scriptInfo: sqlParseQuery(
-        connectionId: $connectionId
-        script: $script
-        position: $position
-    ) {
-        ...SQLQueryInfo
-    }
-}