TypeDAL 4.8.5__tar.gz → 4.8.7__tar.gz

{typedal-4.8.5 → typedal-4.8.7}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v4.8.7 (2026-06-11)
+
+### Fix
+
+* Make type checker happy about as_dict and similar methods; reformat ([`f6be55f`](https://github.com/trialandsuccess/TypeDAL/commit/f6be55f253e87d409e0ac017f2bdb89233620391))
+
+## v4.8.6 (2026-06-02)
+
+### Fix
+
+* Support `None` for timestamp fields ([`e49be64`](https://github.com/trialandsuccess/TypeDAL/commit/e49be6425158c0c299bdccb9d5c18187f4f1c10e))
+
 ## v4.8.5 (2026-05-28)
 
 ### Fix

{typedal-4.8.5 → typedal-4.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TypeDAL
-Version: 4.8.5
+Version: 4.8.7
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues

typedal-4.8.7/coverage.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="122" height="20" role="img" aria-label="coverage: 100.00%"><title>coverage: 100.00%</title><filter id="blur"><feGaussianBlur stdDeviation="16"/></filter><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="122" height="20" rx="3"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="61" height="20" fill="#4b0"/><rect width="122" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><g transform="scale(.1)"><g aria-hidden="true" fill="#010101"><text x="315" y="150" fill-opacity=".8" filter="url(#blur)" textLength="510">coverage</text><text x="315" y="150" fill-opacity=".3" textLength="510">coverage</text></g><text x="315" y="140" textLength="510">coverage</text></g><g transform="scale(.1)"><g aria-hidden="true" fill="#010101"><text x="905" y="150" fill-opacity=".8" filter="url(#blur)" textLength="510">100.00%</text><text x="905" y="150" fill-opacity=".3" textLength="510">100.00%</text></g><text x="905" y="140" textLength="510">100.00%</text></g></g></svg>

{typedal-4.8.5 → typedal-4.8.7}/src/typedal/__about__.py

@@ -5,4 +5,4 @@ This file contains the Version info for this package.
 # SPDX-FileCopyrightText: 2023-present Robin van der Noord <robinvandernoord@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "4.8.5"
+__version__ = "4.8.7"

{typedal-4.8.5 → typedal-4.8.7}/src/typedal/fields.py

@@ -490,10 +490,21 @@ Bigint = BigintField
 
 ## Custom:
 
+
+def safe_encode_native_timestamp(value: dt.datetime | None) -> str | None:
+    """
+    Encode timestamp values for SQL without turning None into the string 'None'.
+    """
+    if value is None:
+        return None
+
+    return f"'{value}'"
+
+
 NativeTimestampField = SQLCustomType(
     type="datetime",
     native="timestamp",
-    encoder=lambda x: f"'{x}'",  # extra quotes
+    encoder=safe_encode_native_timestamp,
     # decoder=lambda x: x, # already parsed into datetime
 )
 

{typedal-4.8.5 → typedal-4.8.7}/src/typedal/tables.py

@@ -880,12 +880,13 @@ class TypedTable(_TypedTable, metaclass=TableMeta):
         }
 
     def _setup_instance_methods(self) -> None:
-        self.as_dict = self._as_dict  # type: ignore
-        self.__json__ = self.as_json = self._as_json  # type: ignore
-        # self.as_yaml = self._as_yaml  # type: ignore
-        self.as_xml = self._as_xml  # type: ignore
-
         # use setattr instead of self.x = y to make the typecheckers happier
+        setattr(self, "as_dict", self._as_dict)
+        setattr(self, "__json__", self._as_json)
+        setattr(self, "as_json", self._as_json)
+        setattr(self, "as_xml", self._as_xml)
+        # setattr(self, "as_yaml", self._as_yaml)
+
         setattr(self, "update", self._update)
         setattr(self, "delete_record", self._delete_record)
         setattr(self, "update_record", self._update_record)

{typedal-4.8.5 → typedal-4.8.7}/tests/test_config.py

@@ -4,6 +4,7 @@ import shutil
 import sqlite3
 import tempfile
 import uuid
+from datetime import datetime
 from pathlib import Path
 
 import pytest
@@ -179,9 +180,11 @@ def test_timestamp_fields_sqlite(at_temp_dir):
         ts = TimestampField(default=dt.datetime.now)
         dt = TypedField(dt.datetime, default=dt.datetime.now)
 
+        ts_optional: TypedField[datetime | None] = TimestampField(default=None, notnull=False)
+
     db.define(Timestamp)
 
-    row = Timestamp.insert()
+    row = Timestamp.insert(ts_optional=None)
 
     # old:
     assert isinstance(row.dt, dt.datetime), "not a datetime"
@@ -190,6 +193,7 @@ def test_timestamp_fields_sqlite(at_temp_dir):
     # new:
     assert isinstance(row.ts, dt.datetime), "not a datetime"
     assert "." in str(row.ts)  # ms precision
+    assert row.ts_optional is None
 
     assert '"ts" timestamp NOT NULL' in Timestamp._sql()
 
@@ -206,9 +210,11 @@ def test_timestamp_fields_psql(at_temp_dir):
         ts = TimestampField(default=dt.datetime.now)
         dt = TypedField(dt.datetime, default=dt.datetime.now)
 
+        ts_optional: TypedField[datetime | None] = TimestampField(default=None, notnull=False)
+
     db.define(Timestamp)
 
-    row = Timestamp.insert()
+    row = Timestamp.insert(ts_optional=None)
 
     # old:
     assert isinstance(row.dt, dt.datetime), "not a datetime"
@@ -217,6 +223,7 @@ def test_timestamp_fields_psql(at_temp_dir):
     # new:
     assert isinstance(row.ts, dt.datetime), "not a datetime"
     assert "." in str(row.ts)  # ms precision
+    assert row.ts_optional is None
 
     assert '"ts" timestamp NOT NULL' in Timestamp._sql()
 

typedal-4.8.5/coverage.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="122" height="20" role="img" aria-label="coverage: 100.00%"><title>coverage: 100.00%</title><filter id="blur"><feGaussianBlur in="SourceGraphic" stdDeviation="16"/></filter><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="122" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="61" height="20" fill="#4b0"/><rect width="122" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".80" filter="url(#blur)" transform="scale(.1)" textLength="510">coverage</text><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="905" y="150" fill="#010101" fill-opacity=".80" filter="url(#blur)" transform="scale(.1)" textLength="510">100.00%</text><text aria-hidden="true" x="905" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">100.00%</text><text x="905" y="140" transform="scale(.1)" fill="#fff" textLength="510">100.00%</text></g></svg>

typedal-4.8.5/typing_again.py

@@ -1,40 +0,0 @@
-from typedal import TypeDAL, TypedTable, TypedField, relationship, Relationship
-
-from typing import reveal_type
-
-db = TypeDAL()
-
-reveal_type(db)
-
-@db.define
-class OtherTable(TypedTable):
-    ...
-
-@db.define
-class MyTable(TypedTable):
-    field = TypedField(str)
-
-    rel = relationship(OtherTable)
-    multiple = relationship(list[OtherTable])
-
-
-row = MyTable.first_or_fail()
-
-reveal_type(row) # expected: MyTable; pycharm: MyTable
-reveal_type(MyTable.field) # expected: TypedField[str]; pycharm: TypedField[str]
-reveal_type(row.field) # expected: str; pycharm: TypedField[str]
-
-q = MyTable.field.belongs([""])
-
-reveal_type(q) # expected: Query; pycharm: Query
-
-reveal_type(MyTable.rel) # expected: Relationship[OtherTable]; pycharm: Relationship[OtherTable | None]
-reveal_type(row.rel)  # expected: OtherTable | None; pycharm: Relationship[OtherTable | None]
-
-reveal_type(MyTable.multiple) # expected: Relationship[list[OtherTable]]; pycharm: Relationship[list[OtherTable]]
-reveal_type(row.multiple)  # expected: list[OtherTable]; pycharm: Relationship[list[OtherTable]]
-
-
-
-MyTable.field.label = "Test Label"
-MyTable.field.represent = lambda value, row: "Test Repr"