buildz 0.6.34__tar.gz → 0.6.35__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.34
+Version: 0.6.35
 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.6.34 → buildz-0.6.35}/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:

{buildz-0.6.34 → buildz-0.6.35}/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.35}/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.35}/buildz/db/dv/orm.py

@@ -171,20 +171,23 @@ 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 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]
+        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;")
         return _

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

@@ -38,7 +38,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 +46,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 +64,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):

{buildz-0.6.34 → buildz-0.6.35}/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.35}/buildz/xz/trs.py

@@ -33,6 +33,7 @@ class Translate(Base):
         self.vars = vars
     def kfc(self, fckey, val, vars=None):
         fc = self.var(fckey, vars)
+        #print(f"[TESTZ] kfc: fckey: {fckey}, val: {val}, fc: {fc}")
         return fc(val)
     def var(self, key, vars=None):
         #print(f"[TESTZ] vars: {vars}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.34
+Version: 0.6.35
 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.6.34 → buildz-0.6.35}/setup.py

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