clear-skies 1.19.10__tar.gz → 1.19.12__tar.gz

{clear_skies-1.19.10 → clear_skies-1.19.12}/PKG-INFO

@@ -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 → clear_skies-1.19.12}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies"
-version = "1.19.10"
+version = "1.19.12"
 description = "A framework for building backends in the cloud"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",

{clear_skies-1.19.10 → clear_skies-1.19.12}/src/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):

{clear_skies-1.19.10 → clear_skies-1.19.12}/src/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,
             }
         )
 

{clear_skies-1.19.10 → clear_skies-1.19.12}/src/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}'"