Quotes in JSON property lookup 🧙🏾‍♀️

Author: Sibyx

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.1 : 2020-08-27
+
+- **Fix**: Use quotes in JSON column type keys in `Property`
+
 ## 0.7.0 : 2020-08-27
 
 - **Feature**: Now is possible to pass `Distinct` to `Count` to have `COUNT(DISTINCT property)` syntax in pSQL

duckql/properties/property.py

@@ -1,4 +1,4 @@
-from pydantic import validator
+from exceptions import ParseError
 
 try:
     from typing import Literal
@@ -19,11 +19,15 @@ class Config:
             'description': "Object representation of SQL column/property"
         }
 
-    @validator('name', pre=True)
-    def escape_name(cls, v):
-        return cls.escape(v)
-
     def to_sql(self) -> str:
+        if '->' in self.name:
+            bits = self.name.split('->')
+            if len(bits) != 2:
+                raise ParseError("duckQL doesn't support nested JSON lookups.")
+            self.name = f"{self.escape(bits[0].strip())} -> '{self.escape(bits[1].strip())}'"
+        else:
+            self.name = self.escape(self.name)
+
         sql = f"{self.name}"
 
         if self.alias is not None:

duckql/properties/tests/test_property.py

@@ -23,15 +23,15 @@ def test_json_field():
     json_property = Property(
         name='users.additional_data -> title'
     )
-    assert str(json_property) == 'users.additional_data -> title'
+    assert str(json_property) == "users.additional_data -> 'title'"
 
 
 def test_json_field_parser():
     json_property = Property.parse_raw(
         '{"obj": "properties.Property", "name": "users.additional_data -> title", "alias": "title"}'
     )
-    assert json_property.name == 'users.additional_data -> title'
-    assert str(json_property) == 'users.additional_data -> title AS "title"'
+    assert json_property.name == "users.additional_data -> title"
+    assert str(json_property) == "users.additional_data -> 'title' AS \"title\""
 
 
 def test_json_parse(valid_instance: Property):

duckql/version.py

@@ -1 +1 @@
-__version__ = '0.7.0'
+__version__ = '0.7.1'

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "duckql-python"
-version = "0.7.0"
+version = "0.7.1"
 description = "JSON declarative SQL conversion library"
 authors = ["Jakub Dubec <jakub.dubec@gmail.com>"]
 license = "MIT"