buildz 0.6.24__tar.gz → 0.6.26__tar.gz

{buildz-0.6.24/buildz.egg-info → buildz-0.6.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.24
+Version: 0.6.26
 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.24 → buildz-0.6.26}/buildz/db/dv/__init__.py

@@ -7,6 +7,10 @@ def build(dv,*a,**b):
         from .oraclez import build as _build
     elif dv == 'clickhouse':
         from .clickhousez import build as _build
+    elif dv == "postgresql":
+        from .postgresqlz import build as _build
+    else:
+        raise Exception(f"not impl dv: {dv}")
     return _build(*a, **b)
 
 pass

{buildz-0.6.24 → buildz-0.6.26}/buildz/db/dv/basez.py

@@ -62,10 +62,18 @@ pass
 
 # user|pwd@host:port/db
 def fetch(args):
+    """
+        host[:port][/db][ user][ pwd]
+        host:port/db user pwd
+    """
     if type(args) == str:
         args = args.split(" ")
     url = args[0].strip()
-    url, db = url.split("/")
+    tmp = url.split("/")
+    url = tmp[0]
+    db = None
+    if len(tmp)>1:
+        db = tmp[1]
     tmp = url.split(":")
     if len(tmp)==2:
         host, port = tmp
@@ -73,8 +81,12 @@ def fetch(args):
     else:
         host = tmp[0]
         port = None
-    user = args[1].strip()
-    pwd = args[2].strip()
+    user = None
+    if len(args)>1:
+        user = args[1].strip()
+    pwd = None
+    if len(args)>2:
+        pwd = args[2].strip()
     return host, port, user, pwd, db
 
 pass

buildz-0.6.26/buildz/db/dv/postgresqlz.py

@@ -0,0 +1,42 @@
+try:
+    import psycopg
+except ModuleNotFoundError:
+    try:
+        import psycopg2 as psycopg
+    except ModuleNotFoundError:
+        raise Exception("module not found, try: pip install psycopg")
+import sys
+from .basez import SimpleDv, fetch
+from .structz import CMD
+class Db(SimpleDv):
+    # func to impl:
+    def to_list(self, rst):
+        rows = self.cursor.description
+        keys = [k.name.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 psycopg.connect(host=self.host, 
+            port = self.port, user =self.user, 
+            password =self.pwd, dbname = self.db)
+    def new_cursor(self):
+        return self.con.cursor()
+    def init(self, *argv, **maps):
+        if self.port is None:
+            self.port = 5432
+        if self.user is None:
+            self.user = "postgres"
+        pass
+
+pass
+def build(argv, conf):
+    dv = Db(*fetch(argv))
+    return dv
+def buildbk(argv, conf):
+    return CMD(make(argv, conf))
+
+pass

{buildz-0.6.24 → buildz-0.6.26}/buildz/db/install.txt

@@ -2,3 +2,4 @@ pip install:
 pymysql
 cx-Oracle(and download oracle???.dll from oracle website and copy to ./dv/lib)
 clickhouse-driver
+psycopg (or psycopg2, no test)

{buildz-0.6.24 → buildz-0.6.26}/buildz/db/runz.py

@@ -11,25 +11,13 @@ def find(arr, k, base = 0):
     return -1
 
 pass
+if __name__ == "__main__":
+    from dv import build
+else:
+    from .dv import buildz
 def test(fp):
     obj = xf.loads(xf.fread(fp))
     dv = obj['dv']
-    if __name__ == "__main__":
-        from dv.structz import CMD
-        if dv == 'mysql':
-            from dv.mysqlz import build
-        elif dv == 'oracle':
-            from dv.oraclez import build
-        elif dv == 'clickhouse':
-            from dv.clickhousez import build
-    else:
-        from .dv.structz import CMD
-        if dv == 'mysql':
-            from .dv.mysqlz import build
-        elif dv == 'oracle':
-            from .dv.oraclez import build
-        elif dv == 'clickhouse':
-            from .dv.clickhousez import build
     db_url = obj['db']
     db_url = obj[db_url]
     user = obj['user']
@@ -49,7 +37,7 @@ def test(fp):
     sqls = "\n".join(sqls)
     sqls = sqls.split(";")
     print(f"[TESTZ] sqls:{sqls}")
-    cmd = CMD(build([db_url, user, pwd], obj))
+    cmd = CMD(build(dv, [db_url, user, pwd], obj))
     cmd.dv.begin()
     print("[TESTZ] A")
     with open(out, 'wb') as f:

{buildz-0.6.24 → buildz-0.6.26/buildz.egg-info}/PKG-INFO

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

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

{buildz-0.6.24 → buildz-0.6.26}/setup.py

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