buildz 0.7.5__tar.gz → 0.7.6__tar.gz

{buildz-0.7.5/buildz.egg-info → buildz-0.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.7.5
+Version: 0.7.6
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.7.5 → buildz-0.7.6}/buildz/db/dv/basez.py

@@ -85,6 +85,8 @@ class SimpleDv(ItDv):
         self.as_map = as_map
         self.init(*argv, **maps)
     def begin(self):
+        if self.con is not None:
+            return
         self.con = self.new_con()
         self.cursor = self.new_cursor()
     def open(self):
@@ -122,7 +124,7 @@ class SimpleDv(ItDv):
         if commit:
             self.cursor.execute("commit;")
         return tmp
-    def iou_sql(self, table, ks, vs, sets):
+    def iou_sql(self, table, ks, vs, sets, qs):
         sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
         return sql
     def insert_or_update(self, maps, table, keys = None, update_keys = None):
@@ -162,7 +164,7 @@ class SimpleDv(ItDv):
         sets = ",".join(sets)
         ks = ",".join([kv[0] for kv in kvs])
         vs = ",".join([str(kv[1]) for kv in kvs])
-        sql = self.iou_sql(table, ks, vs, sets)
+        sql = self.iou_sql(table, ks, vs, sets, keys)
         #sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
         return self.execute(sql)
         if update:

{buildz-0.7.5 → buildz-0.7.6}/buildz/db/dv/orm.py

@@ -60,7 +60,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
                     key:
                         table: 表名
                         query_keys: 默认null，orm做插入/更新时，判断数据是插入还是更新的查询方式
-                        auto_translate: 默认true，如果没有配置“转py后字段名”，是否自动转(a_b=>aB)
+                        auto_translate: 默认false，如果没有配置“转py后字段名”，是否自动转(a_b=>aB)
                         sql_before: 新增一条建表前sql语句
                         sql_after: 新增一条建表后sql语句
                         sql_delete_before: 新增一条删表前sql语句
@@ -78,7 +78,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
     elif type(data) == dict:
         data = dict2list(data)
     conf = {}
-    xf.s(conf, sql_before = [], sql_after = [], sql_delete_before=[], sql_delete_after=[],auto_translate=True,table=table,keys=[],py2sqls={},query_keys=None, data_keys = data_keys, vars=[], py_name = py_name)
+    xf.s(conf, sql_before = [], sql_after = [], sql_delete_before=[], sql_delete_after=[],auto_translate=False,table=table,keys=[],py2sqls={},query_keys=None, data_keys = data_keys, vars=[], py_name = py_name)
     for it in data:
         if len(it)==1 and type(it[0]) in (list, tuple):
             deal_item(it[0], conf)
@@ -99,7 +99,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
     sqls_del = sqls[2]+[sql_del]+sqls[3]
     sqls = [sqls_crt, sqls_del]
     sqls = [(";\n".join(k)+";").replace(";;",";") for k in sqls]
-    obj = TableObject(*xf.g(conf, keys=[], table=table, py2sqls = None, query_keys=None,auto_translate=True), sql_create = sqls[0], sql_delete = sqls[1], py_name = py_name)
+    obj = TableObject(*xf.g(conf, keys=[], table=table, py2sqls = None, query_keys=None,auto_translate=False), sql_create = sqls[0], sql_delete = sqls[1], py_name = py_name)
     return sqls, obj
 
 pass
