TypeDAL 3.14.0__tar.gz → 3.14.2__tar.gz

{typedal-3.14.0 → typedal-3.14.2}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v3.14.2 (2025-06-05)
+
+### Fix
+
+* **PointField:** Don't crash if invalid point is parsed ([`e14b4a3`](https://github.com/trialandsuccess/TypeDAL/commit/e14b4a349799799cc94e8fb62d9da9a0fafdcd36))
+
+## v3.14.1 (2025-05-27)
+
+### Fix
+
+* Don't force slug if already manually set ([`a33b2b5`](https://github.com/trialandsuccess/TypeDAL/commit/a33b2b523a56ae9adc6fb4c49a5708efe7950977))
+
 ## v3.14.0 (2025-05-15)
 
 ### Feature

{typedal-3.14.0 → typedal-3.14.2}/PKG-INFO

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

{typedal-3.14.0 → typedal-3.14.2}/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__ = "3.14.0"
+__version__ = "3.14.2"

{typedal-3.14.0 → typedal-3.14.2}/src/typedal/cli.py

@@ -392,8 +392,7 @@ def fake_migrations(
 
     previously_migrated = (
         db(
-            db.ewh_implemented_features.name.belongs(to_fake)
-            & (db.ewh_implemented_features.installed == True)  # noqa E712
+            db.ewh_implemented_features.name.belongs(to_fake) & (db.ewh_implemented_features.installed == True)  # noqa E712
         )
         .select(db.ewh_implemented_features.name)
         .column("name")

{typedal-3.14.0 → typedal-3.14.2}/src/typedal/fields.py

@@ -256,11 +256,34 @@ def TimestampField(**kw: Unpack[FieldSettings]) -> TypedField[dt.datetime]:
     )
 
 
+def safe_decode_native_point(value: str | None):
+    if not value:
+        return ()
+
+    try:
+        return ast.literal_eval(value)
+    except ValueError:  # pragma: no cover
+        # should not happen when inserted with `safe_encode_native_point` but you never know
+        return ()
+
+
+def safe_encode_native_point(value):
+    if not value:
+        return ""
+
+    if isinstance(value, str):
+        value = tuple(float(_) for _ in value.strip("(").strip(")").split(","))
+    if not (isinstance(value, tuple) and len(value) == 2):
+        raise ValueError("Invalid point tuple")
+
+    return str(value)
+
+
 NativePointField = SQLCustomType(
     type="string",
     native="point",
-    encoder=str,
-    decoder=ast.literal_eval,
+    encoder=safe_encode_native_point,
+    decoder=safe_decode_native_point,
 )
 
 

{typedal-3.14.0 → typedal-3.14.2}/src/typedal/mixins.py

@@ -197,6 +197,10 @@ class SlugMixin(Mixin):
 
     @classmethod
     def __generate_slug_before_insert(cls, row: OpRow) -> None:
+        if row.get("slug"):
+            # manually set -> skip
+            return None
+
         settings = cls.__settings__
 
         text_input = row[settings["slug_field"]]

{typedal-3.14.0 → typedal-3.14.2}/tests/test_config.py

@@ -219,7 +219,11 @@ def test_point_fields_sqlite(at_temp_dir):
     class Point(TypedTable):
         pt = PointField()
 
+    class OptionalPoint(TypedTable):
+        maybe_pt = PointField(notnull=False)
+
     db.define(Point)
+    db.define(OptionalPoint)
 
     row1 = Point.insert(pt=(1, 0))
     row2 = Point.insert(pt="(1, 0)")
@@ -236,8 +240,13 @@ def test_point_fields_sqlite(at_temp_dir):
     with pytest.raises(Exception):
         Point.insert(pt="123")
 
-    # note: psql will check this whereas sqlite won't:
-    Point.insert(pt=())
+    with pytest.raises(Exception):
+        Point.insert(pt=())
+
+    db.rollback()
+
+    row3 = OptionalPoint.insert(maybe_pt=())
+    assert row3.maybe_pt == ()
 
     assert '"pt" point NOT NULL' in Point._sql()
 
@@ -253,7 +262,11 @@ def test_point_fields_psql(at_temp_dir):
     class Point(TypedTable):
         pt = PointField()
 
+    class OptionalPoint(TypedTable):
+        maybe_pt = PointField(notnull=False)
+
     db.define(Point)
+    db.define(OptionalPoint)
 
     row1 = Point.insert(pt=(1, 0))
     row2 = Point.insert(pt="(1, 0)")
@@ -270,12 +283,16 @@ def test_point_fields_psql(at_temp_dir):
     with pytest.raises(Exception):
         Point.insert(pt="123")
 
-    # note: psql will check this whereas sqlite won't:
-
     with pytest.raises(Exception):
         Point.insert(pt=())
 
+    db.rollback()
+
+    row3 = OptionalPoint.insert(maybe_pt=())
+    assert row3.maybe_pt == ()
+
     assert '"pt" point NOT NULL' in Point._sql()
+    assert "NOT NULL" not in OptionalPoint._sql()
 
 
 def test_uuid_fields_psql(at_temp_dir):

{typedal-3.14.0 → typedal-3.14.2}/tests/test_mixins.py

@@ -95,7 +95,7 @@ def test_slug(db):
     assert error is None
 
     assert row.name == "Two Words"
-    assert row.slug.startswith("two-words")
+    assert row.slug.startswith("two-words-")
 
     row, error = TableWithSlugSuffix.validate_and_insert(name="Two Words")
     assert error is None
@@ -103,6 +103,13 @@ def test_slug(db):
     assert row.name == "Two Words"
     assert row.slug.startswith("two-words")
 
+    # test manual slug:
+    manual_slug = "some-other-slug-manually-defined"
+    # validate_and_insert will fail because 'slug' is not writable
+    row = TableWithMixins.insert(name="Some Name", slug=manual_slug)
+
+    assert row.slug == manual_slug
+
 
 def test_timestamps(db):
     row = TableWithTimestamps.insert(unrelated="Hi")