buildz 0.6.30__tar.gz → 0.6.32__tar.gz

{buildz-0.6.30/buildz.egg-info → buildz-0.6.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.30
+Version: 0.6.32
 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.30 → buildz-0.6.32}/buildz/__init__.py

@@ -1,6 +1,6 @@
 #coding=utf-8
 
-__version__="0.4.91"
+__version__="0.6.31"
 
 # 小号多
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

{buildz-0.6.30 → buildz-0.6.32}/buildz/db/dv/__init__.py

@@ -9,6 +9,8 @@ def build(dv,*a,**b):
         from .clickhousez import build as _build
     elif dv == "postgresql":
         from .postgresqlz import build as _build
+    elif dv == "sqlite3":
+        from .sqlite3z import build as _build
     else:
         raise Exception(f"not impl dv: {dv}")
     return _build(*a, **b)

{buildz-0.6.30 → buildz-0.6.32}/buildz/db/dv/basez.py

@@ -51,7 +51,7 @@ class SimpleDv(ItDv):
     def query(self, sql, vals=()):
         # return list, first row is key
         tmp = self.cursor.execute(sql, vals)
-        print("[TESTZ] exe:",tmp)
+        #print("[TESTZ] exe:",tmp)
         rst = self.cursor.fetchall()
         return self.to_list(rst)
     def execute(self, sql, vals=()):

buildz-0.6.32/buildz/db/dv/sqlite3z.py

@@ -0,0 +1,41 @@
+
+import sqlite3
+import sys,os
+from .basez import SimpleDv, fetch
+from .structz import CMD
+from buildz import xf,fz
+class Db(SimpleDv):
+    # func to impl:
+    def to_list(self, rst):
+        rows = self.cursor.description
+        keys = [k[0].lower() for k in rows]
+        result = []
+        result.append(keys)
+        if rst is None or len(rst)==0:
+            return result
+        result += rst
+        return result
+    def new_con(self):
+        return sqlite3.connect(self.fp)
+    def new_cursor(self):
+        return self.con.cursor()
+    def __init__(self, fp):
+        self.con = None
+        self.cursor = None
+        self.init(fp)
+    def init(self, fp):
+        fz.makefdir(fp)
+        self.fp = fp
+
+pass
+def build(argv, conf):
+    root = xf.g(conf, root=None)
+    fp = argv[0]
+    if root is not None:
+        fp = os.path.join(root, fp)
+    dv = Db(fp)
+    return dv
+def buildbk(argv, conf):
+    return CMD(make(argv, conf))
+
+pass

{buildz-0.6.30 → buildz-0.6.32}/buildz/db/dv/structz.py

@@ -118,20 +118,28 @@ class CMD:
         elif s.split(" ")[0] == "source":
             # source filepath [encoding]
             arr = s.split(" ")
-            fp =arr[1].strip()
+            fp =arr[1].strip().split(";")[0]
             cd = "utf-8"
             if len(arr)>2:
                 cd = arr[2].strip().lower()
             with open(fp, 'rb') as f:
                 s = f.read().decode(cd)
             arr = s.split(";")
+            n = len(arr)
+            print(f"[TESTZ] done fread {fp}: {len(arr)}")
+            i=0
             for sql in arr:
-                if sql.strip() == "":
+                sql=sql.replace("\r","")
+                sql = sql.split("\n")
+                sql = [k for k in sql if k.strip()[:2]!="--"]
+                sql = "\n".join(sql)
+                if sql.strip() == "" or sql.strip()[:2]=="--":
                     continue
                 _sql = sql+";"
-                self.s_print("sql:", _sql)
+                #self.s_print("sql:", _sql)
                 tmp = self.execute(_sql)
-                self.s_print(tmp)
+                #self.s_print(tmp)
+                i+=1
             self.s_print("done source", fp)
         elif s.split(" ")[0] == "export":
             # export filepath encoding sql;

{buildz-0.6.30 → buildz-0.6.32}/buildz/db/runz.py

@@ -17,13 +17,28 @@ if __name__ == "__main__":
 else:
     from .dv import build
     from .dv.structz import CMD
+
+pass
+def cmd(conf):
+    obj = conf
+    dv = obj['dv']
+    db_url = obj['db']
+    db_url = obj[db_url]
+    user = xf.g(obj,user=None)
+    pwd = xf.g(obj,pwd=None)
+    src = obj['src']
+    out = obj['out']
+    cmd = CMD(build(dv, [db_url, user, pwd], obj))
+    return cmd
+
+pass
 def test(fp):
     obj = xf.loads(xf.fread(fp))
     dv = obj['dv']
     db_url = obj['db']
     db_url = obj[db_url]
-    user = obj['user']
-    pwd = obj['pwd']
+    user = xf.g(obj,user=None)
+    pwd = xf.g(obj,pwd=None)
     src = obj['src']
     out = obj['out']
     sqls = xf.fread(src)
@@ -43,15 +58,22 @@ def test(fp):
     cmd.dv.begin()
     print("[TESTZ] A")
     with open(out, 'wb') as f:
-        for sql in sqls:
-            if sql.strip()=="":
-                continue
-            if sql.strip() == "exit":
-                break
-            print("[TESTZ] B")
-            rst = cmd.single(sql)
-            print("[TESTZ] C")
+        f.write(b"[START SQL]\n\n")
+    for sql in sqls:
+        if sql.strip()=="":
+            continue
+        if sql.strip() == "exit":
+            break
+        print("[TESTZ] B")
+        curr=time.time()
+        rst = cmd.single(sql)
+        cost = time.time()-curr
+        print(f"[TESTZ] Cost: {cost} sec")
+        rst += f"time cost: {cost} sec\n"
+        with open(out, 'ab') as f:
             f.write(rst.encode("utf-8"))
+    with open(out, 'ab') as f:
+        f.write(b"\n[DONE SQL]")
     cmd.close()
 
 pass

{buildz-0.6.30 → buildz-0.6.32/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.30
+Version: 0.6.32
 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.30 → buildz-0.6.32}/buildz.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ buildz/db/dv/clickhousez.py
 buildz/db/dv/mysqlz.py
 buildz/db/dv/oraclez.py
 buildz/db/dv/postgresqlz.py
+buildz/db/dv/sqlite3z.py
 buildz/db/dv/structz.py
 buildz/db/dv/lib/readme
 buildz/demo/test.py

{buildz-0.6.30 → buildz-0.6.32}/setup.py

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