piccolo 1.13.0__tar.gz → 1.14.0__tar.gz

{piccolo-1.13.0 → piccolo-1.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: piccolo
-Version: 1.13.0
+Version: 1.14.0
 Summary: A fast, user friendly ORM and query builder which supports asyncio.
 Home-page: https://github.com/piccolo-orm/piccolo
 Author: Daniel Townsend

piccolo-1.14.0/piccolo/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "1.14.0"

{piccolo-1.13.0 → piccolo-1.14.0}/piccolo/columns/base.py

@@ -250,11 +250,11 @@ class ColumnMeta:
 
         if self.call_chain:
             column_name = (
-                "$".join(
+                ".".join(
                     t.cast(str, i._meta.db_column_name)
                     for i in self.call_chain
                 )
-                + f"${column_name}"
+                + f".{column_name}"
             )
 
         return column_name
@@ -291,7 +291,7 @@ class ColumnMeta:
                 'band$manager.name'
 
                 >>> Band.manager.name._meta.get_full_name(with_alias=True)
-                'band$manager.name AS "manager$name"'
+                'band$manager.name AS "manager.name"'
 
         :param include_quotes:
             If you're using the name in a SQL query, each component needs to be

{piccolo-1.13.0 → piccolo-1.14.0}/piccolo/engine/base.py

@@ -132,6 +132,13 @@ class Engine(t.Generic[TransactionClass], metaclass=ABCMeta):
     ):
         pass
 
+    def transform_response_to_dicts(self, results) -> t.List[t.Dict]:
+        """
+        If the database adapter returns something other than a list of
+        dictionaries, it should perform the transformation here.
+        """
+        return results
+
     @abstractmethod
     async def run_ddl(self, ddl: str, in_pool: bool = True):
         pass

{piccolo-1.13.0 → piccolo-1.14.0}/piccolo/engine/postgres.py

@@ -579,6 +579,13 @@ class PostgresEngine(Engine[PostgresTransaction]):
 
         return response
 
+    def transform_response_to_dicts(self, results) -> t.List[t.Dict]:
+        """
+        asyncpg returns a special Record object, so we need to convert it to
+        a dict.
+        """
+        return [dict(i) for i in results]
+
     def atomic(self) -> Atomic:
         return Atomic(engine=self)
 

{piccolo-1.13.0 → piccolo-1.14.0}/piccolo/query/base.py

@@ -45,20 +45,11 @@ class Query(t.Generic[TableInstance, QueryResponseType]):
             raise ValueError("Engine isn't defined.")
 
     async def _process_results(self, results) -> QueryResponseType:
-        if results:
-            keys = results[0].keys()
-            keys = [i.replace("$", ".") for i in keys]
-            if self.engine_type in ("postgres", "cockroach"):
-                # asyncpg returns a special Record object. We can pass it
-                # directly into zip without calling `values` on it. This can
-                # save us hundreds of microseconds, depending on the number of
-                # results.
-                raw = [dict(zip(keys, i)) for i in results]
-            else:
-                # SQLite returns a list of dictionaries.
-                raw = [dict(zip(keys, i.values())) for i in results]
-        else:
-            raw = []
+        raw = (
+            self.table._meta.db.transform_response_to_dicts(results)
+            if results
+            else []
+        )
 
         if hasattr(self, "_raw_response_callback"):
             self._raw_response_callback(raw)

{piccolo-1.13.0 → piccolo-1.14.0}/piccolo/query/methods/select.py

@@ -36,7 +36,13 @@ if t.TYPE_CHECKING:  # pragma: no cover
     from piccolo.table import Table  # noqa
 
 # Here to avoid breaking changes - will be removed in the future.
-from piccolo.query.functions.aggregate import Count  # noqa: F401
+from piccolo.query.functions.aggregate import (  # noqa: F401
+    Avg,
+    Count,
+    Max,
+    Min,
+    Sum,
+)
 
 
 class SelectRaw(Selectable):
@@ -568,7 +574,7 @@ class Select(Query[TableInstance, t.List[t.Dict[str, t.Any]]]):
         query += "{}"
         args.append(distinct.querystring)
 
-        columns_str = ", ".join("{}" for i in select_strings)
+        columns_str = ", ".join("{}" for _ in select_strings)
         query += f" {columns_str} FROM {self.table._meta.get_formatted_tablename()}"  # noqa: E501
         args.extend(select_strings)
 

{piccolo-1.13.0 → piccolo-1.14.0}/piccolo/querystring.py

@@ -246,7 +246,7 @@ class QueryString(Selectable):
         self, engine_type: str, with_alias: bool = True
     ) -> QueryString:
         if with_alias and self._alias:
-            return QueryString("{} AS " + self._alias, self)
+            return QueryString("{} AS " + f'"{self._alias}"', self)
         else:
             return self
 

{piccolo-1.13.0 → piccolo-1.14.0}/piccolo/utils/pydantic.py

@@ -206,7 +206,7 @@ def create_pydantic_model(
     ###########################################################################
 
     columns: t.Dict[str, t.Any] = {}
-    validators: t.Dict[str, classmethod] = {}
+    validators: t.Dict[str, t.Callable] = {}
 
     piccolo_columns = tuple(
         table._meta.columns

{piccolo-1.13.0 → piccolo-1.14.0}/piccolo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: piccolo
-Version: 1.13.0
+Version: 1.14.0
 Summary: A fast, user friendly ORM and query builder which supports asyncio.
 Home-page: https://github.com/piccolo-orm/piccolo
 Author: Daniel Townsend

piccolo-1.13.0/piccolo/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "1.13.0"