buildz 0.6.23__tar.gz → 0.6.25__tar.gz

{buildz-0.6.23/buildz.egg-info → buildz-0.6.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.23
+Version: 0.6.25
 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.23 → buildz-0.6.25}/buildz/auto/cache.py

@@ -33,8 +33,9 @@ class Update(Base):
             return s
         rst = re.findall(self.pt, s)
         for match, key in rst:
+            has = self.cache.has(key)
             val = self.cache.get(key)
-            if val is None:
+            if not has:
                 err = f"'{key}' not found in cache"
                 self.log.error(err)
                 raise Exception(err)
@@ -76,6 +77,9 @@ pass
 @wrap.obj(id="cache.file")
 @wrap.obj_args("mcall, log, tag, [Cache.File]", "env, cache.rfp.current.first, false")
 class Cache(Base):
+    def has(self, key):
+        ks = key.split(".")
+        return xf.has(self.data, ks)
     def get(self, key):
         ks = key.split(".")
         return xf.gets(self.data, ks)
@@ -174,6 +178,8 @@ class Caches(Base):
         self.set_current = cache.set_current
         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):
@@ -192,5 +198,10 @@ class Caches(Base):
             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.23 → buildz-0.6.25}/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.23 → buildz-0.6.25}/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.25/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.23 → buildz-0.6.25}/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.23 → buildz-0.6.25}/buildz/xf/mapz.py

@@ -135,6 +135,22 @@ def sets(maps, keys, val):
     maps[keys[-1]] = val
 
 pass
+def has(maps, keys):
+    if type(keys) != list:
+        keys = [keys]
+    for key in keys:
+        if type(maps)==dict:
+            if key not in maps:
+                return False
+        else:
+            key = int(key)
+            if key>=len(maps):
+                return default
+        maps = maps[key]
+    return True
+
+pass
+
 def gets(maps, keys, default = None):
     if type(keys) != list:
         keys = [keys]

{buildz-0.6.23 → buildz-0.6.25/buildz.egg-info}/PKG-INFO

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

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