cloudoll 3.0.7__tar.gz → 3.0.8__tar.gz

{cloudoll-3.0.7 → cloudoll-3.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudoll
-Version: 3.0.7
+Version: 3.0.8
 Summary: Assist in quickly creating distributable microservices based on aiohttp, with a focus on simplicity and ease of use.
 Home-page: https://github.com/smallerqiu/cloudoll-py
 Author: Qiu

cloudoll-3.0.8/cloudoll/__init__.py

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

{cloudoll-3.0.7 → cloudoll-3.0.8}/cloudoll/orm/__init__.py

@@ -3,8 +3,7 @@ from cloudoll.orm.parse import parse_coon
 import aiopg as pg
 from .mysql import Mysql
 from .postgres import Postgres
-from .awspostgres import AwsPostgres
-from .awsmysql import AwsMysql
+
 
 __all__ = ["create_engine"]
 
@@ -27,8 +26,12 @@ async def create_engine(**kw):
     if driver == "mysql":
         return await Mysql().create_engine(**configs, **query)
     elif driver == "aws-mysql":
+        from .awsmysql import AwsMysql
+
         return await AwsMysql().create_engine(**configs, **query)
     elif driver in ["aws-postgres", "aws-postgressql"]:
+        from .awspostgres import AwsPostgres
+
         return await AwsPostgres().create_engine(**configs, **query)
     elif driver in ["postgres", "postgressql"]:
         return await Postgres().create_engine(**configs, **query)

{cloudoll-3.0.7 → cloudoll-3.0.8}/cloudoll/orm/awsmysql.py

@@ -34,7 +34,7 @@ class AwsMysql(MeteBase):
             with AwsWrapperConnection.connect(
                 Connect, self._dsn, **self._params
             ) as conn:
-                with conn.cursor() as cursor:
+                with conn.cursor(dictionary=True) as cursor:
                     if (
                         query_type == QueryTypes.CREATEBATCH
                         or query_type == QueryTypes.UPDATEBATCH

{cloudoll-3.0.7 → cloudoll-3.0.8}/cloudoll/orm/awspostgres.py

@@ -7,7 +7,7 @@ from aws_advanced_python_wrapper.sql_alchemy_connection_provider import (
 
 from cloudoll.orm.base import MeteBase, QueryTypes
 from cloudoll.logging import info, error
-
+from psycopg2.extras import RealDictCursor
 
 class AwsPostgres(MeteBase):
     def __init__(self):
@@ -33,7 +33,7 @@ class AwsPostgres(MeteBase):
             with AwsWrapperConnection.connect(
                 psycopg.Connection.connect, self._dsn, **self._params
             ) as conn:
-                with conn.cursor() as cursor:
+                with conn.cursor(cursor_factory=RealDictCursor) as cursor:
                     if (
                         query_type == QueryTypes.CREATEBATCH
                         or query_type == QueryTypes.UPDATEBATCH

{cloudoll-3.0.7 → cloudoll-3.0.8}/cloudoll/orm/mysql.py

@@ -19,7 +19,7 @@ class AttrDictCursor(aiomysql.DictCursor):
 
 class Mysql(MeteBase):
     def __init__(self):
-        self.pool: aiomysql.Pool
+        self.pool: Optional[aiomysql.Pool] = None
         self.driver = "mysql"
 
     def __call__(self, *args: Any, **kwds: Any) -> Any:

{cloudoll-3.0.7 → cloudoll-3.0.8}/cloudoll/orm/postgres.py

@@ -1,4 +1,5 @@
 import aiopg
+from psycopg2.extras import RealDictCursor
 from cloudoll.logging import error
 from cloudoll.orm.base import MeteBase, QueryTypes
 from cloudoll.logging import info, error
@@ -35,7 +36,7 @@ class Postgres(MeteBase):
             if conn.echo:
                 info("sql: %s ,%s", sql, params)
 
-            async with conn.cursor() as cursor:
+            async with conn.cursor(cursor_factory=RealDictCursor) as cursor:
                 # current_cursor = getattr(cursor, 'lastrowid', None)
                 if (
                     query_type == QueryTypes.CREATEBATCH
@@ -48,21 +49,12 @@ class Postgres(MeteBase):
                 # await conn.commit()
                 result = None
 
-                if query_type == QueryTypes.ALL and cursor.description is not None:
-                    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 and cursor.description is not None:
-                    columns = [desc[0] for desc in cursor.description]
-                    row = await cursor.fetchone()
-                    result = dict(zip(columns, row)) if row else {}
-                    return result
-                elif query_type == QueryTypes.MANY and cursor.description is not None:
-                    columns = [desc[0] for desc in cursor.description]
-                    rows = await cursor.fetchmany(size)
-                    result = [dict(zip(columns, row)) for row in rows]
-                    return result
+                if query_type == QueryTypes.ALL: 
+                    return await cursor.fetchall()
+                elif query_type == QueryTypes.ONE:
+                    return await cursor.fetchone()
+                elif query_type == QueryTypes.MANY:
+                    return await cursor.fetchmany(size)
                 elif query_type == QueryTypes.COUNT:
                     result = await cursor.fetchone()
                     count = 0

{cloudoll-3.0.7 → cloudoll-3.0.8}/cloudoll.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudoll
-Version: 3.0.7
+Version: 3.0.8
 Summary: Assist in quickly creating distributable microservices based on aiohttp, with a focus on simplicity and ease of use.
 Home-page: https://github.com/smallerqiu/cloudoll-py
 Author: Qiu

{cloudoll-3.0.7 → cloudoll-3.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cloudoll"
-version = "3.0.7" 
+version = "3.0.8" 
 description = "Assist in quickly creating distributable microservices based on aiohttp, with a focus on simplicity and ease of use."
 authors = [
   {name = "Qiu", email = "smallerqiu@gmail.com"},

cloudoll-3.0.7/cloudoll/__init__.py

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