buildz 0.6.31__tar.gz → 0.6.32__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.31
+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.31 → buildz-0.6.32}/buildz/db/dv/sqlite3z.py

@@ -1,8 +1,9 @@
 
 import sqlite3
-import sys
+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):
@@ -23,11 +24,16 @@ class Db(SimpleDv):
         self.cursor = None
         self.init(fp)
     def init(self, fp):
+        fz.makefdir(fp)
         self.fp = fp
 
 pass
 def build(argv, conf):
-    dv = Db(argv[0])
+    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))

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

@@ -118,7 +118,7 @@ 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()
@@ -129,11 +129,14 @@ class CMD:
             print(f"[TESTZ] done fread {fp}: {len(arr)}")
             i=0
             for sql in arr:
+                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)
-                #print(f"[TESTZ] sql: {_sql}")
                 tmp = self.execute(_sql)
                 #self.s_print(tmp)
                 i+=1

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

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

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