clear-skies 1.19.10__py3-none-any.whl → 1.19.12__py3-none-any.whl

{clear_skies-1.19.10.dist-info → clear_skies-1.19.12.dist-info}/METADATA

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

{clear_skies-1.19.10.dist-info → clear_skies-1.19.12.dist-info}/RECORD

@@ -46,7 +46,7 @@ clearskies/autodoc/schema/string.py,sha256=oxZPCxYYhWnNHdbtwD3QuniStbj8XbBBpDTFX
 clearskies/backends/__init__.py,sha256=3pvJw5dUnrqt7vyeBFjkHbycUEGkEpoYKxZoJwUVZO0,711
 clearskies/backends/api_backend.py,sha256=vcGYub4G3jLLstTDkMMnZkID9JQz-qHmKNapgde4gSc,8875
 clearskies/backends/backend.py,sha256=fkL-De0MUdzcS2JG_spSUQZIVL9oRFvaL6SP26JPpcI,7399
-clearskies/backends/cursor_backend.py,sha256=B1qpFFr4w459JHgTBMZ16IatMH7urfSBiayZLMj02pk,10804
+clearskies/backends/cursor_backend.py,sha256=owuP4S2dBkEUcPAF5PbZAZZuBXrCoioYtf9ede3Su5Y,11181
 clearskies/backends/example_backend.py,sha256=jVpv0LZpNUEJGko0XqioLkHmZHbCW6M4YyNvzKlZcDw,1413
 clearskies/backends/file_backend.py,sha256=tByQdOX1pf6r9-6vRDqOnQ8teRYo0bEWk589qrg598w,1752
 clearskies/backends/json_backend.py,sha256=uDBqkekQadBm0BMoCVuzSPRB-5SjMTCDSAbuIqqwkF8,180
@@ -55,7 +55,7 @@ clearskies/backends/restful_api_advanced_search_backend.py,sha256=uiR4SEKhLNmczY
 clearskies/backends/secrets_backend.py,sha256=4lzrgdL_O_pgCT5HknV2gotFgp9GzjQ5_2n0-4H4kvs,2204
 clearskies/binding_config.py,sha256=bF8LBNEgJacwKCqToAtDqN9hv5omzU7zt_4qB9KPtE0,457
 clearskies/column_types/__init__.py,sha256=QHEFFd3wRXvaOR7uZk-bpVLlLoTiN3D4S8sBU9rFwCE,4330
-clearskies/column_types/audit.py,sha256=klAXnwKjqmNCJqQcBWH5WYPEAZdEblTQTwpcEQAAbqE,8636
+clearskies/column_types/audit.py,sha256=ac9IpcwDRY2JMrfwyH4Zb8Oo9raLcGWqEq9vSAkBxIg,9076
 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=PgNmzZPyqYS5NADH_QTCxLvDXZFxzv5ESKTkvPrrLXo,9140
@@ -141,7 +141,7 @@ clearskies/handlers/exceptions/not_found.py,sha256=xThOXiMfyYBaI2bhfOhpVoZ_vdw1h
 clearskies/handlers/get.py,sha256=x9SogDd2ZvIYwv2UkNa_FUmmKMNd9XPadkbnBKbyTGo,6892
 clearskies/handlers/health_check.py,sha256=m6H3psUql-I7hZao3fsxjrZnCjFJZ1ROTF-41g8Syww,2078
 clearskies/handlers/input_processing.py,sha256=edtG6NQJZCte0Nq-j7SUMzp6vxgIIbLxeUGscWOALAs,3814
-clearskies/handlers/list.py,sha256=Liil791oF9-NjofRV40bNVbhbzF4sM74_efvoDHenqg,25384
+clearskies/handlers/list.py,sha256=RdhvcVA4ZgkdmOHl6iGBC-2jPhjYay0_kFHttmVoq9Q,25466
 clearskies/handlers/mygrations.py,sha256=4iKpJKooqgNtAURwMl_FgsXUt8OYOaG_TY1OV1llQxY,2759
 clearskies/handlers/request_method_routing.py,sha256=DgPEz3tgbaUkXHsOriPbIctfSf4Gm4NxfRdVulH91Kg,1636
 clearskies/handlers/restful_api.py,sha256=1rJ2REX1sTAdbqaRuCclP375agrho4zNNQx6hXGa4nQ,9258
