fixes

Author: rustyconover

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "query-farm-duckdb-json-serialization"
-version = "0.1.1"
+version = "0.1.2"
 description = "Integrate with DuckDB's JSON serialization of expressions and values"
 authors = [
     { name = "Rusty Conover", email = "[email protected]" }

requirements-dev.lock

@@ -12,7 +12,7 @@
 -e file:.
 annotated-types==0.7.0
     # via pydantic
-coverage==7.9.1
+coverage==7.9.2
     # via pytest-cov
 filelock==3.18.0
     # via pytest-mypy
@@ -43,8 +43,8 @@ pytest==8.4.1
 pytest-cov==6.2.1
 pytest-env==1.1.5
 pytest-mypy==1.0.1
-ruff==0.12.1
-typing-extensions==4.14.0
+ruff==0.12.2
+typing-extensions==4.14.1
     # via mypy
     # via pydantic
     # via pydantic-core

requirements.lock

@@ -16,7 +16,7 @@ pydantic==2.11.7
     # via query-farm-duckdb-json-serialization
 pydantic-core==2.33.2
     # via pydantic
-typing-extensions==4.14.0
+typing-extensions==4.14.1
     # via pydantic
     # via pydantic-core
     # via typing-inspection

src/query_farm_duckdb_json_serialization/value.py

@@ -102,7 +102,11 @@ def sql(self) -> str:
             return "null"
         assert self.value
 
-        data = self.value.base64 if isinstance(self.value, ValueValue_base64) else self.value
+        data = (
+            self.value.base64
+            if isinstance(self.value, ValueValue_base64)
+            else self.value
+        )
 
         if not data or len(data) < 2:
             return ""
@@ -421,7 +425,9 @@ def sql(self) -> str:
 
         return (
             "TIME '"
-            + time(hours, minutes, seconds, microsecond=t.microseconds).strftime("%H:%M:%S.%f")
+            + time(hours, minutes, seconds, microsecond=t.microseconds).strftime(
+                "%H:%M:%S.%f"
+            )
             + "'"
         )
 
@@ -449,7 +455,9 @@ def sql(self) -> str:
 
         return (
             "TIMETZ '"
-            + time(hours, minutes, seconds, microsecond=t.microseconds).strftime("%H:%M:%S.%f")
+            + time(hours, minutes, seconds, microsecond=t.microseconds).strftime(
+                "%H:%M:%S.%f"
+            )
             + "'"
         )
 
@@ -542,8 +550,13 @@ class Value_timestamp_ns(ValueBase):
     def sql(self) -> str:
         if self.is_null:
             return "null"
+        assert self.value
+        ns_since_epoch = self.value
+        seconds, nanoseconds = divmod(ns_since_epoch, 10**9)
 
-        return f"make_timestamp_ns({self.value}::bigint)"
+        dt = datetime.fromtimestamp(seconds, tz=UTC)
+        formatted = dt.strftime("%Y-%m-%dT%H:%M:%S") + f".{nanoseconds:09d}"
+        return f"TIMESTAMP_NS '{formatted}'"
 
 
 class ValueType_timestamp_s(BaseModel):
@@ -841,7 +854,10 @@ def sql(self) -> str:
         return (
             "STRUCT("
             + ",".join(
-                [f'"{child.first}" {child.second.sql()}' for child in self.type_info.child_types]
+                [
+                    f'"{child.first}" {child.second.sql()}'
+                    for child in self.type_info.child_types
+                ]
             )
             + ")"
         )
@@ -861,7 +877,10 @@ def sql(self) -> str:
         return (
             "{"
             + ",".join(
-                [f"'{name}':" + value.sql() for name, value in zip(names, values, strict=True)]
+                [
+                    f"'{name}':" + value.sql()
+                    for name, value in zip(names, values, strict=True)
+                ]
             )
             + "}"
         )