remove spaces after comma in PG json, refactor

Author: nicolasaldecoa

sqeleton/abcs/mixins.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from .database_types import TemporalType, FractionalType, ColType_UUID, Boolean, ColType, String_UUID
+from .database_types import TemporalType, FractionalType, ColType_UUID, Boolean, ColType, String_UUID, JSONType
 from .compiler import Compilable
 
 
@@ -49,6 +49,10 @@ def normalize_uuid(self, value: str, coltype: ColType_UUID) -> str:
             return f"TRIM({value})"
         return self.to_string(value)
 
+    def normalize_json(self, value: str, _coltype: JSONType) -> str:
+        """Creates an SQL expression, that converts 'value' to its minified json string representation."""
+        raise NotImplementedError()
+
     def normalize_value_by_type(self, value: str, coltype: ColType) -> str:
         """Creates an SQL expression, that converts 'value' to a normalized representation.
 
@@ -73,6 +77,8 @@ def normalize_value_by_type(self, value: str, coltype: ColType) -> str:
             return self.normalize_uuid(value, coltype)
         elif isinstance(coltype, Boolean):
             return self.normalize_boolean(value, coltype)
+        elif isinstance(coltype, JSONType):
+            return self.normalize_json(value, coltype)
         return self.to_string(value)
 
 

sqeleton/databases/postgresql.py

@@ -1,12 +1,10 @@
 from ..abcs.database_types import (
-    ColType,
     Timestamp,
     TimestampTZ,
     Float,
     Decimal,
     Integer,
     TemporalType,
-    ColType_UUID,
     Native_UUID,
     Text,
     FractionalType,
@@ -52,35 +50,7 @@ def normalize_boolean(self, value: str, _coltype: Boolean) -> str:
         return self.to_string(f"{value}::int")
 
     def normalize_json(self, value: str, _coltype: PostgresqlJSON) -> str:
-        return f"replace({value}::text, '\": \"', '\":\"')"  # minified json
-
-    def normalize_value_by_type(self, value: str, coltype: ColType) -> str:
-        """Creates an SQL expression, that converts 'value' to a normalized representation.
-
-        The returned expression must accept any SQL value, and return a string.
-
-        The default implementation dispatches to a method according to `coltype`:
-
-        ::
-
-            TemporalType    -> normalize_timestamp()
-            FractionalType  -> normalize_number()
-            *else*          -> to_string()
-
-            (`Integer` falls in the *else* category)
-
-        """
-        if isinstance(coltype, TemporalType):
-            return self.normalize_timestamp(value, coltype)
-        elif isinstance(coltype, FractionalType):
-            return self.normalize_number(value, coltype)
-        elif isinstance(coltype, ColType_UUID):
-            return self.normalize_uuid(value, coltype)
-        elif isinstance(coltype, Boolean):
-            return self.normalize_boolean(value, coltype)
-        elif isinstance(coltype, PostgresqlJSON):
-            return self.normalize_json(value, coltype)
-        return self.to_string(value)
+        return f"replace(replace({value}::text, '\": ', '\":'), ', \"', ',\"')"
 
 
 class PostgresqlDialect(BaseDialect, Mixin_Schema):

sqeleton/databases/redshift.py

@@ -4,10 +4,7 @@
     TemporalType,
     FractionalType,
     DbPath,
-    RedShiftSuper,
-    ColType,
-    ColType_UUID,
-    Boolean
+    RedShiftSuper
 )
 from ..abcs.mixins import AbstractMixin_MD5
 from .postgresql import (
@@ -49,36 +46,8 @@ def normalize_timestamp(self, value: str, coltype: TemporalType) -> str:
     def normalize_number(self, value: str, coltype: FractionalType) -> str:
         return self.to_string(f"{value}::decimal(38,{coltype.precision})")
 
-    def normalize_super(self, value: str, _coltype: RedShiftSuper) -> str:
-        return f'nvl2({value}, json_serialize({value}), NULL)'  # only ::varchar causes redshift to return null
-
-    def normalize_value_by_type(self, value: str, coltype: ColType) -> str:
-        """Creates an SQL expression, that converts 'value' to a normalized representation.
-
-        The returned expression must accept any SQL value, and return a string.
-
-        The default implementation dispatches to a method according to `coltype`:
-
-        ::
-
-            TemporalType    -> normalize_timestamp()
-            FractionalType  -> normalize_number()
-            *else*          -> to_string()
-
-            (`Integer` falls in the *else* category)
-
-        """
-        if isinstance(coltype, TemporalType):
-            return self.normalize_timestamp(value, coltype)
-        elif isinstance(coltype, FractionalType):
-            return self.normalize_number(value, coltype)
-        elif isinstance(coltype, ColType_UUID):
-            return self.normalize_uuid(value, coltype)
-        elif isinstance(coltype, Boolean):
-            return self.normalize_boolean(value, coltype)
-        elif isinstance(coltype, RedShiftSuper):
-            return self.normalize_super(value, coltype)
-        return self.to_string(value)
+    def normalize_json(self, value: str, _coltype: RedShiftSuper) -> str:
+        return f'nvl2({value}, json_serialize({value}), NULL)'
 
 
 class Dialect(PostgresqlDialect):