piccolo 1.20.0__py3-none-any.whl → 1.21.0__py3-none-any.whl

piccolo/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.20.0"
+__VERSION__ = "1.21.0"

piccolo/query/methods/select.py

@@ -534,7 +534,7 @@ class Select(Query[TableInstance, t.List[t.Dict[str, t.Any]]]):
                 _joins.append(
                     f'LEFT JOIN {right_tablename} "{table_alias}"'
                     " ON "
-                    f'({left_tablename}."{key._meta.name}" = "{table_alias}"."{pk_name}")'  # noqa: E501
+                    f'({left_tablename}."{key._meta.db_column_name}" = "{table_alias}"."{pk_name}")'  # noqa: E501
                 )
 
             joins.extend(_joins)

{piccolo-1.20.0.dist-info → piccolo-1.21.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: piccolo
-Version: 1.20.0
+Version: 1.21.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.20.0.dist-info → piccolo-1.21.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-piccolo/__init__.py,sha256=9C2I7AvMRyI69S3jlrRv3hQ4kYCgUZBXUC_VSvY3Dv0,23
+piccolo/__init__.py,sha256=lfg4osIcO7gnlgKb0zY1KT8t1Ngd2pATD-6YnBkIDcU,23
 piccolo/custom_types.py,sha256=7HMQAze-5mieNLfbQ5QgbRQgR2abR7ol0qehv2SqROY,604
 piccolo/main.py,sha256=1VsFV67FWTUikPTysp64Fmgd9QBVa_9wcwKfwj2UCEA,5117
 piccolo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -169,7 +169,7 @@ piccolo/query/methods/insert.py,sha256=ssLJ_wn08KnOwwr7t-VILyn1P4hrvM63CfPIcAJWT
 piccolo/query/methods/objects.py,sha256=BfCOIbNMj7FWkmK5STaINkfDFmwzZvDZi60jCumjs1o,15627
 piccolo/query/methods/raw.py,sha256=wQWR8b-yA_Gr-5lqRMZe9BOAAMBAw8CqTx37qVYvM1A,987
 piccolo/query/methods/refresh.py,sha256=wg1zghKfwz-VmqK4uWa4GNMiDtK-skTqow591Hb3ONM,5854
-piccolo/query/methods/select.py,sha256=jNR7CsEPUarffYMsXytKm7iScrQ_nqpRX-5mTPrXfjg,22414
+piccolo/query/methods/select.py,sha256=41OW-DIE_wr5VdxSusMKNT2aUhzQsCwK2Qh1XqgXHg0,22424
 piccolo/query/methods/table_exists.py,sha256=0yb3n6Jd2ovSBWlZ-gl00K4E7Jnbj7J8qAAX5d7hvNk,1259
 piccolo/query/methods/update.py,sha256=LfWqIXEl1aecc0rkVssTFmwyD6wXGhlKcTrUVhtlEsw,3705
 piccolo/testing/__init__.py,sha256=pRFSqRInfx95AakOq54atmvqoB-ue073q2aR8u8zR40,83
@@ -253,7 +253,7 @@ tests/columns/test_bytea.py,sha256=doN8S1eFVU4ntSXIg4IgMSZcbvqW1WJ-AEm3OjKLGkI,1
 tests/columns/test_choices.py,sha256=q8TLe7nvGERXyGO_XEryEBR-DuWwFY1jPpscsrXjdXo,4066
 tests/columns/test_combination.py,sha256=BuBwR7k5X1EkOWraZpjqU6gvtb6ow_k-7N1KQBiW2RA,1681
 tests/columns/test_date.py,sha256=QLC6kJMQwM-1mbUP4ksJVM7P8WwjzGZyynH3rHHdSew,1030
-tests/columns/test_db_column_name.py,sha256=v0QFOQp_atqzMB1n40simVwHeBDi5nyN1N2bSPX5k6w,7670
+tests/columns/test_db_column_name.py,sha256=0wz6y4GNGy4nhMdHmYzEnChQGpK2UhWFFKrnmmML3Mk,9027
 tests/columns/test_defaults.py,sha256=rwlU1fXt3cCl7C51eLlZXqgWkE-K5W0pHvTrwkAKyCo,2896
 tests/columns/test_double_precision.py,sha256=7rhcSfDkb2fBh_zEG4UGwD_GW1sy6U9-8NooHuCS09Q,544
 tests/columns/test_get_sql_value.py,sha256=mKgsInN374jzV99y9mg_ZiG-AvnJgz36SZi89xL7RZM,1768
@@ -368,9 +368,9 @@ tests/utils/test_sql_values.py,sha256=vzxRmy16FfLZPH-sAQexBvsF9MXB8n4smr14qoEOS5
 tests/utils/test_sync.py,sha256=9ytVo56y2vPQePvTeIi9lHIouEhWJbodl1TmzkGFrSo,799
 tests/utils/test_table_reflection.py,sha256=SIzuat-IpcVj1GCFyOWKShI8YkhdOPPFH7qVrvfyPNE,3794
 tests/utils/test_warnings.py,sha256=NvSC_cvJ6uZcwAGf1m-hLzETXCqprXELL8zg3TNLVMw,269
-piccolo-1.20.0.dist-info/LICENSE,sha256=zFIpi-16uIJ420UMIG75NU0JbDBykvrdnXcj5U_EYBI,1059
-piccolo-1.20.0.dist-info/METADATA,sha256=xOURp1sxZOGQ4Q_cnDb9pYcV5XuMlDGEOZ89k9KC5f0,5178
-piccolo-1.20.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-piccolo-1.20.0.dist-info/entry_points.txt,sha256=SJPHET4Fi1bN5F3WqcKkv9SClK3_F1I7m4eQjk6AFh0,46
-piccolo-1.20.0.dist-info/top_level.txt,sha256=-SR74VGbk43VoPy1HH-mHm97yoGukLK87HE5kdBW6qM,24
-piccolo-1.20.0.dist-info/RECORD,,
+piccolo-1.21.0.dist-info/LICENSE,sha256=zFIpi-16uIJ420UMIG75NU0JbDBykvrdnXcj5U_EYBI,1059
+piccolo-1.21.0.dist-info/METADATA,sha256=CMfZm7IYerdMTQLFwzuyCPWZMlrGf1G_shqoq2LlnGM,5178
+piccolo-1.21.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+piccolo-1.21.0.dist-info/entry_points.txt,sha256=SJPHET4Fi1bN5F3WqcKkv9SClK3_F1I7m4eQjk6AFh0,46
+piccolo-1.21.0.dist-info/top_level.txt,sha256=-SR74VGbk43VoPy1HH-mHm97yoGukLK87HE5kdBW6qM,24
+piccolo-1.21.0.dist-info/RECORD,,

{piccolo-1.20.0.dist-info → piccolo-1.21.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/columns/test_db_column_name.py

@@ -1,12 +1,20 @@
-from piccolo.columns.column_types import Integer, Serial, Varchar
-from piccolo.table import Table
+import typing as t
+
+from piccolo.columns.column_types import ForeignKey, Integer, Serial, Varchar
+from piccolo.table import Table, create_db_tables_sync, drop_db_tables_sync
 from tests.base import DBTestCase, engine_is, engines_only, engines_skip
 
 
+class Manager(Table):
+    id: Serial
+    name = Varchar()
+
+
 class Band(Table):
     id: Serial
     name = Varchar(db_column_name="regrettable_column_name")
     popularity = Integer()
+    manager = ForeignKey(Manager, db_column_name="manager_fk")
 
 
 class TestDBColumnName(DBTestCase):
@@ -22,10 +30,15 @@ class TestDBColumnName(DBTestCase):
     """
 
     def setUp(self):
-        Band.create_table().run_sync()
+        create_db_tables_sync(Band, Manager)
 
     def tearDown(self):
-        Band.alter().drop_table().run_sync()
+        drop_db_tables_sync(Band, Manager)
+
+    def insert_band(self, manager: t.Optional[Manager] = None) -> Band:
+        band = Band(name="Pythonistas", popularity=1000, manager=manager)
+        band.save().run_sync()
+        return band
 
     @engines_only("postgres", "cockroach")
     def test_column_name_correct(self):
@@ -45,8 +58,7 @@ class TestDBColumnName(DBTestCase):
         """
         Make sure save queries work correctly.
         """
-        band = Band(name="Pythonistas", popularity=1000)
-        band.save().run_sync()
+        self.insert_band()
 
         band_from_db = Band.objects().first().run_sync()
         assert band_from_db is not None
@@ -56,11 +68,7 @@ class TestDBColumnName(DBTestCase):
         """
         Make sure create queries work correctly.
         """
-        band = (
-            Band.objects()
-            .create(name="Pythonistas", popularity=1000)
-            .run_sync()
-        )
+        band = self.insert_band()
         self.assertEqual(band.name, "Pythonistas")
 
         band_from_db = Band.objects().first().run_sync()
@@ -74,7 +82,7 @@ class TestDBColumnName(DBTestCase):
         name to it's alias, but it's hard to predict what behaviour the user
         wants.
         """
-        Band.objects().create(name="Pythonistas", popularity=1000).run_sync()
+        self.insert_band()
 
         # Make sure we can select all columns
         bands = Band.select().run_sync()
@@ -86,6 +94,7 @@ class TestDBColumnName(DBTestCase):
                         "id": bands[0]["id"],
                         "regrettable_column_name": "Pythonistas",
                         "popularity": 1000,
+                        "manager_fk": None,
                     }
                 ],
             )
