fix: escape chars only when necessary (#108)

* fix: escape chars only when necessary

* fix: escape column names

* deps: upgrade black in pre-commit

Author: anand2312

.pre-commit-config.yaml

@@ -34,8 +34,8 @@ repos:
                     "--ignore-init-module-imports",
                 ]
 
-    - repo: https://github.com/ambv/black
-      rev: 21.12b0
+    - repo: https://github.com/psf/black
+      rev: "22.3.0"
       hooks:
           - id: black
             args: [--line-length, "90"]

postgrest_py/base_request_builder.py

@@ -8,7 +8,7 @@
 from pydantic import BaseModel, validator
 
 from .types import CountMethod, Filters, RequestMethod, ReturnMethod
-from .utils import AsyncClient, SyncClient, sanitize_param, sanitize_pattern_param
+from .utils import AsyncClient, SyncClient, sanitize_param
 
 
 def pre_select(
@@ -157,56 +157,54 @@ def filter(self, column: str, operator: str, criteria: str):
         return self
 
     def eq(self, column: str, value: Any):
-        return self.filter(column, Filters.EQ, sanitize_param(value))
+        return self.filter(column, Filters.EQ, value)
 
     def neq(self, column: str, value: Any):
-        return self.filter(column, Filters.NEQ, sanitize_param(value))
+        return self.filter(column, Filters.NEQ, value)
 
     def gt(self, column: str, value: Any):
-        return self.filter(column, Filters.GT, sanitize_param(value))
+        return self.filter(column, Filters.GT, value)
 
     def gte(self, column: str, value: Any):
-        return self.filter(column, Filters.GTE, sanitize_param(value))
+        return self.filter(column, Filters.GTE, value)
 
     def lt(self, column: str, value: Any):
-        return self.filter(column, Filters.LT, sanitize_param(value))
+        return self.filter(column, Filters.LT, value)
 
     def lte(self, column: str, value: Any):
-        return self.filter(column, Filters.LTE, sanitize_param(value))
+        return self.filter(column, Filters.LTE, value)
 
     def is_(self, column: str, value: Any):
-        return self.filter(column, Filters.IS, sanitize_param(value))
+        return self.filter(column, Filters.IS, value)
 
     def like(self, column: str, pattern: Any):
-        return self.filter(column, Filters.LIKE, sanitize_pattern_param(pattern))
+        return self.filter(column, Filters.LIKE, pattern)
 
     def ilike(self, column: str, pattern: Any):
-        return self.filter(column, Filters.ILIKE, sanitize_pattern_param(pattern))
+        return self.filter(column, Filters.ILIKE, pattern)
 
     def fts(self, column: str, query: Any):
-        return self.filter(column, Filters.FTS, sanitize_param(query))
+        return self.filter(column, Filters.FTS, query)
 
     def plfts(self, column: str, query: Any):
-        return self.filter(column, Filters.PLFTS, sanitize_param(query))
+        return self.filter(column, Filters.PLFTS, query)
 
     def phfts(self, column: str, query: Any):
-        return self.filter(column, Filters.PHFTS, sanitize_param(query))
+        return self.filter(column, Filters.PHFTS, query)
 
     def wfts(self, column: str, query: Any):
-        return self.filter(column, Filters.WFTS, sanitize_param(query))
+        return self.filter(column, Filters.WFTS, query)
 
     def in_(self, column: str, values: Iterable[Any]):
         values = map(sanitize_param, values)
         values = ",".join(values)
         return self.filter(column, Filters.IN, f"({values})")
 
     def cs(self, column: str, values: Iterable[Any]):
-        values = map(sanitize_param, values)
         values = ",".join(values)
         return self.filter(column, Filters.CS, f"{{{values}}}")
 
     def cd(self, column: str, values: Iterable[Any]):
-        values = map(sanitize_param, values)
         values = ",".join(values)
         return self.filter(column, Filters.CD, f"{{{values}}}")
 
@@ -232,7 +230,6 @@ def contained_by(self, column: str, value: Union[Iterable[Any], str, Dict[Any, A
         return self.filter(column, Filters.CD, json.dumps(value))
 
     def ov(self, column: str, values: Iterable[Any]):
-        values = map(sanitize_param, values)
         values = ",".join(values)
         return self.filter(column, Filters.OV, f"{{{values}}}")
 

postgrest_py/utils.py

@@ -13,7 +13,7 @@ def aclose(self) -> None:
 
 def sanitize_param(param: Any) -> str:
     param_str = str(param)
-    reserved_chars = ",.:()"
+    reserved_chars = ".,:()"
     if any(char in param_str for char in reserved_chars):
         return f'"{param_str}"'
     return param_str