cloudoll 2.3.1__tar.gz → 2.3.2__tar.gz

{cloudoll-2.3.1 → cloudoll-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudoll
-Version: 2.3.1
+Version: 2.3.2
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur

cloudoll-2.3.2/cloudoll/__init__.py

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

{cloudoll-2.3.1 → cloudoll-2.3.2}/cloudoll/orm/__init__.py

@@ -84,7 +84,6 @@ class Postgres(MeteBase):
                 elif query_type == QueryTypes.ONE:
                     columns = [desc[0] for desc in cursor.description]
                     row = await cursor.fetchone()
-                    # print("rows_reuslt", rows)
                     result = dict(zip(columns, row)) if row else {}
                     return result
                 elif query_type == QueryTypes.MANY:
@@ -93,7 +92,16 @@ class Postgres(MeteBase):
                     result = [dict(zip(columns, row)) for row in rows]
                     return result
                 elif query_type == QueryTypes.COUNT:
-                    return cursor.rowcount
+                    result = await cursor.fetchone()
+                    count = 0
+                    if rows is None:
+                        return count
+                    for row in rows:
+                        count = rows[row]
+                    return count
+                elif query_type == QueryTypes.GROUP_COUNT:
+                    result = await cursor.fetchall()
+                    return 0 if not result else len(result)
                 elif query_type == QueryTypes.CREATE:
                     result = cursor.rowcount > 0
                     id = cursor.lastrowid
@@ -192,7 +200,16 @@ class Mysql(MeteBase):
                 elif query_type == QueryTypes.MANY:
                     return await cursor.fetchmany(size)
                 elif query_type == QueryTypes.COUNT:
-                    return cursor.rowcount
+                    rows = await cursor.fetchone()
+                    count = 0
+                    if rows is None:
+                        return count
+                    for row in rows:
+                        count = rows[row]
+                    return count
+                elif query_type == QueryTypes.GROUP_COUNT:
+                    result = await cursor.fetchall()
+                    return 0 if not result else len(result)
                 elif query_type == QueryTypes.CREATE:
                     result = cursor.rowcount > 0
                     id = cursor.lastrowid

{cloudoll-2.3.1 → cloudoll-2.3.2}/cloudoll/orm/base.py

@@ -12,6 +12,7 @@ class QueryTypes(Enum):
     DELETE = 7
     CREATEBATCH = 8
     UPDATEBATCH = 9
+    GROUP_COUNT = 10
 
 
 class MeteBase:
@@ -60,6 +61,8 @@ class MeteBase:
 
     async def count(self, sql, params):
         return await self.query(sql, params, QueryTypes.COUNT)
+    async def group_count(self, sql, params):
+        return await self.query(sql, params, QueryTypes.GROUP_COUNT)
 
     async def update(self, sql, params):
         return await self.query(sql, params, QueryTypes.UPDATE)

{cloudoll-2.3.1 → cloudoll-2.3.2}/cloudoll/orm/model.py

@@ -228,7 +228,9 @@ class Model(metaclass=ModelMetaclass):
             for item in args:
                 if isinstance(item, Model):
                     for k in item.__dict__:
-                        if (action == "u" and item[k].value is not None) or action == "i":
+                        if (
+                            action == "u" and item[k].value is not None
+                        ) or action == "i":
                             data[k] = item[k]
 
                 else:  # for object
@@ -463,20 +465,22 @@ class Model(metaclass=ModelMetaclass):
         sql = f"SELECT COUNT(*) FROM {cls.__table__} {aft}"
         args = cls.__params__
         sql = self._exchange_sql(sql)
+        if GROUPBY is not None and GROUPBY != "":
+            return await cls.__pool__.group_count(sql, args)
         return await cls.__pool__.count(sql, args)
 
 
 class Models(object):
     class CharField(Field):
         def __init__(
-                self,
-                name=None,
-                primary_key=False,
-                default=None,
-                charset=None,
-                max_length=None,
-                not_null=False,
-                comment=None,
+            self,
+            name=None,
+            primary_key=False,
+            default=None,
+            charset=None,
+            max_length=None,
+            not_null=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -491,14 +495,14 @@ class Models(object):
 
     class VarCharField(Field):
         def __init__(
-                self,
-                name=None,
-                primary_key=False,
-                default=None,
-                charset=None,
-                max_length=None,
-                not_null=False,
-                comment=None,
+            self,
+            name=None,
+            primary_key=False,
+            default=None,
+            charset=None,
+            max_length=None,
+            not_null=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -513,7 +517,7 @@ class Models(object):
 
     class BooleanField(Field):
         def __init__(
-                self, name=None, default=False, not_null=False, comment=None, unsigned=False
+            self, name=None, default=False, not_null=False, comment=None, unsigned=False
         ):
             super().__init__(
                 name,
@@ -526,15 +530,15 @@ class Models(object):
 
     class IntegerField(Field):
         def __init__(
-                self,
-                name=None,
-                primary_key=False,
-                default=None,
-                auto_increment=False,
-                not_null=False,
-                unsigned=False,
-                comment=None,
-                max_length=None,
+            self,
+            name=None,
+            primary_key=False,
+            default=None,
+            auto_increment=False,
+            not_null=False,
+            unsigned=False,
+            comment=None,
+            max_length=None,
         ):
             super().__init__(
                 name,
@@ -550,15 +554,15 @@ class Models(object):
 
     class BigIntegerField(Field):
         def __init__(
-                self,
-                name=None,
-                primary_key=False,
-                default=None,
-                auto_increment=False,
-                not_null=False,
-                unsigned=False,
-                comment=None,
-                max_length=None,
+            self,
+            name=None,
+            primary_key=False,
+            default=None,
+            auto_increment=False,
+            not_null=False,
+            unsigned=False,
+            comment=None,
+            max_length=None,
         ):
             super().__init__(
                 name,
@@ -574,13 +578,13 @@ class Models(object):
 
     class DoubleField(Field):
         def __init__(
-                self,
-                name=None,
-                default=None,
-                not_null=False,
-                max_length=None,
-                unsigned=False,
-                comment=None,
+            self,
+            name=None,
+            default=None,
+            not_null=False,
+            max_length=None,
+            unsigned=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -594,14 +598,14 @@ class Models(object):
 
     class FloatField(Field):
         def __init__(
-                self,
-                name=None,
-                default=None,
-                not_null=False,
-                max_length=None,
-                scale_length=None,
-                unsigned=False,
-                comment=None,
+            self,
+            name=None,
+            default=None,
+            not_null=False,
+            max_length=None,
+            scale_length=None,
+            unsigned=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -616,14 +620,14 @@ class Models(object):
 
     class NumericField(Field):
         def __init__(
-                self,
-                name=None,
-                default=0.0,
-                not_null=False,
-                max_length=None,
-                scale_length=None,
-                unsigned=False,
-                comment=None,
+            self,
+            name=None,
+            default=0.0,
+            not_null=False,
+            max_length=None,
+            scale_length=None,
+            unsigned=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -638,14 +642,14 @@ class Models(object):
 
     class DecimalField(Field):
         def __init__(
-                self,
-                name=None,
-                default=0.0,
-                not_null=False,
-                max_length=None,
-                scale_length=None,
-                unsigned=False,
-                comment=None,
+            self,
+            name=None,
+            default=0.0,
+            not_null=False,
+            max_length=None,
+            scale_length=None,
+            unsigned=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -660,13 +664,13 @@ class Models(object):
 
     class TextField(Field):
         def __init__(
-                self,
-                name=None,
-                default=None,
-                charset=None,
-                max_length=None,
-                not_null=False,
-                comment=None,
+            self,
+            name=None,
+            default=None,
+            charset=None,
+            max_length=None,
+            not_null=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -680,13 +684,13 @@ class Models(object):
 
     class LongTextField(Field):
         def __init__(
-                self,
-                name=None,
-                default=None,
-                charset=None,
-                max_length=None,
-                not_null=False,
-                comment=None,
+            self,
+            name=None,
+            default=None,
+            charset=None,
+            max_length=None,
+            not_null=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -700,13 +704,13 @@ class Models(object):
 
     class MediumTextField(Field):
         def __init__(
-                self,
-                name=None,
-                default=None,
-                charset=None,
-                max_length=None,
-                not_null=False,
-                comment=None,
+            self,
+            name=None,
+            default=None,
+            charset=None,
+            max_length=None,
+            not_null=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -720,14 +724,14 @@ class Models(object):
 
     class DatetimeField(Field):
         def __init__(
-                self,
-                name=None,
-                default=None,
-                max_length=None,
-                not_null=False,
-                created_generated=False,
-                update_generated=False,
-                comment=None,
+            self,
+            name=None,
+            default=None,
+            max_length=None,
+            not_null=False,
+            created_generated=False,
+            update_generated=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -742,14 +746,14 @@ class Models(object):
 
     class DateField(Field):
         def __init__(
-                self,
-                name=None,
-                default=None,
-                max_length=None,
-                not_null=False,
-                created_generated=False,
-                update_generated=False,
-                comment=None,
+            self,
+            name=None,
+            default=None,
+            max_length=None,
+            not_null=False,
+            created_generated=False,
+            update_generated=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -764,14 +768,14 @@ class Models(object):
 
     class TimestampField(Field):
         def __init__(
-                self,
-                name=None,
-                default=None,
-                max_length=None,
-                not_null=False,
-                created_generated=False,
-                update_generated=False,
-                comment=None,
+            self,
+            name=None,
+            default=None,
+            max_length=None,
+            not_null=False,
+            created_generated=False,
+            update_generated=False,
+            comment=None,
         ):
             super().__init__(
                 name,
@@ -787,7 +791,7 @@ class Models(object):
 
     class JsonField(Field):
         def __init__(
-                self, name=None, default=None, charset=None, not_null=False, comment=None
+            self, name=None, default=None, charset=None, not_null=False, comment=None
         ):
             super().__init__(
                 name,

{cloudoll-2.3.1 → cloudoll-2.3.2}/cloudoll.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudoll
-Version: 2.3.1
+Version: 2.3.2
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur

cloudoll-2.3.1/cloudoll/__init__.py

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