cloudoll 2.2.19__tar.gz → 2.2.23__tar.gz

{cloudoll-2.2.19 → cloudoll-2.2.23}/PKG-INFO

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

cloudoll-2.2.23/cloudoll/__init__.py

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

{cloudoll-2.2.19 → cloudoll-2.2.23}/cloudoll/orm/__init__.py

@@ -26,7 +26,7 @@ async def create_engine(**kw):
 
     if driver == "mysql":
         return await Mysql().create_engine(**configs, **query)
-    elif driver == "postgres":
+    elif driver == "postgres" or driver == "postgressql":
         return await Postgres().create_engine(**configs, **query)
     elif driver == "redis" or driver == "rediss":
         """
@@ -62,26 +62,30 @@ class Postgres(MeteBase):
 
                 # if query_type.value > 4:
                 # if self.driver == "mysql":
+                # print(columns)
                 # await conn.commit()
                 # elif self.driver == "postgres":
-                columns = [desc[0] for desc in cursor.description]
                 result = None
 
                 if query_type == QueryTypes.ALL:
+                    columns = [desc[0] for desc in cursor.description]
                     rows = await cursor.fetchall()
                     result = [dict(zip(columns, row)) for row in rows]
                     return result
                 elif query_type == QueryTypes.ONE:
-                    rows = await cursor.fetchone()
-                    result = dict(zip(columns, rows))
+                    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:
+                    columns = [desc[0] for desc in cursor.description]
                     rows = await cursor.fetchmany(size)
                     result = [dict(zip(columns, row)) for row in rows]
                     return result
                 elif query_type == QueryTypes.COUNT:
                     rs = await cursor.fetchone()
-                    return rs[0]
+                    return rs[0] if row else 0
                 elif query_type == QueryTypes.CREATE:
                     result = cursor.rowcount > 0
                     id = cursor.lastrowid

{cloudoll-2.2.19 → cloudoll-2.2.23}/cloudoll/orm/field.py

@@ -354,6 +354,7 @@ class Field(FieldBase):
         primary_key=False,  # 主键
         charset=None,  # 编码
         max_length=None,  # 长度
+        scale_length=None, # 精度
         auto_increment=False,  # 自增
         NOT_NULL=False,  # 非空
         created_generated=False,  # 创建时for datetime
@@ -371,6 +372,7 @@ class Field(FieldBase):
         self.charset = charset
         self.default = default
         self.max_length = max_length
+        self.scale_length = scale_length
         self.auto_increment = auto_increment
         self.NOT_NULL = NOT_NULL
         self.created_generated = created_generated

{cloudoll-2.2.19 → cloudoll-2.2.23}/cloudoll/orm/model.py

@@ -3,6 +3,7 @@ from ..logging import print_warn
 from functools import reduce
 import operator
 import copy
+import re
 import datetime
 from ..utils.common import Object
 
@@ -127,6 +128,8 @@ class Model(metaclass=ModelMetaclass):
 
     def _get_primary(self):
         pk = self.__primary_key__
+        if pk is None:
+            return None, None
         pkf = getattr(self, pk)
         return pk, pkf.value
 
@@ -144,14 +147,14 @@ class Model(metaclass=ModelMetaclass):
     @classmethod
     def use(cls, pool=None):
         cls.__pool__ = pool
+        cls.__ispg = cls.__pool__.driver == "postgres"
         return cls()
 
     def select(cls, *args):
         cols = []
-        is_pg = cls.__pool__.driver == "postgres"
         for col in args:
             if isinstance(col, Field):
-                cols.append(col.name if is_pg else col.full_name)
+                cols.append(col.name if cls.__ispg else col.full_name)
             elif isinstance(col, Function):
                 q, p = col.sql()
                 cols.append(q)
@@ -190,12 +193,13 @@ class Model(metaclass=ModelMetaclass):
 
     def order_by(self, *args):
         by = []
-        is_pg = self.__pool__.driver == "postgres"
         for f in args:
             if isinstance(f, str):
                 by.append(f)
             else:
-                by.append(f"{f.lhs.name if is_pg else f.lhs.full_name} {f.op}")
+                by.append(
+                    f"{f.lhs.name if self.__ispg else f.lhs.full_name} {f.op}"
+                )
         if self.__order_by__ is not None:
             by = self.__order_by__ + by
         self.__order_by__ = by
@@ -203,15 +207,14 @@ class Model(metaclass=ModelMetaclass):
 
     def group_by(self, *args):
         by = []
-        is_pg = self.__pool__.driver == "postgres"
         for f in args:
-            by.append(f.name if is_pg else f.full_name)
+            by.append(f.name if self.__ispg else f.full_name)
         if self.__group_by__ is not None:
             by = self.__group_by__ + by
         self.__group_by__ = by
         return self
 
-    def _get_key_args(self, args):
+    def _get_key_args(self, action, args):
         data = dict()
         md = None
         if args is None or not args:
@@ -226,7 +229,9 @@ class Model(metaclass=ModelMetaclass):
                 md = item
                 if isinstance(item, Model):
                     for k in item.__dict__:
-                        data[k] = item[k]
+                        if (action == 'u' and item[k].value) or action == 'i':
+                            data[k] = item[k]
+
                 else:  # for object
                     for k, v in item.items():
                         data[k] = v
@@ -292,21 +297,44 @@ class Model(metaclass=ModelMetaclass):
     async def one(self):
         self.limit(1)
         sql = self._sql()
+        sql = self._exchange_sql(sql)
         args = self.__params__
         rs = await self.__pool__.one(sql, args)
         if rs:
+            # join 时返回dict
+            result = Object(rs) if self.__join__ is not None else self(**rs)
             self._reset()
+            return result
             # return self(**rs)
-            return Object(rs)
+            # return Object(rs)
             # return cls(**rs)
         return None
 
     async def all(self):
         sql = self._sql()
+        sql = self._exchange_sql(sql)
         args = self.__params__
         self._reset()
         return await self.__pool__.all(sql, args)
 
+    def _exchange_sql(self, sql: str):
+        if self.__ispg:
+            sql = sql.replace("CURDATE()", "CURRENT_DATE")
+            sql = sql.replace("NOW()", "CURRENT_TIMESTAMP")
+
+            pattern = r"INTERVAL\s+(\d+)\s+(DAY|MONTH|YEAR|HOUR|MINUTE|SECOND)"
+            matches = re.findall(pattern, sql)
+
+            def replacement(match):
+                number = match.group(1)
+                unit = match.group(2).lower()  # 转换为小写
+                return f"INTERVAL '{number} {unit}'"
+
+            if matches:
+                sql = re.sub(pattern, replacement, sql)
+
+        return sql
+
     async def update(self, *args, **kw) -> bool:
         """
         Update data
