Update for changes to ducktools-classbuilder

Author: DavidCEllis

pyproject.toml

@@ -6,15 +6,15 @@ requires = [
 build-backend = "setuptools.build_meta"
 
 [project]
-name="ducktools-env"
-description="Virtual environment management tools and application bundle builder"
+name = "ducktools-env"
+description = "Virtual environment management tools and application bundle builder"
 authors = [
-  { name="David C Ellis" },
+    { name = "David C Ellis" },
 ]
-readme="README.md"
+readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "ducktools-classbuilder>=0.7.1",
+    "ducktools-classbuilder>=0.12.3",
     "ducktools-lazyimporter>=0.7.0",
     "ducktools-scriptmetadata>=0.2.0",
     "ducktools-pythonfinder>=0.8.1",
@@ -56,7 +56,7 @@ __version_tuple__ = {version_tuple}
 """
 
 [tool.pytest.ini_options]
-addopts= "--cov=src/ --cov-report=term-missing --cov-report xml:cov.xml"
+addopts = "--cov=src/ --cov-report=term-missing --cov-report xml:cov.xml"
 testpaths = [
     "tests",
 ]

src/ducktools/env/_sqlclasses.py

@@ -1,18 +1,18 @@
 # ducktools.env
 # MIT License
-# 
+#
 # Copyright (c) 2024 David C Ellis
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -106,8 +106,14 @@ def validate_field(self):
             raise AttributeError("Primary key fields are already unique")
 
 
-def get_sql_fields(cls: "SQLMeta") -> dict[str, SQLAttribute]:
-    return get_attributes(cls)  # noqa
+def get_sql_fields(cls: "SQLMeta", local=False) -> dict[str, SQLAttribute]:
+    attribs = get_attributes(cls, local=local)
+    parents = SQLAttribute.__mro__[1:-1]  # remove object and self
+    attributes = {
+        k: SQLAttribute.from_field(v) if type(v) in parents else v
+        for k, v in attribs.items()
+    }
+    return attributes
 
 
 unified_gatherer = make_unified_gatherer(SQLAttribute)
@@ -154,7 +160,14 @@ def __init_subclass__(
         **kwargs,
     ):
         slots = "__slots__" in cls.__dict__
-        builder(cls, gatherer=gatherer, methods=methods, flags={"slotted": slots, "kw_only": True})
+
+        builder(
+            cls,
+            gatherer=gatherer,
+            methods=methods,
+            flags={"slotted": slots, "kw_only": True},
+            field_getter=get_sql_fields,
+        )
 
         fields = get_sql_fields(cls)
         valid_fields = {}