From c806e3253606e9dac5aaf6b8fa1733bb427fa86d Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Thu, 1 Oct 2020 18:05:01 +0300
Subject: [PATCH] CB-290 Data format resultset

---
 .../src/io/cloudbeaver/service/sql/WebDataFormat.java           | 2 +-
 .../src/io/cloudbeaver/service/sql/WebSQLQueryResults.java      | 2 +-
 .../src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebDataFormat.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebDataFormat.java
index 616b5a4255..bea65d4416 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebDataFormat.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebDataFormat.java
@@ -20,7 +20,7 @@ package io.cloudbeaver.service.sql;
  * Web data format
  */
 public enum WebDataFormat {
-    table,
+    resultset,
     document,
     timeseries
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResults.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResults.java
index 3a33a27142..53882235c5 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResults.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResults.java
@@ -43,7 +43,7 @@ public class WebSQLQueryResults {
 
     WebSQLQueryResults(@NotNull WebSession webSession, @Nullable WebDataFormat dataFormat) {
         this.webSession = webSession;
-        this.dataFormat = dataFormat == null ? WebDataFormat.table : dataFormat;
+        this.dataFormat = dataFormat == null ? WebDataFormat.resultset : dataFormat;
     }
 
     @Property
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java
index 7ddc8deee1..de78a8421e 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java
@@ -116,7 +116,7 @@ public class WebServiceBindingSQL extends WebServiceBindingBase<DBWServiceSQL> {
 
     private WebDataFormat getDataFormat(DataFetchingEnvironment env) {
         String dataFormat = env.getArgument("dataFormat");
-        return CommonUtils.valueOf(WebDataFormat.class, dataFormat, WebDataFormat.table);
+        return CommonUtils.valueOf(WebDataFormat.class, dataFormat, WebDataFormat.resultset);
     }
 
     public static WebSQLConfiguration getSQLConfiguration(WebSession webSession) {