@@ -315,7 +343,7 @@ class Model(metaclass=ModelMetaclass):
         # where = self.__where__
         where = self._literal("WHERE", self.__where__)
 
-        keys, params, md = self._get_key_args(args or kw)
+        keys, params, md = self._get_key_args('u', args or kw)
 
         sql = f"update `{table}` set {keys} {where}"
 
@@ -336,6 +364,7 @@ class Model(metaclass=ModelMetaclass):
             else:
                 raise "Need where or primary key"
         self._reset()
+        sql = self._exchange_sql(sql)
         return await self.__pool__.update(sql, params)
 
     async def delete(self) -> bool:
@@ -355,11 +384,12 @@ class Model(metaclass=ModelMetaclass):
             else:
                 raise "need where or primary key"
         self._reset()
+        sql = self._exchange_sql(sql)
         return await self.__pool__.delete(sql, args)
 
     async def insert(self, *args, **kw):
         table = self.__table__
-        keys, params, md = self._get_key_args(args or kw)
+        keys, params, md = self._get_key_args('i', args or kw)
         sql = f"insert into `{table}` set {keys}"
         self._reset()
         return await self.__pool__.create(sql, params)
@@ -373,6 +403,7 @@ class Model(metaclass=ModelMetaclass):
         aft = " ".join([JOIN, WHERE])
         sql = f"SELECT COUNT(*) FROM {cls.__table__} {aft}"
         args = cls.__params__
+        sql = self._exchange_sql(sql)
         return await cls.__pool__.count(sql, args)
 
 
@@ -509,6 +540,7 @@ class Models(object):
             default=None,
             not_null=False,
             max_length=None,
+            scale_length=None,
             unsigned=False,
             comment=None,
         ):
@@ -518,7 +550,30 @@ class Models(object):
                 default,
                 NOT_NULL=not_null,
                 max_length=max_length,
+                scale_length=scale_length,
+                unsigned=unsigned,
+                comment=comment,
+            )
+
+    class NumericField(Field):
+        def __init__(
+            self,
+            name=None,
+            default=0.0,
+            not_null=False,
+            max_length=None,
+            scale_length=None,
+            unsigned=False,
+            comment=None,
+        ):
+            super().__init__(
+                name,
+                "numeric",
+                default,
+                NOT_NULL=not_null,
                 unsigned=unsigned,
+                max_length=max_length,
+                scale_length=scale_length,
                 comment=comment,
             )
 
@@ -529,6 +584,7 @@ class Models(object):
             default=0.0,
             not_null=False,
             max_length=None,
+            scale_length=None,
             unsigned=False,
             comment=None,
         ):
@@ -539,6 +595,7 @@ class Models(object):
                 NOT_NULL=not_null,
                 unsigned=unsigned,
                 max_length=max_length,
