buildz 0.6.34__tar.gz → 0.6.36__tar.gz

{buildz-0.6.34/buildz.egg-info → buildz-0.6.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.34
+Version: 0.6.36
 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
@@ -34,6 +34,8 @@ License-File: LICENSE
 运行python -m buildz查看帮助
 
 持续更新中。。。
+2024/12/22:
+增加pathz模块，方便处理路径，修改ioc和db
 2024/12/18:
 增加数据映射xz，数据库db增加类似orm功能以及表和索引结构查询功能（目前只写了mysql,oracle,sqlite3的查询），配置文件读写xf的输出增加对ListMap的支持(dumpx, dumpxf)
 2024/11/11:

{buildz-0.6.34 → buildz-0.6.36}/README.md

@@ -21,6 +21,8 @@
 运行python -m buildz查看帮助
 
 持续更新中。。。
+2024/12/22:
+增加pathz模块，方便处理路径，修改ioc和db
 2024/12/18:
 增加数据映射xz，数据库db增加类似orm功能以及表和索引结构查询功能（目前只写了mysql,oracle,sqlite3的查询），配置文件读写xf的输出增加对ListMap的支持(dumpx, dumpxf)
 2024/11/11:

buildz-0.6.36/buildz/auto/__init__.py

@@ -0,0 +1,7 @@
+from .run import Run
+
+def imports():
+    from . import deal, deal_type, factory, cache, log, config, dbs
+    from . import verify, save, request, defs, deal_list
+
+pass

buildz-0.6.36/buildz/cachez/__init__.py

@@ -0,0 +1,8 @@
+#
+
+from .cache import *
+
+def imports():
+    pass
+
+pass

buildz-0.6.36/buildz/cachez/cache.py

@@ -0,0 +1,199 @@
+#
+
+from .. import xf, fz
+from .. import ioc
+from ..base import Base
+from ..ioc import wrap
+from .. import logz
+ns = wrap.ns("buildz.cache")
+import os,re
+
+
+@ns.obj(id="cache.save")
+@ns.obj_args("ref, cache.file", "ref, log")
+class Save(Base):
+    def init(self, cache, log, fkey = "cache.save", fp = None):
+        self.fkey = fkey
+        self.cache = cache
+        self.log = log.tag("Cache.Save")
+        self.fp = fp
+    def save(self):
+        fp = self.fp
+        if fp is None:
+            self.log.warn(f"cache not save cause 'cache.save' is None")
+            return False
+        fz.makefdir(fp)
+        rst  = self.cache.data
+        rs = xf.dumps(rst, format=True).encode("utf-8")
+        fz.write(rs, fp, 'wb')
+        return True
+    def call(self, maps, fp):
+        fp = xf.get(maps, self.fkey, None)
+        fp = self.cache.rfp(fp)
+        self.fp = fp
+        return self.save()
+
+pass
+class CacheKey(Base):
+    def init(self, cache, key):
+        self.cache = cache
+        self.key = key
+    def has(self):
+        return self.cache.has(self.key)
+    def set(self, val):
+        return self.cache.set(self.key, val)
+    def get(self):
+        return self.cache.get(self.key)
+    def call(self, *args):
+        if len(args)==0:
+            return self.get()
+        elif len(args)==1:
+            return self.set(args[0])
+        else:
+            assert 0
+@ns.obj(id="cache.file")
+@ns.obj_args("ref, fps, cache.js","ref, log, null", "ref, rfp.current.first, false", "ref, split, .", "ref, key.currents, buildz.cache.path.currents", "ref, key.basedir, buildz.cache.path.basedir", "ref, save.index, 0", "ref, save.auto, false")
+class Cache(Base):
+    def bind(self, key):
+        return CacheKey(self, key)
+    def has(self, key):
+        ks = key.split(self.spt)
+        return xf.has(self.data, ks)
+    def get(self, key):
+        ks = key.split(self.spt)
+        return xf.gets(self.data, ks)
+    def set(self, key, val):
+        xf.sets(self.data, key.split(self.spt), val)
+        if self.auto_save:
+            self.save()
+    def remove(self, key):
+        xf.removes(self.data, key.split(self.spt))
+    def init(self, fps="cache.js", log=None, current_first=False, spt = ".", key_currents = "buildz.cache.path.currents", key_basedir = "buildz.cache.path.basedir", save_index = 0, auto_save = False):
+        if type(fps) not in (tuple, list):
+            fps = [fps]
+        self.fps = fps
+        self.spt = spt
+        self.current_first = current_first
+        self.log = logz.make(log)(self)
+        self.key_currents = key_currents
+        self.key_basedir = key_basedir
+        self.save_index = save_index
+        self.data = {}
+        self.auto_save = auto_save
+    def set_currents(self, dp):
+        if type(dp)!=list:
+            dp = [dp]
+        self.set(self.key_currents, dp)
+    def add_currents(self, dp):
+        dps = self.get_currents()
+        if dps is None:
+            dps = []
+        if dp in dps:
+            return
+        dps.append(dp)
+        self.set_currents(dps)
+    def get_currents(self):
+        dps = self.get(self.key_currents)
+        if dps is None:
+            dps = []
+        if type(dps)!=list:
+            dps = [dps]
+        return dps
+    def set_basedir(self, dp):
+        self.set(self.key_basedir, dp)
+    def get_basedir(self):
+        return self.get(self.key_basedir)
+    def rfp(self, fp):
+        if fz.is_abs(fp):
+            return fp
+        dps = [None,"."]
+        cfps = self.get_currents()
+        if cfps is not None:
+            if self.current_first:
+                dps = cfps+dps
+            else:
+                dps = dps+cfps
+        basedir = self.get_basedir()
+        if basedir is not None:
+            dps = [basedir]+dps
+        for dp in dps:
+            _fp = fp
+            if dp is not None:
+                _fp = os.path.join(dp, fp)
+            if os.path.isfile(_fp):
+                return _fp
+        if basedir is not None:
+            fp = os.path.join(basedir, fp)
+        return fp
+    def save(self, fp = None):
+        if fp is None:
+            fp = self.fps[self.save_index]
+        fp = self.rfp(fp)
+        fz.makefdir(fp)
+        rst  = self.data
+        rs = xf.dumps(rst, format=True).encode("utf-8")
+        fz.write(rs, fp, 'wb')
+    def load(self, fps = None):
+        if fps is None:
+            fps = self.fps
+        data = {}
+        for fp in fps:
+            fp = self.rfp(fp)
+            if os.path.isfile(fp):
+                self.log.info(f"load cache from {fp}")
+                xdata = xf.flush_maps(xf.loadf(fp),visit_list=True)
+                xf.fill(xdata, data, replace=1)
+        xf.fill(data, self.data, replace=0)
+
+pass
+
+@ns.obj(id="cache.mem")
+@ns.obj_args("ref, log, null")
+class Mem(Cache):
+    def init(self, log=None):
+        super().init(None, log)
+
+pass
+@ns.obj(id="cache")
+@ns.obj_args("ref, cache.file", "ref, cache.mem")
+class Caches(Base):
+    def init(self, cache, mem):
+        self.cache = cache
+        self.mem = mem
+        self.caches = [cache, mem]
+        self.set = cache.set
+        self.remove = cache.remove
+        self.call=cache.call
+        self.rfp = cache.rfp
+        self.get_currents = cache.get_currents
+        self.add_currents = cache.add_currents
+        self.set_currents = cache.set_currents
+        self.set_basedir = cache.set_basedir
+        self.get_basedir = cache.get_basedir
+        self.has_file = cache.has
+        self.has_mem = mem.has
+    def get_file(self, key):
+        return self.cache.get(key)
+    def get_mem(self, key):
+        return self.mem.get(key)
+    def set_file(self, key, val):
+        self.cache.set(key,val)
+    def set_mem(self, key, val):
+        self.mem.set(key, val)
+    def remove_file(self, key):
+        self.cache.remove(key)
+    def remove_mem(self, key):
+        self.mem.remove(key)
+    def get(self, key):
+        for cache in self.caches:
+            v = cache.get(key)
+            if v is not None:
+                return v
+        return None
+    def has(self, key):
+        for cache in self.caches:
+            if cache.has(key):
+                return True
+        return False
+
+pass

{buildz-0.6.34 → buildz-0.6.36}/buildz/db/dv/basez.py

@@ -32,10 +32,10 @@ class SimpleDv(ItDv):
         """
         raise Exception("unimplement")
         return None
-    def sql_index_keys(self, index):
+    def sql_index_keys(self, table, index):
         """
             require:
-                index_name, column_name, index_offset, column_note
+                table_name, index_name, column_name, index_offset, column_note
         """
         raise Exception("unimplement")
         return None
@@ -51,17 +51,17 @@ class SimpleDv(ItDv):
     def columns(self, table, as_map=None):
         sql = self.sql_columns(table)
         return self.query(sql, as_map=as_map)
-    def indexes(self, table=None, as_map=None):
-        sql = self.sql_indexes(table)
+    def indexes(self, table=None, index=None, as_map=None):
+        sql = self.sql_indexes(table, index)
         return self.query(sql, as_map=as_map)
-    def index_keys(self, index, as_map=None):
-        sql = self.sql_index_keys(table)
+    def index_keys(self, table, index, as_map=None):
+        sql = self.sql_index_keys(table, index)
         return self.query(sql, as_map=as_map)
     # func already impl
     def check_query(self, s):
         arr = s.split(" ")
         k = arr[0].strip().lower()
-        rst = k not in "delete,insert,update,create,drop,commit".split(",")
+        rst = k not in "delete,insert,update,create,drop,commit,alter".split(",")
         return rst
     def out_list(self, query_result, as_map=None):
         if as_map is None:
@@ -130,26 +130,33 @@ class SimpleDv(ItDv):
             keys = [keys]
         update = False
         conds = ""
-        if len(keys)>0:
-            need_query = True
-            conds = []
-            for k in keys:
-                if k not in maps:
-                    need_query = False
-                    break
-                v = maps[k]
-                if type(v)==str:
-                    v = f"'{v}'"
-                if v is not None:
-                    cond = f"{k} = {v}"
-                else:
-                    cond = f"{k} is null"
-                conds.append(cond)
-            if need_query:
-                conds = " and ".join(conds)
-                sql_search = f"select count(*) from {table} where {conds}"
-                rst = self.query(sql_search, as_map = False)[1][0]
-                update = rst>0
+        # if len(keys)>0:
+        #     need_query = True
+        #     conds = []
+        #     for k in keys:
+        #         if k not in maps:
+        #             need_query = False
+        #             break
+        #         v = maps[k]
+        #         if type(v)==str:
+        #             v = f"'{v}'"
+        #         if v is not None:
+        #             cond = f"{k} = {v}"
+        #         else:
+        #             cond = f"{k} is null"
+        #         conds.append(cond)
+        #     if need_query:
+        #         conds = " and ".join(conds)
+        #         sql_search = f"select count(*) from {table} where {conds}"
+        #         rst = self.query(sql_search, as_map = False)[1][0]
+        #         update = rst>0
+        kvs = [[k,tls.py2sql(v)] for k,v in maps.items()]
+        sets = [f"{k}={v}" for k,v in kvs]
+        sets = ",".join(sets)
+        ks = ",".join([kv[0] for kv in kvs])
+        vs = ",".join([str(kv[1]) for kv in kvs])
+        sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
+        return self.execute(sql)
         if update:
             keys = set(keys)
             kvs = [[k,tls.py2sql(v)] for k,v in maps.items() if k not in keys]
@@ -157,10 +164,10 @@ class SimpleDv(ItDv):
             sets = ",".join(sets)
             sql = f"update {table} set {sets} where {conds}"
         else:
-            kvs = [[k, tls.py2sql(v)] for k,v in maps.items()]
+            kvs = [[k,tls.py2sql(v)] for k,v in maps.items()]
             ks = ",".join([kv[0] for kv in kvs])
             vs = ",".join([str(kv[1]) for kv in kvs])
-            sql = f"insert into {table}({ks}) values({vs});"
+            sql = f"insert into {table}({ks}) values({vs})"
         return self.execute(sql)
 
 pass

{buildz-0.6.34 → buildz-0.6.36}/buildz/db/dv/mysqlz.py

@@ -45,7 +45,7 @@ class Db(SimpleDv):
                 table_name, column_name, column_type, column_default, nullable, column_offset, column_note
         """
         return f"select table_name, column_name, column_type, column_default, is_nullable as nullable, ordinal_position as column_offset, column_comment as column_note from information_schema.columns where table_schema='{self.db}' and table_name = '{table}' order by ordinal_position asc;"
-    def sql_indexes(self, table=None):
+    def sql_indexes(self, table=None, index=None):
         """
             require:
                 table_name, index_name, is_unique, index_type, index_note
@@ -53,13 +53,15 @@ class Db(SimpleDv):
         query_table = ""
         if table is not None:
             query_table =  f" and table_name = '{table}'"
+            if index is not None:
+                query_table+= f" and index_name='{index}'"
         return f"select table_name, index_name, 1-any_value(non_unique) as is_unique, any_value(index_type) as index_type, any_value(index_comment) as index_note from information_schema.statistics where table_schema='{self.db}' {query_table} group by index_name;"
-    def sql_index_keys(self, index):
+    def sql_index_keys(self, table, index):
         """
             require:
-                index_name, column_name, index_offset, column_note
+                table_name, index_name, column_name, index_offset, column_note
         """
-        return f"select index_name, column_name, seq_in_index as index_offset, comment as column_note from information_schema.statistics where table_name='flow_review' and table_schema='{self.db}' and index_name = '{index}' order by seq_in_index asc;"
+        return f"select table_name, index_name, column_name, seq_in_index as index_offset, comment as column_note from information_schema.statistics where table_name='{table}' and table_schema='{self.db}' and index_name = '{index}' order by seq_in_index asc;"
 
 pass
 def build(argv, conf):

{buildz-0.6.34 → buildz-0.6.36}/buildz/db/dv/oraclez.py

@@ -52,29 +52,31 @@ class Db(SimpleDv):
         """
         query_table = ""
         if table is not None:
-            query_table =  f" and t.table_name = '{table}'"
-        return f"select t.table_name as table_name, tc.comments as table_note from all_tables t inner join all_tab_comments tc on t.table_name=tc.table_name where t.owner='{self.user.upper()}' {query_table};"
+            query_table =  f" and t.table_name = '{table.upper()}'"
+        return f"select t.table_name as table_name, tc.comments as table_note from all_tables t inner join all_tab_comments tc on t.table_name=tc.table_name where t.owner='{self.user.upper()}' {query_table}"
     def sql_columns(self, table):
         """
             require:
                 table_name, column_name, column_type, column_default, nullable, column_offset, column_note
         """
-        return f"select c.table_name as table_name, c.column_name as column_name, c.data_type|| '(' ||c.data_length||','||c.data_precision||','||c.data_scale||')' as column_type, c.data_default as column_default, c.nullable as nullable, c.column_id as column_offset, cc.comments as column_note from all_tab_columns c inner join all_col_comments cc on c.column_name=cc.column_name and c.table_name=cc.table_name where c.table_name='{table}' order by c.column_id asc;"
-    def sql_indexes(self, table=None):
+        return f"select c.table_name as table_name, c.column_name as column_name, c.data_type|| '(' ||c.data_length||','||c.data_precision||','||c.data_scale||')' as column_type, c.data_default as column_default, c.nullable as nullable, c.column_id as column_offset, cc.comments as column_note from all_tab_columns c inner join all_col_comments cc on c.column_name=cc.column_name and c.table_name=cc.table_name where c.table_name='{table.upper()}' order by c.column_id asc"
+    def sql_indexes(self, table=None, index=None):
         """
             require:
                 table_name, index_name, is_unique, index_type, index_note
         """
         query_table = ""
         if table is not None:
-            query_table =  f" and table_name = '{table}'"
-        return f"select table_name, index_name,  case uniqueness when 'UNIQUE' then 1 else 0 end as is_unique, index_type, '' as index_note from all_indexes where owner = '{self.user.upper()}'{query_table};"
-    def sql_index_keys(self, index):
+            query_table =  f" and table_name = '{table.upper()}'"
+            if index is not None:
+                query_table+= f" and index_name='{index.upper()}'"
+        return f"select table_name, index_name,  case uniqueness when 'UNIQUE' then 1 else 0 end as is_unique, index_type, '' as index_note from all_indexes where owner = '{self.user.upper()}'{query_table}"
+    def sql_index_keys(self, table, index):
         """
             require:
-                index_name, column_name, index_offset, column_note
+                table_name, index_name, column_name, index_offset, column_note
         """
-        return f"select index_name, column_name, column_position as index_offset, '' as note from all_ind_columns where index_name='{index}' order by column_position asc;"
+        return f"select table_name, index_name, column_name, column_position as index_offset, '' as note from all_ind_columns where index_name='{index.upper()}' and table_name='{table.upper()}' order by column_position asc"
 
 pass
 def build(argv, conf):

{buildz-0.6.34 → buildz-0.6.36}/buildz/db/dv/orm.py

@@ -20,8 +20,10 @@ def deal_item(item, conf):
 def deal_key(it, conf):
     data_keys = xf.g(conf, data_keys=[])
     tmp = {}
+    #print(f"[TESTZ] conf: {conf}, it: {it}")
     for i in range(min(len(it), len(data_keys))):
         tmp[data_keys[i]] = it[i]
+    #print(f"[TESTZ] tmp: {tmp}")
     sql_key = tmp['sql_key']
     sql_def = tmp['sql_def']
     py_key = xf.g(tmp, py_key=None)
@@ -31,11 +33,12 @@ def deal_key(it, conf):
     xf.g(conf, vars=[]).append(sql_key+" "+sql_def)
 def makes(datas, data_keys = "sql_key,sql_def,py_key".split(",")):
     if type(datas)==dict:
-        rst = [make(v, k) for k,v in datas.items()]
+        rst = [make(v, k, py_name = k) for k,v in datas.items()]
     else:
         rst = [make(it) for it in datas]
     return rst
-def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(",")):
+def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_name=None):
+    #print(f"[TESTZ] MARK: {data}")
     """
         从配置中生成建表语句，删表语句和orm对象
         输入:
@@ -75,13 +78,16 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(",")):
     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=[])
+    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)
     for it in data:
         if len(it)==1 and type(it[0]) in (list, tuple):
             deal_item(it[0], conf)
         else:
             deal_key(it, conf)
     table = xf.g(conf, table=table)
+    py_name = xf.g(conf, py_name = py_name)
+    if py_name is None:
+        py_name = table
     vars =  xf.g(conf, vars = [])
     vars = ",".join(vars)
     assert table is not None
@@ -93,7 +99,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(",")):
     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])
+    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)
     return sqls, obj
 
 pass
@@ -108,10 +114,13 @@ 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):
+    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):
         if table is None:
             table = tls.lower(self.__class__.__name__)
         self.table = table
+        if py_name is None:
+            py_name = table
+        self.py_name = py_name
         if py2sqls is None:
             py2sqls = {}
         if type(py2sqls) in (list, tuple):
@@ -139,6 +148,7 @@ class TableObject(Base):
         self.sql_delete = sql_delete
     def create(self, dv=None):
         assert self.sql_create is not None
+        #print(f"[TESTZ] sql_create: {self.sql_create}")
         dv = self.rdv(dv)
         dv.executes(self.sql_create)
     def delete(self, dv=None):
@@ -153,7 +163,7 @@ class TableObject(Base):
                 if hasattr(obj, k):
                     tmp[k] = getattr(obj, k)
             obj = tmp
-        obj = {self.py2sqls[k]:v for k,v in obj.items()}
+        obj = {self.py2sqls[k]:v for k,v in obj.items() if k in self.py2sqls}
         return obj
     def toPy(self, obj):
         if type(obj)!=dict:
@@ -171,21 +181,42 @@ class TableObject(Base):
         return dv
     def query(self, sql, dv=None, sql2py=True):
         dv=self.rdv(dv)
-        rst = dv.query(sql)
+        rst = dv.query(sql, as_map=1)
         if sql2py:
             rst = [self.sql2py(it) for it in rst]
         return rst
     def queryAll(self, dv=None, sql2py=True):
         sql = f"select * from {self.table};"
         return self.query(sql, dv, sql2py)
-    def save(self, obj, dv=None, py2sql = True, commit=False):
+    def filterSql(self, obj):
+        if type(obj)!=dict:
+            tmp = {}
+            for k in self.py2sqls:
+                if hasattr(obj, k):
+                    tmp[k] = getattr(obj, k)
+            obj = tmp
+        obj = {k:v for k,v in obj.items() if k in self.keys}
+        return obj
+    def save(self, obj, dv=None, py2sql = True, commit=False, check = True):
         dv = self.rdv(dv)
         if type(obj) not in [list, tuple]:
             obj = [obj]
         if py2sql:
             obj = [self.toSql(k) for k in obj]
-        _ = [dv.insert_or_update(k, self.table, self.query_keys) for k in obj]
+        else:
+            obj = [self.filterSql(k) for k in obj]
+        query_keys = self.query_keys
+        if not check:
+            query_keys = None
+        _ = [dv.insert_or_update(k, self.table, query_keys) for k in obj]
         if commit:
-            dv.execute("commit;")
+            dv.execute("commit")
         return _
+    def clean(self, dv=None,commit = False):
+        dv = self.rdv(dv)
+        dv.execute(f"delete from {self.table}")
+        if commit:
+            dv.execute("commit")
+        
+
 

{buildz-0.6.34 → buildz-0.6.36}/buildz/db/dv/sqlite3z.py

@@ -4,6 +4,7 @@ import sys,os
 from .basez import SimpleDv, fetch
 from .structz import CMD
 from buildz import xf,fz
+from buildz.db import tls
 class Db(SimpleDv):
     # func to impl:
     def to_list(self, rst):
@@ -38,7 +39,7 @@ class Db(SimpleDv):
         if table is not None:
             query_table =  f" and name = '{table}'"
         return f"select name as table_name, '' as table_note from sqlite_master where type='table' {query_table};"
-    def sql_indexes(self, table=None):
+    def sql_indexes(self, table=None, index=None):
         """
             require:
                 table_name, index_name, is_unique, index_type, index_note