@@ -119,7 +119,7 @@ class TableObject(Base):
         auto_translate:
             对于没有在py2sqls自定义映射的表字段，是否自动转换(py|autoTran<=>auto_tran|sql)
     """
-    def init(self, keys, table=None, py2sqls=None, query_keys=None, auto_translate=True, dv = None, sql_create=None, sql_delete=None, py_name = None):
+    def init(self, keys, table=None, py2sqls=None, query_keys=None, auto_translate=False, dv = None, sql_create=None, sql_delete=None, py_name = None):
         self.src_py2sqls = py2sqls
         if table is None:
             table = tls.lower(self.__class__.__name__)
@@ -148,7 +148,7 @@ class TableObject(Base):
             query_keys = []
         self.query_keys = query_keys
         self.dv = dv
-        self.py2sql=self.toSql
+        self.py2sql=self.to_sql
         self.sql2py = self.toPy
         self.sql_create = sql_create
         self.sql_delete = sql_delete
@@ -160,7 +160,7 @@ class TableObject(Base):
         #print(f"[TESTZ] sql_create: {self.sql_create}")
         dv = self.rdv(dv)
         dv.executes(self.sql_create)
-    def delete(self, dv=None):
+    def drop(self, dv=None):
         assert self.sql_delete is not None
         if self.sql_delete.find("<table>")>=0:
             print(f"[WARN] not delete template table by {self.sql_delete}")
@@ -168,7 +168,7 @@ class TableObject(Base):
         self.rdv(dv).execute(self.sql_delete)
     def bind(self, dv):
         self.dv = dv
-    def toSql(self, obj):
+    def to_sql(self, obj):
         if type(obj)!=dict:
             tmp = {}
             for k in self.py2sqls:
@@ -177,7 +177,7 @@ class TableObject(Base):
             obj = tmp
         obj = {self.py2sqls[k]:v for k,v in obj.items() if k in self.py2sqls}
         return obj
-    def toSqlKeys(self, keys):
+    def to_sql_keys(self, keys):
         obj = [k for k in keys if k in self.py2sqls]
         return obj
     def toPy(self, obj):
@@ -200,10 +200,10 @@ class TableObject(Base):
         if sql2py:
             rst = [self.sql2py(it) for it in rst]
         return rst
-    def queryAll(self, dv=None, sql2py=True):
+    def query_all(self, dv=None, sql2py=True):
         sql = f"select * from {self.table};"
         return self.query(sql, dv, sql2py)
-    def filterSql(self, obj):
+    def filter_sql(self, obj):
         if type(obj)!=dict:
             tmp = {}
             for k in self.sql2py:
@@ -219,11 +219,11 @@ class TableObject(Base):
         if type(obj) not in [list, tuple]:
             obj = [obj]
         if py2sql:
-            obj = [self.toSql(k) for k in obj]
+            obj = [self.to_sql(k) for k in obj]
             if update_keys is not None:
-                update_keys = self.toSqlKeys(update_keys)#[self.toSqlKeys(k) for k in update_keys]
+                update_keys = self.to_sql_keys(update_keys)#[self.to_sql_keys(k) for k in update_keys]
         else:
-            obj = [self.filterSql(k) for k in obj]
+            obj = [self.filter_sql(k) for k in obj]
         query_keys = self.query_keys
         if not check:
             query_keys = None

{buildz-0.7.5 → buildz-0.7.6}/buildz/db/dv/sqlite3z.py

@@ -90,8 +90,8 @@ class Db(SimpleDv):
             rst = rst[1:]
             rst = [{k:v for k,v in zip(keys, dt)} for dt in rst]
         return rst
-    def iou_sql(self, table, ks, vs, sets):
-        sql = f"insert into {table}({ks}) values({vs}) ON CONFLICT DO UPDATE SET {sets}"
+    def iou_sql(self, table, ks, vs, sets, qs):
+        sql = f"insert into {table}({ks}) values({vs}) ON CONFLICT({','.join(qs)}) DO UPDATE SET {sets}"
         return sql
     def insert_or_updatexxx(self, maps, table, keys = None, update_keys = None):
         if type(maps)!=dict:

{buildz-0.7.5 → buildz-0.7.6}/buildz/xf/cpp/pcxf.pyx

@@ -54,6 +54,13 @@ cdef object fCreate(int type, void* dt, int ival)noexcept:
         return Args(list(),dict())
     return None
 pass
+def fetchArgs(val):
+    if type(val)==Args:
+        if val.size()==len(val.lists):
+            val = val.lists
+        elif val.size()==len(val.dicts):
+            val = val.dicts
+    return val
 cdef void fListAdd(object lst, object data)noexcept:
     #print("fListAdd:", lst, data)
     lst.append(data)
@@ -61,6 +68,7 @@ cdef void fListAddx(object lst, object data)noexcept:
     #print("fListAdd:", lst, data)
     if type(lst)==Args:
         lst = lst.args
+    data = fetchArgs(data)
     lst.append(data)
 cdef void fMapSet(object map, object key, object val)noexcept:
     #print("fMapSet:", map, key, val)
@@ -71,6 +79,8 @@ cdef void fMapSetx(object map, object key, object val)noexcept:
     #print("fMapSet:", map, key, val)
     if type(map)==Args:
         map = map.maps
+    key = fetchArgs(key)
+    val = fetchArgs(val)
     if type(key)==list:
         key = tuple(key)
     map[key]=val

{buildz-0.7.5 → buildz-0.7.6/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.7.5
+Version: 0.7.6
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.7.5 → buildz-0.7.6}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.7.5',
+    version = '0.7.6',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',