dbeaver#16847 remove data transfer fetch size hack for MariaDB (dbeav…

…er#17662)
anvaya-solanki · Sep 19, 2022 · 556fc99 · 556fc99
1 parent ab2b99c
commit 556fc99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...ns/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java b/...ns/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
@@ -647,7 +647,7 @@ public DBCQueryTransformer createQueryTransformer(@NotNull DBCQueryTransformType
         if (type == DBCQueryTransformType.RESULT_SET_LIMIT) {
             return new QueryTransformerLimit();
         } else if (type == DBCQueryTransformType.FETCH_ALL_TABLE) {
-            return new QueryTransformerFetchAll();
+            return new QueryTransformerFetchAll(this);
         }
         return super.createQueryTransformer(type);
     }

diff --git a/...iss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/QueryTransformerFetchAll.java b/...iss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/QueryTransformerFetchAll.java
@@ -29,6 +29,12 @@
 */
 class QueryTransformerFetchAll implements DBCQueryTransformer {
 
+    final MySQLDataSource dataSource;
+
+    QueryTransformerFetchAll(MySQLDataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
     @Override
     public void setParameters(Object... parameters)
     {
@@ -43,7 +49,9 @@ public String transformQueryString(SQLQuery query) throws DBCException {
     public void transformStatement(DBCStatement statement, int parameterIndex) throws DBCException {
         // Set fetch size to Integer.MIN_VALUE to enable result set streaming
         try {
-            ((Statement)statement).setFetchSize(Integer.MIN_VALUE);
+            if (!dataSource.isMariaDB()) {
+                ((Statement) statement).setFetchSize(Integer.MIN_VALUE);
+            }
         } catch (SQLException e) {
             throw new DBCException(e, statement.getSession().getExecutionContext());
         }