clear-skies 1.18.8__py3-none-any.whl → 1.18.10__py3-none-any.whl

{clear_skies-1.18.8.dist-info → clear_skies-1.18.10.dist-info}/METADATA

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

{clear_skies-1.18.8.dist-info → clear_skies-1.18.10.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=L3AMJqpchldlqdCWE3UJJ8jAsnrEEWpll9_OgyVASDk,8721
+clearskies/backends/cursor_backend.py,sha256=SVApdsf1QnkiB2GocGlA-720zpN5DIm2FvYKTsx8chQ,9039
 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
@@ -56,7 +56,7 @@ clearskies/backends/secrets_backend.py,sha256=4lzrgdL_O_pgCT5HknV2gotFgp9GzjQ5_2
 clearskies/binding_config.py,sha256=bF8LBNEgJacwKCqToAtDqN9hv5omzU7zt_4qB9KPtE0,457
 clearskies/column_types/__init__.py,sha256=o8vIe3no8FCT9IFOQRgd0VROFjMISxGPiYoNhVi9VCc,3421
 clearskies/column_types/audit.py,sha256=meDFV0s4u9i6UojN5f6EQk_kh-nGP8xPscCRa2Nd-yw,8102
-clearskies/column_types/belongs_to.py,sha256=dWY5AYgvn4ZDgsKVnILbQKCiYrJNOb-FBuzl--DkZas,10827
+clearskies/column_types/belongs_to.py,sha256=0bvSBr0EpnmNA9J6ipRaZafM9sRimgMc8FeHkjYV24Y,10829
 clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR51AUkQ,1878
 clearskies/column_types/category_tree.py,sha256=PgNmzZPyqYS5NADH_QTCxLvDXZFxzv5ESKTkvPrrLXo,9140
 clearskies/column_types/column.py,sha256=TCGqtsCEYJr6BHs-PS1yFoUHGIwcx5oTujytNkTAcrk,13243
@@ -187,7 +187,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.18.8.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.18.8.dist-info/METADATA,sha256=C2EEmkDNduNK0DI7pww5bcCHX0oEzAkNBn4S3F3FsJQ,1366
-clear_skies-1.18.8.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-clear_skies-1.18.8.dist-info/RECORD,,
+clear_skies-1.18.10.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.18.10.dist-info/METADATA,sha256=zHyZWFKxwBT3ZR_Pu_m2mRr6HQ5-bSmWVEWcl3sp7Ok,1367
+clear_skies-1.18.10.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+clear_skies-1.18.10.dist-info/RECORD,,

clearskies/backends/cursor_backend.py

@@ -31,6 +31,9 @@ class CursorBackend(Backend):
     def configure(self):
         pass
 
+    def _finalize_table_name(self, table_name):
+        return f"`{table_name}`"
+
     def update(self, id, data, model):
         query_parts = []
         parameters = []
@@ -39,14 +42,14 @@ class CursorBackend(Backend):
             parameters.append(val)
         updates = ", ".join(query_parts)
 
-        table_name = model.table_name()
+        table_name = self._finalize_table_name(model.table_name())
         self._cursor.execute(
-            f"UPDATE `{table_name}` SET {updates} WHERE {model.id_column_name}=%s", tuple([*parameters, id])
+            f"UPDATE {table_name} SET {updates} WHERE {model.id_column_name}=%s", tuple([*parameters, id])
         )
 
         results = self.records(
             {
-                "table_name": table_name,
+                "table_name": model.table_name(),
                 "select_all": True,
                 "wheres": [{"parsed": f"{model.id_column_name}=%s", "values": [id]}],
             },
@@ -58,8 +61,8 @@ class CursorBackend(Backend):
         columns = "`" + "`, `".join(data.keys()) + "`"
         placeholders = ", ".join(["%s" for i in range(len(data))])
 
-        table_name = model.table_name()
-        self._cursor.execute(f"INSERT INTO `{table_name}` ({columns}) VALUES ({placeholders})", tuple(data.values()))
+        table_name = self._finalize_table_name(model.table_name())
+        self._cursor.execute(f"INSERT INTO {table_name} ({columns}) VALUES ({placeholders})", tuple(data.values()))
         new_id = data.get(model.id_column_name)
         if not new_id:
             new_id = self._cursor.lastrowid
@@ -68,7 +71,7 @@ class CursorBackend(Backend):
 
         results = self.records(
             {
-                "table_name": table_name,
+                "table_name": model.table_name(),
                 "select_all": True,
                 "wheres": [{"parsed": f"{model.id_column_name}=%s", "values": [new_id]}],
             },
@@ -77,8 +80,8 @@ class CursorBackend(Backend):
         return results[0]
 
     def delete(self, id, model):
-        table_name = model.table_name()
-        self._cursor.execute(f"DELETE FROM `{table_name}` WHERE {model.id_column_name}=%s", (id,))
+        table_name = self._finalize_table_name(model.table_name())
+        self._cursor.execute(f"DELETE FROM {table_name} WHERE {model.id_column_name}=%s", (id,))
         return True
 
     def count(self, configuration, model):
@@ -109,7 +112,7 @@ class CursorBackend(Backend):
         [wheres, parameters] = self._conditions_as_wheres_and_parameters(configuration["wheres"])
         select_parts = []
         if configuration["select_all"]:
-            select_parts.append(f"`{configuration['table_name']}`.*")
+            select_parts.append(self._finalize_table_name(configuration["table_name"]) + ".*")
         if configuration["selects"]:
             select_parts.extend(configuration["selects"])
         select = ", ".join(select_parts)
@@ -123,7 +126,7 @@ class CursorBackend(Backend):
                 table_name = sort.get("table")
                 column_name = sort["column"]
                 direction = sort["direction"]
-                prefix = f"`{table_name}`." if table_name else ""
+                prefix = self._finalize_table_name(table_name) + "." if table_name else ""
                 sort_parts.append(f"{prefix}`{column_name}` {direction}")
             order_by = " ORDER BY " + ", ".join(sort_parts)
         else:
@@ -136,8 +139,9 @@ class CursorBackend(Backend):
                 start = int(configuration["pagination"]["start"])
             limit = f' LIMIT {start}, {configuration["limit"]}'
 
+        table_name = self._finalize_table_name(configuration["table_name"])
         return [
-            f'SELECT {select} FROM `{configuration["table_name"]}`{joins}{wheres}{group_by}{order_by}{limit}'.strip(),
+            f"SELECT {select} FROM {table_name}{joins}{wheres}{group_by}{order_by}{limit}".strip(),
             parameters,
         ]
 
@@ -151,10 +155,11 @@ class CursorBackend(Backend):
             joins = " " + " ".join([join["raw"] for join in configuration["joins"]])
         else:
             joins = ""
+        table_name = self._finalize_table_name(configuration["table_name"])
         if not configuration["group_by_column"]:
-            query = f'SELECT COUNT(*) AS count FROM `{configuration["table_name"]}`{joins}{wheres}'
+            query = f"SELECT COUNT(*) AS count FROM {table_name}{joins}{wheres}"
         else:
-            query = f'SELECT COUNT(SELECT 1 FROM `{configuration["table_name"]}`{joins}{wheres} GROUP BY `{configuration["group_by_column"]}`) AS count'
+            query = f'SELECT COUNT(SELECT 1 FROM {table_name}{joins}{wheres} GROUP BY `{configuration["group_by_column"]}`) AS count'
         return [query, parameters]
 
     def _conditions_as_wheres_and_parameters(self, conditions):

clearskies/column_types/belongs_to.py

@@ -162,7 +162,7 @@ class BelongsTo(String):
         parent = model.__getattr__(self.config("model_column_name"))
         json = OrderedDict()
         if parent.id_column_name not in self.config("readable_parent_columns"):
-            json[parent.id_column_name] = list(columns[parent.id_column_name].to_json(parent).values)[0]
+            json[parent.id_column_name] = list(columns[parent.id_column_name].to_json(parent).values())[0]
         for column_name in self.config("readable_parent_columns"):
             json = {**json, **columns[column_name].to_json(parent)}
         id_less_name = self.config("model_column_name")