@@ -46,6 +47,8 @@ class Db(SimpleDv):
         query_table = ""
         if table is not None:
             query_table =  f" and tbl_name = '{table}'"
+            if index is not None:
+                query_table+= f" and name='{index}'"
         return f"select tbl_name as table_name, name as index_name, -1 as is_unique, '?' as index_type, '' as index_note from sqlite_master where type='index' {query_table};"
     def columns(self, table, as_map=None):
         """
@@ -62,18 +65,18 @@ class Db(SimpleDv):
             rst.append(tmp)
         rst = self.out_list_sqlite3(rst, as_map)
         return rst
-    def index_keys(self, index, as_map=None):
+    def index_keys(self, table, index, as_map=None):
         """
             require:
-                index_name, column_name, index_offset, column_note
+                table_name, index_name, column_name, index_offset, column_note
         """
         rst = self.query(f"PRAGMA index_info({index})", as_map=0)
         dts = rst[1:]
-        keys = "index_name, column_name, index_offset, column_note".split(", ")
+        keys = "table_name, index_name, column_name, index_offset, column_note".split(", ")
         rst = [keys]
         for dt in dts:
             seqno, cid, name = dt
-            tmp = [index, name, seqno, '']
+            tmp = [table, index, name, seqno, '']
             rst.append(tmp)
         return self.out_list_sqlite3(rst, as_map)
     def out_list_sqlite3(self, query_result, as_map=None):
@@ -87,6 +90,21 @@ class Db(SimpleDv):
             rst = rst[1:]
             rst = [{k:v for k,v in zip(keys, dt)} for dt in rst]
         return rst
+    def insert_or_update(self, maps, table, keys = None):
+        if type(maps)!=dict:
+            maps = maps.__dict__
+        if keys is None:
+            keys = []
+        if type(keys) not in (list, tuple):
+            keys = [keys]
+        kvs = [[k,tls.py2sql(v)] for k,v in maps.items()]
+        sets = [f"{k}={v}" for k,v in kvs]
+        sets = ",".join(sets)
+        ks = ",".join([kv[0] for kv in kvs])
+        vs = ",".join([str(kv[1]) for kv in kvs])
+        sql = f"insert into {table}({ks}) values({vs}) ON CONFLICT DO UPDATE SET {sets}"
+        #print(f"[TESTZ] sql: {sql}")
+        return self.execute(sql)
 
 pass
 def build(argv, conf):

{buildz-0.6.34 → buildz-0.6.36}/buildz/db/dv/structz.py

@@ -192,13 +192,11 @@ class CMD:
             try:
                 tab = s.split(" ")[0]
                 if tab in "tables,indexes,columns,index_keys".split(","):
-                    _val = None
                     _arr = s.split(" ")
                     _arr = [_k.strip() for _k in _arr if _k.strip()!=""]
-                    if len(_arr)>1:
-                        _val = _arr[1]
+                    _arr = _arr[1:]
                     _fc = getattr(self.dv, tab)
-                    rst = self.exec(_fc, _val)
+                    rst = self.exec(_fc, *_arr)
                     show_query = True
                 elif self.dv.check_query(s):
                     rst = self.query(s)

{buildz-0.6.34 → buildz-0.6.36}/buildz/ioc/ioc/base.py

@@ -33,7 +33,7 @@ class EncapeData(Base):
         包含data id对应的配置，配置文件id，配置文件对象
         [object.test, call, ]
     """
-    def __init__(self, data, conf=None, local = False, type = None, src = None, info = None, confs = None):
+    def __init__(self, data, conf=None, local = False, type = None, src = None, info = None, confs = None, force_new = False):
         """
             data: 配置数据
             conf: 配置数据对应的配置文件的管理器
@@ -42,6 +42,7 @@ class EncapeData(Base):
             src: 源对象，配置数据生成的对象调用conf获取对象，会有这个字段，目前只有object会放这个字段，其他要么透传要么不传
             info: 额外的调用信息，目前只有object会用到里面的id字段，作为单例额外输入
         """
+        self.force_new = force_new
         if typez(data)==dict:
             pid = xf.g1(data, parent=None, template=None, temp=None)
             if pid is not None:
@@ -77,8 +78,8 @@ class EncapeData(Base):
         self.info = info
     def deal(self, remove = False):
         if self.conf is None:
-            return self.confs.get(self, src = self.src, info=self.info, remove = remove)
-        return self.conf.get(self, src = self.src, info=self.info, remove = remove)
+            return self.confs.get(self, src = self.src, info=self.info, remove = remove, force_new = self.force_new)
+        return self.conf.get(self, src = self.src, info=self.info, remove = remove, force_new = self.force_new)
 
 
 pass