@@ -199,7 +199,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.19.10.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.19.10.dist-info/METADATA,sha256=THacV02HYXH5BgFDcRNABBcNWZSLPe7_6XzyuU7n7fc,1367
-clear_skies-1.19.10.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.19.10.dist-info/RECORD,,
+clear_skies-1.19.12.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.19.12.dist-info/METADATA,sha256=E8zPgCzyP7hE3uR9vkWkREkvPRvHU-zAQ0StlsoXZvM,1367
+clear_skies-1.19.12.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.19.12.dist-info/RECORD,,

clearskies/backends/cursor_backend.py

@@ -138,6 +138,17 @@ class CursorBackend(Backend):
                 next_page_data["start"] = int(start) + int(limit)
         return records
 
+    def group_by_clause(self, group_by):
+        if not group_by:
+            return ""
+        escape = self._column_escape_character()
+        if "." not in group_by:
+            return f" GROUP BY {escape}{group_by}{escape}"
+        parts = group_by.split(".", 1)
+        table = parts[0]
+        column = parts[1]
+        return f" GROUP BY {escape}{table}{escape}.{escape}{column}{escape}"
+
     def as_sql(self, configuration):
         escape = self._column_escape_character()
         [wheres, parameters] = self._conditions_as_wheres_and_parameters(configuration["wheres"])
@@ -162,11 +173,7 @@ class CursorBackend(Backend):
             order_by = " ORDER BY " + ", ".join(sort_parts)
         else:
             order_by = ""
-        group_by = (
-            f" GROUP BY {escape}" + configuration["group_by_column"] + escape
-            if configuration["group_by_column"]
-            else ""
-        )
+        group_by = self.group_by_clause(configuration["group_by_column"])
         limit = ""
         if configuration["limit"]:
             start = 0
@@ -195,7 +202,10 @@ class CursorBackend(Backend):
         if not configuration["group_by_column"]:
             query = f"SELECT COUNT(*) AS count FROM {table_name}{joins}{wheres}"
         else:
-            query = f'SELECT COUNT(SELECT 1 FROM {table_name}{joins}{wheres} GROUP BY {escape}{configuration["group_by_column"]}{escape}) AS count'
+            group_by = self.group_by_clause(configuration["group_by_column"])
+            query = (
+                f"SELECT COUNT(*) AS count FROM (SELECT 1 FROM {table_name}{joins}{wheres}{group_by}) AS count_inner"
+            )
         return [query, parameters]
 
     def _conditions_as_wheres_and_parameters(self, conditions):

clearskies/column_types/audit.py

@@ -134,6 +134,8 @@ class Audit(has_many.HasMany):
                     **create_data,
                     **parent_columns[key].to_json(model),
                 }
+                if key in mask_columns and key in create_data:
+                    create_data[key] = "****"
             self.record(model, "create", data=create_data)
             return
 
@@ -157,7 +159,7 @@ class Audit(has_many.HasMany):
                 **to_data,
                 **parent_columns[column].to_json(model),
             }
-            if column in mask_columns:
+            if column in mask_columns and column in to_data:
                 to_data[column] = "****"
                 from_data[column] = "****"
         if not from_data and not to_data:
@@ -176,15 +178,28 @@ class Audit(has_many.HasMany):
         super().post_delete(model)
         exclude_columns = self.config("exclude_columns")
         parent_columns = self.parent_columns
+        mask_columns = self.config("mask_columns")
+
+        final_data = {}
+        for key in model._data.keys():
+            if key in exclude_columns:
+                continue
+            final_data = {
+                **final_data,
+                **parent_columns[key].to_json(model),
+            }
+
+        for key in mask_columns:
+            if key not in final_data:
+                continue
+            final_data[key] = "****"
 
         self.child_models.create(
             {
                 "class": self.config("parent_class_name"),
                 "resource_id": model.get(self.config("parent_id_column_name")),
                 "action": "delete",
-                "data": {
-                    key: parent_columns[key].to_json(model) for key in model._data.keys() if key not in exclude_columns
-                },
+                "data": final_data,
             }
         )
 

clearskies/handlers/list.py

@@ -255,11 +255,13 @@ class List(Base):
 
         # common checks for group_by and default_sort_column
         for config_name in ["group_by", "default_sort_column"]:
-            if (
-                config_name in configuration
-                and configuration[config_name]
-                and configuration[config_name] not in self._columns
-            ):
+            value = configuration.get(config_name)
+            if not value:
+                continue
+            # we're being lazy for now and not checking complicated values
+            if "." in value:
+                continue
+            if value not in self._columns:
                 raise ValueError(
                     f"{error_prefix} '{config_name}' references column named {column_name} "
                     + f"but this column does not exist for model '{model_class_name}'"