clear-skies 1.21.2__py3-none-any.whl → 1.21.3__py3-none-any.whl

{clear_skies-1.21.2.dist-info → clear_skies-1.21.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.21.2
+Version: 1.21.3
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT

{clear_skies-1.21.2.dist-info → clear_skies-1.21.3.dist-info}/RECORD

@@ -59,7 +59,7 @@ clearskies/column_types/__init__.py,sha256=wofhLfyW00I6tb6o9DMsMx7j9hlbbqefhDzWf
 clearskies/column_types/audit.py,sha256=2YcrZVVElpOUdmxYTQ_6CshL1HVou6fz65dOOs_b8Gw,9659
 clearskies/column_types/belongs_to.py,sha256=tH1tbTOfjifSNuVjO-KbMF7GiUIoLfcDItrrS3TGGM8,11044
 clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR51AUkQ,1878
-clearskies/column_types/category_tree.py,sha256=5Wt3W2c2CvqiURqlFBORMvK0TK6qAhgzhx3wP8WfJSc,13167
+clearskies/column_types/category_tree.py,sha256=kPx0fNTJxHaaEI_-0JxQ7NBcV2bYgUDGmtf1wmTqoEg,13172
 clearskies/column_types/column.py,sha256=ftuDFswjk-KE9Frxo1rhgkjr4sjSjnUc5ZtfNrnGLIc,15530
 clearskies/column_types/created.py,sha256=LIWSzPJ9rbHuk1u53pNvKtVCOG9y9XCn-mEEsSi97Zc,649
 clearskies/column_types/created_by_authorization_data.py,sha256=--1w1TOSo2CMwrpn6Y_iorl2RTqLgG8MbR8k27qreew,1108
@@ -205,7 +205,7 @@ clearskies/tests/simple_api/models/__init__.py,sha256=nUA0W6fgXw_Bxa9CudkaDkC80t
 clearskies/tests/simple_api/models/status.py,sha256=PEhPbaQh5qdUNHp8O0gz91LOLENAEBtqSaHxUPXchaM,699
 clearskies/tests/simple_api/models/user.py,sha256=5_P4Tp1tTdX7PkMJ__epPM5MA7JAeVYGas69vcWloLc,819
 clearskies/tests/simple_api/users_api.py,sha256=KYXCgEofDxHeRdQK67txN5oYUPvxxmB8JTku7L-apk4,2344
-clear_skies-1.21.2.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.21.2.dist-info/METADATA,sha256=lvnx3rHgpMbUzIpeFsfGbjnLa98Bx4mHMMbHmRXfUkk,1817
-clear_skies-1.21.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.21.2.dist-info/RECORD,,
+clear_skies-1.21.3.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.21.3.dist-info/METADATA,sha256=tV9vLb2zbcNwdE9QlBah3O39Kec5D4im3eO4dowTkTI,1817
+clear_skies-1.21.3.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.21.3.dist-info/RECORD,,

clearskies/column_types/category_tree.py

@@ -257,7 +257,7 @@ class CategoryTree(BelongsTo):
             return self.relatives(data, include_all=True)
 
         if column_name == self.config("ancestors_column_name"):
-            return self.relatives(data, find_parents=True)
+            return self.relatives(data, find_parents=True, include_all=True)
 
     def relatives(self, data, include_all=False, find_parents=False):
         id_column_name = self.model_class.id_column_name
@@ -266,7 +266,7 @@ class CategoryTree(BelongsTo):
         tree_table_name = self.config("tree_models_class").table_name()
         parent_id_column_name = self.config("tree_parent_id_column_name")
         child_id_column_name = self.config("tree_child_id_column_name")
-        is_parent_column_name = self.config("is_parent_column_name")
+        is_parent_column_name = self.config("tree_is_parent_column_name")
         level_column_name = self.config("tree_level_column_name")
 
         if find_parents:
@@ -291,10 +291,10 @@ class CategoryTree(BelongsTo):
         # joins only work for SQL-like backends.  Otherwise, we have to pull out our list of ids
         branches = self.tree_models.where(f"{search_on}={model_id}")
         if not include_all:
-            branches = branches.where(f"tree.{is_parent_column_name}=1")
+            branches = branches.where(f"{is_parent_column_name}=1")
         if find_parents:
             branches = branches.sort_by(level_column_name, "asc")
-        ids = [str(branch.get(child_id_column_name)) for branch in branches]
+        ids = [str(branch.get(join_on)) for branch in branches]
 
         # Can we search with a WHERE IN() clause?  If the backend supports it, it is probably faster
         if self.config("load_relatives_strategy") == "where_in":