add a test file and add new type for ClickhouseTableNode parameter with dict input can also go through init process

Author: sn0wfree

ClickSQL/clickhouse/ClickHouse.py

@@ -17,7 +17,7 @@
 available_queries_select = ('select', 'show', 'desc')
 available_queries_insert = ('insert', 'optimize', 'create')
 
-SEMAPHORE = 10
+SEMAPHORE = 10  # control async number for whole query list
 
 from ClickSQL.conf.parse_rfc_1738_args import _parse_rfc1738_args
 
@@ -114,7 +114,7 @@ def __init__(self, **db_settings):
         self._test_connection_()
 
     @staticmethod
-    def _check_db_settings(db_settings: dict, available_db_type=[node.__name__]):
+    def _check_db_settings(db_settings: dict, available_db_type=[node.__name__]): # node.__name__ : clickhouse
         """
         it is to check db setting whether is correct!
         :param db_settings:
@@ -176,7 +176,7 @@ async def _post(self, url, sql, session):
                 result = await resp.read()
 
         status = resp.status
-        reason = resp.reason
+        # reason = resp.reason
         if status != 200:
             raise ValueError(result)
         return result
@@ -292,19 +292,24 @@ def execute(self, *sql, convert_to: str = 'dataframe', loop=None, ):
                                       to_df=to_df)
         return result
 
-    def query(self, sql: str):
+    def query(self, *sql: str):
         """
         require to upgrade
         :param sql:
         :return:
         """
-        result = self.execute(sql, convert_to='dataframe', loop=None, )
+        result = self.execute(*sql, convert_to='dataframe', loop=None, )
         return result
 
 
 class ClickHouseTableNode(ClickHouseBaseNode):
-    def __init__(self, conn_str: str):
-        db_settings = _parse_rfc1738_args(conn_str)
+    def __init__(self, conn_str: (str, dict)):
+        if isinstance(conn_str, str):
+            db_settings = _parse_rfc1738_args(conn_str)
+        elif isinstance(conn_str, dict):
+            db_settings = conn_str
+        else:
+            raise ParameterTypeError(f'conn_str must be str or dict but get: {type(conn_str)}')
         super(ClickHouseTableNode, self).__init__(**db_settings)
 
     @property

setup.py

@@ -34,7 +34,7 @@ def read_file(filename):
                       'numpy>=1.18.5',
                       'requests>=2.20.0',
                       'aiohttp>=3.6.2',
-                      'nest-asyncio>-1.4.1'
+                      'nest-asyncio>=1.4.1'
                       ],
 
 )

test/test_connection.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 import unittest
 
 from ClickSQL.clickhouse.ClickHouse import ClickHouseTableNode
@@ -6,12 +7,11 @@
 
 
 class MyTestConnectionCase(unittest.TestCase):
-    def test_connection_success(self):
-        conn = "clickhouse://default:Imsn0wfree@47.104.186.157:8123/system"
-        node = ClickHouseTableNode(conn)
-        df1 = node.tables
-
-        self.assertGreater(len(df1), 5)
+    # def test_connection_success(self):
+    #     node = ClickHouseTableNode(conn)
+    #     df1 = node.tables
+    #
+    #     self.assertGreater(len(df1), 5)
 
     def test_connection_settings_failure_empty(self):
         conn = ""

test/testing.py

@@ -1,11 +1,8 @@
 # coding=utf-8
-import pandas as pd
-import numpy as np
-
-
+import unittest
+from ClickSQL import ClickHouseTableNode
 
 if __name__ == '__main__':
+    print(ClickHouseTableNode)
 
     pass
-
-