+                scale_length=scale_length,
                 comment=comment,
             )
 

{cloudoll-2.2.19 → cloudoll-2.2.23}/cloudoll/utils/m2d.py

@@ -6,12 +6,12 @@ import importlib
 
 
 def snake_to_camel(snake_str):
-    components = snake_str.split('_')
+    components = snake_str.split("_")
     # camel_str = components[0] + ''.join(x.title() for x in components[1:])
     # x.capitalize() //first
     # x.title() //all
     # return camel_str[0].upper() + camel_str[1:]
-    return ''.join(x.title() for x in components[0:])
+    return "".join(x.title() for x in components[0:])
 
 
 async def create_model(pool, table_name) -> str:
@@ -27,6 +27,7 @@ async def create_model(pool, table_name) -> str:
     tb += f"\t__table__ = '{table_name}'\n\n"
     for f in rows:
         fields = get_col(f, pool.driver)
+        # print("fields",fields)
         name = fields["name"]
         column_type = fields["column_type"]
         values = []
@@ -40,6 +41,8 @@ async def create_model(pool, table_name) -> str:
                 if isinstance(fields["max_length"], str) and "," in fields["max_length"]
                 else f"max_length={fields['max_length']}"
             )
+        if fields["scale_length"]:
+            values.append(f"scale_length={fields['scale_length']}")
         if fields["default"]:
             values.append(f"default='{fields['default']}'")
         if fields["auto_increment"]:
@@ -65,16 +68,28 @@ async def get_table_cols(pool, table_name):
     if pool.driver == "mysql":
         return await pool.all(f"show full COLUMNS from `{table_name}`", None)
     elif pool.driver == "postgres":
+        pri_row = await pool.one(
+            f"SELECT column_name from information_schema.key_column_usage WHERE table_name = '{table_name}'",
+            None,
+        )
         sql = f"""SELECT column_name Field, 
             column_default Default,
             data_type column_type, 
             is_nullable Null,
             numeric_precision num_length,
+            numeric_scale scale_length,
             character_maximum_length str_length,
             datetime_precision date_length,
             col_description('{table_name}'::regclass, ordinal_position) Comment
             FROM information_schema.columns WHERE table_name ='{table_name}'"""
-        return await pool.all(sql, None)
+
+        rows = await pool.all(sql, None)
+        for row in rows:
+            row["Key"] = "PRI" if pri_row and pri_row["column_name"] == row["field"] else None
+       
+        # print("rows", rows)
+        
+        return rows
     else:
         raise ValueError("Database not support.")
 
@@ -91,7 +106,6 @@ async def get_all_tables(pool):
         raise ValueError("Database not support.")
 
 
-
 async def create_models(pool, save_path: str = None, tables: list = None):
     """
     Create models
@@ -201,16 +215,17 @@ def get_col(field, driver="mysql"):
             fields["column_type"] = t.groups()[0]
             fields["max_length"] = t.groups()[1]
         return fields
-    elif driver == "postgres":
+    elif driver == "postgres" or driver == "postgresql":
         fields = {
             "name": field["field"],
             "column_type": field["column_type"].replace(" ", "_"),
-            "primary_key": False,
+            "primary_key": field["Key"] == "PRI",
             "default": field["default"],
             "charset": None,
             "max_length": field["num_length"]
             or field["str_length"]
             or field["date_length"],
+            "scale_length": field["scale_length"],
             "auto_increment": None,
             "NOT_NULL": field["null"] == "NO",
             "created_generated": None,
@@ -224,11 +239,12 @@ def get_col_sql(field):
     sql = f"`{field.name}` {field.column_type}"
 
     if field.max_length:
-        sql += (
-            f"{field.max_length}"
-            if isinstance(field.max_length, tuple)
-            else f"({field.max_length})"
-        )
+        if isinstance(field.max_length, tuple):
+            sql += f"{field.max_length}"
+        elif field.scale_length:
+            sql += f"({field.max_length},{field.scale_length})"
+        else:
+            sql += f"({field.max_length})"
 
     if field.charset:
         # _ci 不区分大小写 _cs Yes
@@ -279,14 +295,15 @@ class ColTypes(enum.Enum):
     float = "Float"
     double = "Double"
     decimal = "Decimal"
+    numeric = "Numeric"
     date = "Date"
     datetime = "Datetime"
     timestamp = "Timestamp"
     json = "Json"
     # pg
     timestamp_with_time_zone = "Timestamp"
+    timestamp_without_time_zone = "Timestamp"
     character_varying = "VarChar"
+    character = "Char"
     integer = "Integer"
     boolean = "Boolean"
-    
-    

{cloudoll-2.2.19 → cloudoll-2.2.23}/cloudoll.egg-info/PKG-INFO

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

cloudoll-2.2.19/cloudoll/__init__.py

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