@@ -97,6 +106,7 @@ class TestDBColumnName(DBTestCase):
                         "id": 1,
                         "regrettable_column_name": "Pythonistas",
                         "popularity": 1000,
+                        "manager_fk": None,
                     }
                 ],
             )
@@ -123,11 +133,36 @@ class TestDBColumnName(DBTestCase):
             ],
         )
 
+    def test_join(self):
+        """
+        Make sure that foreign keys with a ``db_column_name`` specified still
+        work for joins.
+
+        https://github.com/piccolo-orm/piccolo/issues/1101
+
+        """
+        manager = Manager.objects().create(name="Guido").run_sync()
+        band = self.insert_band(manager=manager)
+
+        bands = Band.select().where(Band.manager.name == "Guido").run_sync()
+
+        self.assertListEqual(
+            bands,
+            [
+                {
+                    "id": band.id,
+                    "manager_fk": manager.id,
+                    "popularity": 1000,
+                    "regrettable_column_name": "Pythonistas",
+                }
+            ],
+        )
+
     def test_update(self):
         """
         Make sure update queries work correctly.
         """
-        Band.objects().create(name="Pythonistas", popularity=1000).run_sync()
+        self.insert_band()
 
         Band.update({Band.name: "Pythonistas 2"}, force=True).run_sync()
 
