clear-skies 1.19.16__py3-none-any.whl → 1.19.18__py3-none-any.whl

{clear_skies-1.19.16.dist-info → clear_skies-1.19.18.dist-info}/METADATA

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

{clear_skies-1.19.16.dist-info → clear_skies-1.19.18.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=owuP4S2dBkEUcPAF5PbZAZZuBXrCoioYtf9ede3Su5Y,11181
+clearskies/backends/cursor_backend.py,sha256=VntlPS6z6bnZOC3XRJ-WFf5gK3pFUhH_qJpnZn8hl9U,11278
 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
@@ -69,7 +69,7 @@ clearskies/column_types/created_by_user_agent.py,sha256=sSYDRrqSjsCwcYlhF_s9NO-i
 clearskies/column_types/created_micro.py,sha256=EqeHB3ZHbi4nCa1rbrKy1TbooT9U3Kfw5z4jUvLi32U,636
 clearskies/column_types/datetime.py,sha256=OEy5eMfqWp6KOqEHQa3Ga_tl0oawtcMRBafI1SPYDFk,4275
 clearskies/column_types/datetime_micro.py,sha256=3DxtkeJZhWigdni7QEJFV3BJuCmXJMyFQjDZ9jyI144,328
-clearskies/column_types/email.py,sha256=jxNtAacyzMYOiTE4NiySo8fFqHlVMfTLq90FNHyv4SU,583
+clearskies/column_types/email.py,sha256=qq0Yo_C3KxUqT68q2HWXocBBR4xwMqjxcIdgZRv218U,584
 clearskies/column_types/float.py,sha256=j8jJeBueSOusPtAFCWgLHYBncfLnqT1U7bh1zcAkYiA,1332
 clearskies/column_types/has_many.py,sha256=Z4oM1g2dQx6H9171c52FLC41nLryCOKmh51I75mYmmY,5895
 clearskies/column_types/integer.py,sha256=dGIluusPmhLRNg7PplOJLbQI2AXojqRBUHt8ekYWNVI,1386
@@ -150,8 +150,8 @@ clearskies/handlers/schema_helper.py,sha256=62644USvFlZu_6tT7rb-k6t_5J3Q0uZsJwP5
 clearskies/handlers/simple_routing.py,sha256=KpOSQK2_tTwrPblDmxAUpX-Fqts_Or_MLWGKOOkJnoo,9403
 clearskies/handlers/simple_routing_route.py,sha256=3U3dixEKuf-Xo88RQGH_grm1x79-px6idt1-xaLUSiY,8953
 clearskies/handlers/simple_search.py,sha256=bSfq8rzdqkBj-dTGUBSZ1EkfjzUWHID7mKD2xEf8VzQ,6165
-clearskies/handlers/update.py,sha256=VCZkoID7i5VHq78fkIpjbRdXQ4Z3IuXEE5dfC8z4RZI,4088
-clearskies/handlers/write.py,sha256=VduGtjnFMQOvo3l0t-tUP4PExPJ9JEpuziHsquF08rE,9344
+clearskies/handlers/update.py,sha256=rx8HW87Pfh95e_9nEfKKnxfkh2HBlCUdYqVwljtXiJ8,4116
+clearskies/handlers/write.py,sha256=Gu1w1PQ1F7tlqCqALorMRek3UH6IkViPIO195dxPd8k,9372
 clearskies/input_outputs/__init__.py,sha256=mQWL-u41FRTrPGuHe8FhLmcHjAEaUxjFwUf7RgDcbAs,182
 clearskies/input_outputs/cli.py,sha256=F54wues9cNESE8FhQP3mDWrgrZyFouDIN-ZZ3-KJjks,6258
 clearskies/input_outputs/exceptions/__init__.py,sha256=bc5Tc1XBZnqA1fKbk7pk5hyx102vqx3sDE19E03xGk4,82
@@ -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.16.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.19.16.dist-info/METADATA,sha256=76OY8mU0eL8usFPqOZumIst9l_cEyzch-iWFvPm0jJk,1367
-clear_skies-1.19.16.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.19.16.dist-info/RECORD,,
+clear_skies-1.19.18.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.19.18.dist-info/METADATA,sha256=4mdZ8ADH9GKXgZxqm285vya9aFyVABQsUDAsv8l7Fhs,1367
+clear_skies-1.19.18.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.19.18.dist-info/RECORD,,

clearskies/backends/cursor_backend.py

@@ -151,7 +151,9 @@ class CursorBackend(Backend):
 
     def as_sql(self, configuration):
         escape = self._column_escape_character()
-        [wheres, parameters] = self._conditions_as_wheres_and_parameters(configuration["wheres"])
+        [wheres, parameters] = self._conditions_as_wheres_and_parameters(
+            configuration["wheres"], configuration["table_name"]
+        )
         select_parts = []
         if configuration["select_all"]:
             select_parts.append(self._finalize_table_name(configuration["table_name"]) + ".*")
@@ -190,7 +192,9 @@ class CursorBackend(Backend):
     def as_count_sql(self, configuration):
         escape = self._column_escape_character()
         # note that this won't work if we start including a HAVING clause
-        [wheres, parameters] = self._conditions_as_wheres_and_parameters(configuration["wheres"])
+        [wheres, parameters] = self._conditions_as_wheres_and_parameters(
+            configuration["wheres"], configuration["table_name"]
+        )
         # we also don't currently support parameters in the join clause - I'll probably need that though
         if configuration["joins"]:
             # We can ignore left joins because they don't change the count
@@ -208,7 +212,7 @@ class CursorBackend(Backend):
             )
         return [query, parameters]
 
-    def _conditions_as_wheres_and_parameters(self, conditions):
+    def _conditions_as_wheres_and_parameters(self, conditions, default_table_name):
         if not conditions:
             return ["", []]
 
@@ -216,16 +220,17 @@ class CursorBackend(Backend):
         where_parts = []
         for condition in conditions:
             parameters.extend(condition["values"])
-            table = condition.get("table", "")
+            table = condition.get("table", default_table_name)
+            if not table:
+                table = default_table_name
             column = condition["column"]
-            column_with_table = f"{table}.{column}" if table else column
+            column_with_table = f"{table}.{column}"
             where_parts.append(
                 self.condition_parser._with_placeholders(
                     column_with_table,
                     condition["operator"],
                     condition["values"],
-                    escape=False if table else True,
-                    escape_character=self._column_escape_character(),
+                    escape=False,
                 )
             )
         return [" WHERE " + " AND ".join(where_parts), parameters]

clearskies/column_types/email.py

@@ -13,6 +13,6 @@ class Email(String):
             # don't check for an email if doing a fuzzy search, since we may be searching
             # for a partial email
             return ""
-        if re.search("^[^@\s]+@[^@]+\.[^@]+$", value):
+        if re.search(r"^[^@\s]+@[^@]+\.[^@]+$", value):
             return ""
         return "Invalid email address"

clearskies/handlers/update.py

@@ -15,6 +15,7 @@ class Update(Write):
         "column_overrides": None,
         "writeable_columns": None,
         "readable_columns": None,
+        "output_map": None,
         "where": [],
         "input_error_callable": None,
         "include_id_in_path": False,

clearskies/handlers/write.py

@@ -22,6 +22,7 @@ class Write(Base, InputProcessing):
         "columns": None,
         "column_overrides": None,
         "writeable_columns": None,
+        "output_map": None,
         "readable_columns": None,
         "input_error_callable": None,
     }