deepfos 1.1.35__tar.gz → 1.1.36__tar.gz

{deepfos-1.1.35 → deepfos-1.1.36}/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.1.36] - 2024-06-05
+
+### 新增
+
+* 无
+
+### 变更
+
+* pg类数据表quote_char更新
+
+### 文档
+
+* 无
+
+
 ## [1.1.35] - 2024-05-28
 
 ### 变更

{deepfos-1.1.35 → deepfos-1.1.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.35
+Version: 1.1.36
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team

{deepfos-1.1.35 → deepfos-1.1.36}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-05-30T02:50:45+0000",
+ "date": "2024-06-13T03:28:47+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "15a16105c782ac73048953617059577fed00d93b",
- "version": "1.1.35"
+ "full-revisionid": "c5a5bf3e7fd0a5d6c8596d27d66fa32752792983",
+ "version": "1.1.36"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.35 → deepfos-1.1.36}/deepfos/db/deepmodel_kingbase.py

@@ -33,8 +33,6 @@ class SqlParser(BaseSqlParser):
 # -----------------------------------------------------------------------------
 # core
 class _AsyncDeepModelKingBaseClient(_AsyncKingBaseClient):
-    convertor = PostgreSQLConvertor(quote_char='')
-
     def __init__(self, version: Union[float, str] = None):  # noqa
         self.parser = SqlParser()
         self.connector = DeepModelKingBaseAPIConnector(version)

{deepfos-1.1.35 → deepfos-1.1.36}/deepfos/db/kingbase.py

@@ -33,8 +33,6 @@ class SqlParser(BaseSqlParser):
 # -----------------------------------------------------------------------------
 # core
 class _AsyncKingBaseClient(_AsyncPostgreSQLClient):
-    convertor = PostgreSQLConvertor(quote_char='"')
-
     def __init__(self, version: Union[float, str] = None):  # noqa
         self.parser = SqlParser()
         self.connector = KingBaseAPIConnector(version)

{deepfos-1.1.35 → deepfos-1.1.36}/deepfos/db/postgresql.py

@@ -77,7 +77,11 @@ class PostgreSQLConvertor(DataframeSQLConvertor):
         if updatecol is None:
             return f'INSERT INTO {self.quote_char}{tablename}{self.quote_char} ({columns}) VALUES {values}'
 
-        update_str = ','.join([f"{x}=EXCLUDED.{x}" for x in updatecol])
+        update_str = ','.join([
+            f"{self.quote_char}{x}{self.quote_char}="
+            f"EXCLUDED.{self.quote_char}{x}{self.quote_char}"
+            for x in updatecol
+        ])
         if not update_str:
             return f'INSERT INTO {self.quote_char}{tablename}{self.quote_char} ({columns}) VALUES {values}'
 
@@ -85,7 +89,10 @@ class PostgreSQLConvertor(DataframeSQLConvertor):
             raise ValueError('如需使用ON CONFLICT DO UPDATE语法，'
                              '需提供有唯一约束的列作为conflict_target列信息')
 
-        conflict_target_clause = ",".join(conflict_target)
+        conflict_target_clause = ",".join([
+            f"{self.quote_char}{x}{self.quote_char}"
+            for x in conflict_target
+        ])
 
         if conflict_target_clause:
             conflict_target_clause = f"({conflict_target_clause})"
@@ -99,7 +106,7 @@ class PostgreSQLConvertor(DataframeSQLConvertor):
 # -----------------------------------------------------------------------------
 # core
 class _AsyncPostgreSQLClient(_AbsAsyncMySQLClient):
-    convertor = PostgreSQLConvertor(quote_char='')
+    convertor = PostgreSQLConvertor(quote_char='"')
 
     def __init__(self, version: Union[float, str] = None):  # noqa
         self.parser = SqlParser()

{deepfos-1.1.35 → deepfos-1.1.36}/deepfos/element/datatable.py

@@ -2155,7 +2155,7 @@ class AsyncDataTablePostgreSQL(AsyncDataTableMySQL):
     __doc__ = DOC_TEMPLATE.format(DB='PostgreSQL')
     api: PostgreSQLAPI
     api_class = PostgreSQLAPI
-    quote_char = ''
+    quote_char = '"'
     convertor = _PostgreSQLDFConvertor(quote_char=quote_char)
     query = PostgreSQLQuery
 
@@ -2237,8 +2237,6 @@ class AsyncDataTableKingBase(AsyncDataTablePostgreSQL):
     __doc__ = DOC_TEMPLATE.format(DB='KingBase')
     api: KingBaseAPI
     api_class = KingBaseAPI
-    quote_char = '"'
-    convertor = _PostgreSQLDFConvertor(quote_char=quote_char)
 
 
 class DataTableKingBase(
@@ -2328,8 +2326,6 @@ class AsyncDataTableDeepModelKingBase(AsyncDataTableKingBase):
     __doc__ = DOC_TEMPLATE.format(DB='DeepModelKingBase')
     api: DeepModelKingBaseAPI
     api_class = DeepModelKingBaseAPI
-    quote_char = ''
-    convertor = _PostgreSQLDFConvertor(quote_char=quote_char)
 
 
 class DataTableDeepModelKingBase(

{deepfos-1.1.35 → deepfos-1.1.36}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.35
+Version: 1.1.36
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team