@@ -140,6 +175,7 @@ class TestDBColumnName(DBTestCase):
                         "id": bands[0]["id"],
                         "regrettable_column_name": "Pythonistas 2",
                         "popularity": 1000,
+                        "manager_fk": None,
                     }
                 ],
             )
@@ -151,6 +187,7 @@ class TestDBColumnName(DBTestCase):
                         "id": 1,
                         "regrettable_column_name": "Pythonistas 2",
                         "popularity": 1000,
+                        "manager_fk": None,
                     }
                 ],
             )
@@ -166,6 +203,7 @@ class TestDBColumnName(DBTestCase):
                         "id": bands[0]["id"],
                         "regrettable_column_name": "Pythonistas 3",
                         "popularity": 1000,
+                        "manager_fk": None,
                     }
                 ],
             )
@@ -177,6 +215,7 @@ class TestDBColumnName(DBTestCase):
                         "id": 1,
                         "regrettable_column_name": "Pythonistas 3",
                         "popularity": 1000,
+                        "manager_fk": None,
                     }
                 ],
             )
@@ -199,11 +238,13 @@ class TestDBColumnName(DBTestCase):
                     "id": 1,
                     "regrettable_column_name": "Pythonistas",
                     "popularity": 1000,
+                    "manager_fk": None,
                 },
                 {
                     "id": 2,
                     "regrettable_column_name": "Rustaceans",
                     "popularity": 500,
+                    "manager_fk": None,
                 },
             ],
         )
@@ -218,6 +259,7 @@ class TestDBColumnName(DBTestCase):
                     "id": 1,
                     "regrettable_column_name": "Pythonistas",
                     "popularity": 1000,
+                    "manager_fk": None,
                 }
             ],
         )
@@ -244,11 +286,13 @@ class TestDBColumnName(DBTestCase):
                     "id": result[0]["id"],
                     "regrettable_column_name": "Pythonistas",
                     "popularity": 1000,
+                    "manager_fk": None,
                 },
                 {
                     "id": result[1]["id"],
                     "regrettable_column_name": "Rustaceans",
                     "popularity": 500,
+                    "manager_fk": None,
                 },
             ],
         )
@@ -263,6 +307,7 @@ class TestDBColumnName(DBTestCase):
                     "id": result[0]["id"],
                     "regrettable_column_name": "Pythonistas",
                     "popularity": 1000,
+                    "manager_fk": None,
                 }
             ],
         )