piccolo 1.12.0__tar.gz → 1.13.1__tar.gz

{piccolo-1.12.0 → piccolo-1.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: piccolo
-Version: 1.12.0
+Version: 1.13.1
 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.1/piccolo/__init__.py

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

{piccolo-1.12.0 → piccolo-1.13.1}/piccolo/columns/column_types.py

@@ -363,7 +363,7 @@ class Email(Varchar):
     Used for storing email addresses. It's identical to :class:`Varchar`,
     except when using :func:`create_pydantic_model <piccolo.utils.pydantic.create_pydantic_model>` -
     we add email validation to the Pydantic model. This means that :ref:`PiccoloAdmin`
-    also validates emails addresses.
+    also validates email addresses.
     """  # noqa: E501
 
     pass
@@ -2183,7 +2183,7 @@ class ForeignKey(Column, t.Generic[ReferencedTable]):
         # If the ForeignKey is using a lazy reference, we need to set the
         # attributes here. Attributes starting with an underscore are
         # unlikely to be column names.
-        if not name.startswith("__"):
+        if not name.startswith("_") and name not in dir(self):
             try:
                 _foreign_key_meta = object.__getattribute__(
                     self, "_foreign_key_meta"
@@ -2196,12 +2196,9 @@ class ForeignKey(Column, t.Generic[ReferencedTable]):
                 ):
                     object.__getattribute__(self, "set_proxy_columns")()
 
-        try:
-            value = object.__getattribute__(self, name)
-        except AttributeError:
-            raise AttributeError
+        value = object.__getattribute__(self, name)
 
-        if name == "_":
+        if name.startswith("_"):
             return value
 
         foreignkey_class: t.Type[ForeignKey] = object.__getattribute__(

{piccolo-1.12.0 → piccolo-1.13.1}/piccolo/columns/reference.py

@@ -30,6 +30,9 @@ class LazyTableReference:
         If specified, the ``Table`` subclass is imported from this path.
         For example, ``'my_app.tables'``.
 
+        .. hint::
+            If the table is in the same file, you can pass in ``__name__``.
+
     """
 
     table_class_name: str

{piccolo-1.12.0 → piccolo-1.13.1}/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):

{piccolo-1.12.0 → piccolo-1.13.1}/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.12.0 → piccolo-1.13.1}/piccolo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: piccolo
-Version: 1.12.0
+Version: 1.13.1
 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.12.0 → piccolo-1.13.1}/tests/columns/test_reference.py

@@ -5,10 +5,41 @@ piccolo/columns/test_foreignkey.py
 
 from unittest import TestCase
 
+from piccolo.columns import ForeignKey, Varchar
 from piccolo.columns.reference import LazyTableReference
+from piccolo.table import Table
+from tests.base import TableTest
 
 
-class TestLazyTableReference(TestCase):
+class Band(Table):
+    manager: ForeignKey["Manager"] = ForeignKey(
+        LazyTableReference("Manager", module_path=__name__)
+    )
+    name = Varchar()
+
+
+class Manager(Table):
+    name = Varchar()
+
+
+class TestQueries(TableTest):
+    tables = [Band, Manager]
+
+    def setUp(self):
+        super().setUp()
+        manager = Manager({Manager.name: "Guido"})
+        manager.save().run_sync()
+        band = Band({Band.name: "Pythonistas", Band.manager: manager})
+        band.save().run_sync()
+
+    def test_select(self):
+        self.assertListEqual(
+            Band.select(Band.name, Band.manager._.name).run_sync(),
+            [{"name": "Pythonistas", "manager.name": "Guido"}],
+        )
+
+
+class TestInit(TestCase):
     def test_init(self):
         """
         A ``LazyTableReference`` must be passed either an ``app_name`` or
@@ -34,6 +65,8 @@ class TestLazyTableReference(TestCase):
             module_path="tests.example_apps.music.tables",
         )
 
+
+class TestStr(TestCase):
     def test_str(self):
         self.assertEqual(
             LazyTableReference(

piccolo-1.12.0/piccolo/__init__.py

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