diff --git a/CHANGELOG.md b/CHANGELOG.md index eaee5ff..4a52d1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,5 @@ # Changelog -## 0.4.1 - -- Fixed return types for `.sqlalchemy` module. -- `sqlalchemy.parent_children()` now takes a `lazy` parameter. Backported from 0.5.0. - ## 0.4.0 + `pydantic` is now a hard dependency @@ -21,11 +16,6 @@ + Added `addattr()`, `PrefixIdentifier()`, `mod_floor()`, `mod_ceil()` + First version to have unit tests! (Coverage is not yet complete) -## 0.3.8 - -- Fixed return types for `.sqlalchemy` module. -- `sqlalchemy.parent_children()` now takes a `lazy` parameter. Backported from 0.5.0. - ## 0.3.7 - Fixed a bug in `b64decode()` padding handling which made the function inconsistent and non injective. Now, leading `'A'` is NEVER stripped. diff --git a/src/suou/__init__.py b/src/suou/__init__.py index a49eabd..98834c2 100644 --- a/src/suou/__init__.py +++ b/src/suou/__init__.py @@ -29,7 +29,7 @@ from .snowflake import Snowflake, SnowflakeGen from .lex import symbol_table, lex, ilex from .strtools import PrefixIdentifier -__version__ = "0.4.1" +__version__ = "0.4.0" __all__ = ( 'ConfigOptions', 'ConfigParserConfigSource', 'ConfigSource', 'ConfigValue', diff --git a/src/suou/sqlalchemy.py b/src/suou/sqlalchemy.py index 4c1ecd2..b16cae7 100644 --- a/src/suou/sqlalchemy.py +++ b/src/suou/sqlalchemy.py @@ -21,7 +21,7 @@ from functools import wraps from typing import Callable, Iterable, Never, TypeVar import warnings from sqlalchemy import BigInteger, Boolean, CheckConstraint, Date, Dialect, ForeignKey, LargeBinary, Column, MetaData, SmallInteger, String, create_engine, select, text -from sqlalchemy.orm import DeclarativeBase, Relationship, Session, declarative_base as _declarative_base, relationship +from sqlalchemy.orm import DeclarativeBase, Session, declarative_base as _declarative_base, relationship from .snowflake import SnowflakeGen from .itertools import kwargs_prefix, makelist @@ -130,8 +130,7 @@ def bool_column(value: bool = False, nullable: bool = False, **kwargs): return Column(Boolean, server_default=def_val, nullable=nullable, **kwargs) - -def declarative_base(domain_name: str, master_secret: bytes, metadata: dict | None = None, **kwargs) -> type[DeclarativeBase]: +def declarative_base(domain_name: str, master_secret: bytes, metadata: dict | None = None, **kwargs) -> DeclarativeBase: """ Drop-in replacement for sqlalchemy.orm.declarative_base() taking in account requirements for SIQ generation (i.e. domain name). @@ -204,7 +203,7 @@ def age_pair(*, nullable: bool = False, **ka) -> tuple[Column, Column]: return (date_col, acc_col) -def parent_children(keyword: str, /, *, lazy='selectin', **kwargs) -> tuple[Incomplete[Relationship], Incomplete[Relationship]]: +def parent_children(keyword: str, /, **kwargs): """ Self-referential one-to-many relationship pair. Parent comes first, children come later. @@ -219,8 +218,8 @@ def parent_children(keyword: str, /, *, lazy='selectin', **kwargs) -> tuple[Inco parent_kwargs = kwargs_prefix(kwargs, 'parent_') child_kwargs = kwargs_prefix(kwargs, 'child_') - parent = Incomplete(relationship, Wanted(lambda o, n: o.__name__), back_populates=f'child_{keyword}s', lazy=lazy, **parent_kwargs) - child = Incomplete(relationship, Wanted(lambda o, n: o.__name__), back_populates=f'parent_{keyword}', lazy=lazy, **child_kwargs) + parent = Incomplete(relationship, Wanted(lambda o, n: o.__name__), back_populates=f'child_{keyword}s', **parent_kwargs) + child = Incomplete(relationship, Wanted(lambda o, n: o.__name__), back_populates=f'parent_{keyword}', **child_kwargs) return parent, child