Fix #134

xzkostyan · Jul 26, 2021 · 2cc7c49 · 2cc7c49
1 parent 14958fb
commit 2cc7c49
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/clickhouse_sqlalchemy/drivers/http/base.py b/clickhouse_sqlalchemy/drivers/http/base.py
@@ -1,5 +1,7 @@
 
 import sqlalchemy as sa
+
+from .utils import FORMAT_SUFFIX
 from ...util.compat import string_types
 from ..base import ClickHouseDialect, ClickHouseExecutionContextBase
 from . import connector
@@ -8,8 +10,6 @@
 # Export connector version
 VERSION = (0, 0, 2, None)
 
-FORMAT_SUFFIX = 'FORMAT TabSeparatedWithNamesAndTypes'
-
 
 class ClickHouseExecutionContext(ClickHouseExecutionContextBase):
     def pre_exec(self):

diff --git a/clickhouse_sqlalchemy/drivers/http/connector.py b/clickhouse_sqlalchemy/drivers/http/connector.py
@@ -2,6 +2,7 @@
 
 from .escaper import Escaper
 from .transport import RequestsTransport
+from .utils import FORMAT_SUFFIX
 
 # PEP 249 module globals
 apilevel = '2.0'
@@ -109,7 +110,7 @@ def execute(self, operation, parameters=None, context=None):
 
         raw_sql_big = raw_sql.upper()
         if 'FORMAT' not in raw_sql_big and 'INSERT' not in raw_sql_big:
-            raw_sql += ' FORMAT TabSeparatedWithNamesAndTypes'
+            raw_sql += ' ' + FORMAT_SUFFIX
 
         self._reset_state()
         self._begin_query()

diff --git a/clickhouse_sqlalchemy/drivers/http/utils.py b/clickhouse_sqlalchemy/drivers/http/utils.py
@@ -1,6 +1,9 @@
 import codecs
 
 
+FORMAT_SUFFIX = 'FORMAT TabSeparatedWithNamesAndTypes'
+
+
 def unescape(value, errors=None):
     if errors is None:
         errors = 'replace'

diff --git a/tests/testcase.py b/tests/testcase.py
@@ -6,7 +6,8 @@
 from sqlalchemy.orm import Query
 
 from tests.config import database, host, port, http_port, user, password
-from tests.session import http_session, native_session, system_native_session, http_engine, native_engine
+from tests.session import http_session, native_session, \
+    system_native_session, http_engine
 from tests.util import skip_by_server_version
 
 
@@ -96,12 +97,14 @@ class HttpSessionTestCase(BaseTestCase):
     port = http_port
     session = http_session
 
+
 class HttpEngineTestCase(BaseTestCase):
     """ Explicitly HTTP-based session Test Case """
 
     port = http_port
     engine = http_engine
 
+
 class NativeSessionTestCase(BaseTestCase):
     """ Explicitly Native-protocol-based session Test Case """