cloudoll 2.2.24__tar.gz → 2.2.26__tar.gz

{cloudoll-2.2.24 → cloudoll-2.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudoll
-Version: 2.2.24
+Version: 2.2.26
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -15,6 +15,19 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.6.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: watchfiles
+Requires-Dist: curl_cffi
+Requires-Dist: colorlog
+Requires-Dist: aiomysql
+Requires-Dist: aiopg
+Requires-Dist: aiohttp
+Requires-Dist: redis[hiredis]
+Requires-Dist: aiomcache
+Requires-Dist: jinja2
+Requires-Dist: pyjwt
+Requires-Dist: aiohttp_session[secure]
+Requires-Dist: PyYAML
+Requires-Dist: click
 
 
 # cloudoll 云端玩具

cloudoll-2.2.26/cloudoll/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.2.26"

{cloudoll-2.2.24 → cloudoll-2.2.26}/cloudoll/orm/__init__.py

@@ -115,7 +115,7 @@ class Postgres(MeteBase):
     #         self.pool.release(cursor)
 
     async def query(self, sql, params=None, query_type: QueryTypes = 2, size: int = 10):
-        sql = sql.replace("?", "%s").replace("`", "")
+        sql = sql.replace("?", "%s").replace('`', '"')
         print_info("sql", sql, params)
         if not self.pool:
             raise ValueError("must be create_engine first.")

{cloudoll-2.2.24 → cloudoll-2.2.26}/cloudoll/orm/field.py

@@ -35,13 +35,18 @@ OP = objdict(
     IS_THIS_WEEK="THIS_WEEK",
     IS_THIS_MONTH="THIS_MONTH",
     IS_THIS_YEAR="THIS_YEAR",
+    LASTED_HOURS="LASTED_HOURS",
+    LASTED_MINUTES="LASTED_MINUTES",
+    LASTED_SECONDS="LASTED_SECONDS",
+    LASTED_YEARS="LASTED_YEARS",
+    LASTED_MONTHS="LASTED_MONTHS",
+    LASTED_DAYS="LASTED_DAYS",
+    BEFORE_YEARS="BEFORE_YEARS",
+    BEFORE_MONTHS="BEFORE_MONTHS",
     BEFORE_DAYS="BEFORE_DAYS",
     BEFORE_HOURS="BEFORE_HOURS",
     BEFORE_MINUTES="BEFORE_MINUTES",
-    BEFORE_YEARS="BEFORE_YEARS",
-    AFTER_YEARS="AFTER_YEARS",
-    AFTER_MONTHS="AFTER_MONTHS",
-    BEFORE_MONTHS="BEFORE_MONTHS",
+    BEFORE_SECONDS="BEFORE_SECONDS",
     DATE_FORMAT="DATE_FORMAT",
     JSON_CONTAINS_OBJECT="JSON_CONTAINS_OBJECT",
     JSON_CONTAINS_ARRAY="JSON_CONTAINS_ARRAY",
@@ -138,6 +143,30 @@ class FieldBase(object):
     def is_this_year(self):
         return Function(self, OP.IS_THIS_YEAR)
 
+    def lasted_hours(self, args):
+        return Function(self, OP.LASTED_HOURS, args)
+
+    def lasted_minutes(self, args):
+        return Function(self, OP.LASTED_MINUTES, args)
+
+    def lasted_seconds(self, args):
+        return Function(self, OP.LASTED_SECONDS, args)
+
+    def lasted_years(self, args):
+        return Function(self, OP.LASTED_YEARS, args)
+
+    def lasted_months(self, args):
+        return Function(self, OP.LASTED_MONTHS, args)
+
+    def lasted_days(self, args):
+        return Function(self, OP.LASTED_DAYS, args)
+
+    def before_months(self, args):
+        return Function(self, OP.BEFORE_MONTHS, args)
+
+    def before_years(self, args):
+        return Function(self, OP.BEFORE_YEARS, args)
+
     def before_days(self, args):
         return Function(self, OP.BEFORE_DAYS, args)
 
@@ -147,17 +176,8 @@ class FieldBase(object):
     def before_minutes(self, args):
         return Function(self, OP.BEFORE_MINUTES, args)
 
-    def before_years(self, args):
-        return Function(self, OP.BEFORE_YEARS, args)
-
-    def before_months(self, args):
-        return Function(self, OP.BEFORE_MONTHS, args)
-
-    def after_months(self, args):
-        return Function(self, OP.AFTER_MONTHS, args)
-
-    def after_years(self, args):
-        return Function(self, OP.AFTER_YEARS, args)
+    def before_seconds(self, args):
+        return Function(self, OP.BEFORE_SECOBDS, args)
 
     def json_contains_object(self, key, value):
         return Function(self, OP.JSON_CONTAINS_OBJECT, (key, value))
@@ -238,20 +258,33 @@ class Function(FieldBase):
             return f"MONTH({col_name}) = MONTH(CURDATE())", None
         elif op == OP.IS_THIS_YEAR:
             return f"YEAR({col_name}) = YEAR(CURDATE())", None
-        elif op == OP.BEFORE_DAYS:
-            return f"DATE({col_name}) >= CURDATE() - INTERVAL {self.rpt} DAY", None
-        elif op == OP.BEFORE_HOURS:
-            return f"{col_name} >= NOW() - INTERVAL {self.rpt} HOUR", None
-        elif op == OP.BEFORE_MINUTES:
+
+        elif op == OP.LASTED_SECONDS:
+            return f"{col_name} >= NOW() - INTERVAL {self.rpt} SECOND", None
+        elif op == OP.LASTED_MINUTES:
             return f"{col_name} >= NOW() - INTERVAL {self.rpt} MINUTE", None
+        elif op == OP.LASTED_HOURS:
+            return f"{col_name} >= NOW() - INTERVAL {self.rpt} HOUR", None
+        elif op == OP.LASTED_YEARS:
+            return f"{col_name} >= NOW() - INTERVAL {self.rpt} YEAR", None
+        elif op == OP.LASTED_MONTHS:
+            return f"{col_name} >= NOW() - INTERVAL {self.rpt} MONTH", None
+        elif op == OP.LASTED_DAYS:
+            return f"DATE({col_name}) >= CURDATE() - INTERVAL {self.rpt} DAY", None
+
         elif op == OP.BEFORE_YEARS:
-            return f"{col_name} >= DATE_SUB(NOW(), INTERVAL {self.rpt} YEAR)", None
+            return f"{col_name} < NOW() - INTERVAL {self.rpt} YEAR", None
         elif op == OP.BEFORE_MONTHS:
-            return f"{col_name} >= DATE_SUB(NOW(), INTERVAL {self.rpt} MONTH)", None
-        elif op == OP.AFTER_YEARS:
-            return f"{col_name} < DATE_SUB(NOW(), INTERVAL {self.rpt} YEAR)", None
-        elif op == OP.AFTER_MONTHS:
-            return f"{col_name} < DATE_SUB(NOW(), INTERVAL {self.rpt} MONTH)", None
+            return f"{col_name} < NOW() - INTERVAL {self.rpt} MONTH", None
+        elif op == OP.BEFORE_DAYS:
+            return f"{col_name} < NOW() - INTERVAL {self.rpt} DAY", None
+        elif op == OP.BEFORE_HOURS:
+            return f"{col_name} < NOW() - INTERVAL {self.rpt} HOUR", None
+        elif op == OP.BEFORE_MINUTES:
+            return f"{col_name} < NOW() - INTERVAL {self.rpt} MINUTE", None
+        elif op == OP.BEFORE_SECONDS:
+            return f"{col_name} < NOW() - INTERVAL {self.rpt} SECOND", None
+
         elif op == OP.JSON_CONTAINS_OBJECT:
             _k, _v = self.rpt
             key = _k.full_name if isinstance(_k, Field) else f"'{_k}'"
@@ -301,33 +334,28 @@ class Expression(FieldBase):
             q.append(_q)
             if _p:
                 p = p + _p
-            # return l.sql()
 
         q.append(f" {self.op} ")
 
         if isinstance(r, Field):
             if r._value is not None:
-                # _value = r._value if r._value is not None else r.full_name
                 q.append("?")
                 p.append(r._value)
             else:
                 q.append(r.full_name)
-            # q.append(str(r._value) if r._value is not None else r.full_name)
         elif isinstance(r, FieldBase):
             _q, _p = r.sql()
             q.append(_q)
-            p = p + _p
+            if _p:
+                p = p + _p
         elif self.op == OP.AS:
-            # is_fun or (isinstance(r, str) and (self.op == OP.AND or self.op == OP.OR)):
             q.append(r)
         elif r is not None:
             q.append("?")
             p.append(r)
         if not is_fun:
             q.append(")")
-        # q.append(")")
         q = [str(num) for num in q]
-        # print("".join(q))
         return "".join(q), p
 
     # def __str__(self):
@@ -338,7 +366,6 @@ class Expression(FieldBase):
     #     return str(eval(f"{cal}{self.rhs}"))
 
     def __repr__(self):
-        # return self.__value
         cal = f"{self.lhs.value}{self.op}"
         if isinstance(self.rhs, FieldBase):
             return str(eval(f"{cal}{self.rhs.value}"))
@@ -354,7 +381,7 @@ class Field(FieldBase):
         primary_key=False,  # 主键
         charset=None,  # 编码
         max_length=None,  # 长度
-        scale_length=None, # 精度
+        scale_length=None,  # 精度
         auto_increment=False,  # 自增
         NOT_NULL=False,  # 非空
         created_generated=False,  # 创建时for datetime

{cloudoll-2.2.24 → cloudoll-2.2.26}/cloudoll/orm/model.py

@@ -392,7 +392,8 @@ class Model(metaclass=ModelMetaclass):
         sql = f"update `{table}` set {keys} {where}"
 
         if where is not None and where != "":
-            params += self.__params__
+            if self.__params__:
+                params += self.__params__
         else:
             pk, pkv = self._get_primary()
             if pkv is None:
@@ -434,7 +435,8 @@ class Model(metaclass=ModelMetaclass):
     async def insert(self, *args, **kw):
         table = self.__table__
         keys, params = self._get_insert_key_args("i", args or kw)
-        sql = f"insert into `{table}` ({','.join(keys)}) values ({','.join(['?' for k in keys])})"
+        escape_keys = [f'`{k}`' for k in keys]
+        sql = f"insert into `{table}` ({','.join(escape_keys)}) values ({','.join(['?' for k in keys])})"
         self._reset()
         params = tuple(key for key in params)
         return await self.__pool__.create(sql, params)
@@ -444,7 +446,8 @@ class Model(metaclass=ModelMetaclass):
         if len(items) == 0:
             return 0
         keys, params = self._get_batch_keys_values(items)
-        sql = f"insert into `{table}` ({','.join(keys)}) values ({','.join(['?' for k in keys])})"
+        escape_keys = [f'`{k}`' for k in keys]
+        sql = f"insert into `{table}` ({','.join(escape_keys)}) values ({','.join(['?' for k in keys])})"
         self._reset()
         return await self.__pool__.create_batch(sql, params)
 

{cloudoll-2.2.24 → cloudoll-2.2.26}/cloudoll.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudoll
-Version: 2.2.24
+Version: 2.2.26
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -15,6 +15,19 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.6.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: watchfiles
+Requires-Dist: curl_cffi
+Requires-Dist: colorlog
+Requires-Dist: aiomysql
+Requires-Dist: aiopg
+Requires-Dist: aiohttp
+Requires-Dist: redis[hiredis]
+Requires-Dist: aiomcache
+Requires-Dist: jinja2
+Requires-Dist: pyjwt
+Requires-Dist: aiohttp_session[secure]
+Requires-Dist: PyYAML
+Requires-Dist: click
 
 
 # cloudoll 云端玩具

cloudoll-2.2.24/cloudoll/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.2.24"