feat!: declare models by overriding accessors, not by dunder

.check_expression_baseline.json

@@ -0,0 +1,180 @@
+{
+  "entries": {
+    "0d3852f7ba8b76e3": 1,
+    "1733228f0faaf7fb": 1,
+    "1c222663c2ff230c": 1,
+    "25584d8b645569f1": 1,
+    "3038bd0d0e5dcd27": 1,
+    "3715c5f92c09460a": 1,
+    "38ab2da142dab644": 2,
+    "40ca24046bbddecd": 1,
+    "488fd080f7966cde": 2,
+    "50b81498e3d15a2e": 1,
+    "6c9c2319fe934f93": 1,
+    "75efe01dcaf4e7bf": 4,
+    "8983eb94844190c3": 1,
+    "8b7f4ab3b24c1f7b": 1,
+    "96091eb1eba4302d": 1,
+    "9aaed2de90b39a01": 1,
+    "9b9ad66ba54eee09": 2,
+    "a01b9b7363bd773e": 1,
+    "a606fcded0220d2e": 1,
+    "b0c0dd9e3ac04202": 1,
+    "b567771f220e6529": 2,
+    "c956e1c067df95c1": 1,
+    "eef973453cc73e51": 1
+  },
+  "findings": [
+    {
+      "found": "invisible: Optional[bool]",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/expression/column.py",
+      "rule": "ED-10.2"
+    },
+    {
+      "found": "invisible: Optional[bool]",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/expression/column.py",
+      "rule": "ED-10.2"
+    },
+    {
+      "found": "kwargs: Any",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/expression/json.py",
+      "rule": "ED-KWARGS"
+    },
+    {
+      "found": "getattr(expr, \"if_exists\", False)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/alter_table.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"wait\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/alter_table.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"nowait\", False)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/alter_table.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(action, \"if_not_exists\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/column.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(action, \"if_exists\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/column.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(action, \"if_exists\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/constraint.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(action, \"cascade\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/constraint.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"cascade\", False)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/routine.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"restrict\", False)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/routine.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"cascade\", False)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl/routine.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"table_options\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl_table.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"table_options\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl_table.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(table_options, \"comment\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/ddl_table.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, 'replace', False)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/dml.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, 'ignore', False)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/dml.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"columns\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/json.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"json_column\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/json.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"nested_paths\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/json.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"partitions\", [])",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/partition.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"partitions\", [])",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/partition.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"partitions\", [])",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/partition.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"partitions\", [])",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/partition.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"partitions_count\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/partition.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"partitions_count\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/partition.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(definition, \"subpartition_definitions\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/partition.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"nowait\", False)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/truncate.py",
+      "rule": "ED-11.2"
+    },
+    {
+      "found": "getattr(expr, \"wait\", None)",
+      "path": "src/rhosocial/activerecord/backend/impl/mariadb/mixins/truncate.py",
+      "rule": "ED-11.2"
+    }
+  ],
+  "format": 1
+}

.github/workflows/test.yml

@@ -66,8 +66,8 @@ jobs:
 
       - name: Install activerecord and testsuite
         run: |
-          pip install "rhosocial-activerecord @ git+https://github.com/rhosocial/python-activerecord.git@feature/error-taxonomy"  # NOSONAR
-          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@feature/error-taxonomy"  # NOSONAR
+          pip install "rhosocial-activerecord @ git+https://github.com/rhosocial/python-activerecord.git@release/v1.0.0.dev30"  # NOSONAR
+          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@release/v1.0.0.dev17"  # NOSONAR
 
       - name: Install dependencies
         run: |
@@ -153,8 +153,8 @@ jobs:
 
       - name: Install activerecord and testsuite
         run: |
-          pip install "rhosocial-activerecord @ git+https://github.com/rhosocial/python-activerecord.git@feature/error-taxonomy"  # NOSONAR
-          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@feature/error-taxonomy"  # NOSONAR
+          pip install "rhosocial-activerecord @ git+https://github.com/rhosocial/python-activerecord.git@release/v1.0.0.dev30"  # NOSONAR
+          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@release/v1.0.0.dev17"  # NOSONAR
 
       - name: Install dependencies
         run: |

tests/providers/basic_connection.py

@@ -9,7 +9,6 @@
 
 from rhosocial.activerecord.model import ActiveRecord, AsyncActiveRecord
 from rhosocial.activerecord.backend.impl.mariadb.backend import MariaDBBackend
-from rhosocial.activerecord.backend.impl.mariadb.config import MariaDBConnectionConfig
 from rhosocial.activerecord.connection.pool import BackendPool, AsyncBackendPool, PoolConfig
 from rhosocial.activerecord.backend.options import ExecutionOptions
 from rhosocial.activerecord.backend.schema import StatementType
@@ -20,15 +19,21 @@
 
 class SyncTestUser(ActiveRecord):
     """Sync test user model for connection pool tests."""
-    __table_name__ = "test_users"
+    @classmethod
+    def table_name(cls):
+        return "test_users"
+
     id: Optional[int] = None
     name: str
     email: str
 
 
 class AsyncTestUser(AsyncActiveRecord):
     """Async test user model for connection pool tests."""
-    __table_name__ = "test_users"
+    @classmethod
+    def table_name(cls):
+        return "test_users"
+
     id: Optional[int] = None
     name: str
     email: str

tests/providers/query_connection.py

@@ -9,7 +9,6 @@
 
 from rhosocial.activerecord.model import ActiveRecord, AsyncActiveRecord
 from rhosocial.activerecord.backend.impl.mariadb.backend import MariaDBBackend
-from rhosocial.activerecord.backend.impl.mariadb.config import MariaDBConnectionConfig
 from rhosocial.activerecord.connection.pool import BackendPool, AsyncBackendPool, PoolConfig
 from rhosocial.activerecord.backend.options import ExecutionOptions
 from rhosocial.activerecord.backend.schema import StatementType
@@ -20,15 +19,21 @@
 
 class SyncQueryTestUser(ActiveRecord):
     """Sync test user model for query connection pool tests."""
-    __table_name__ = "test_users"
+    @classmethod
+    def table_name(cls):
+        return "test_users"
+
     id: Optional[int] = None
     name: str
     email: str
 
 
 class AsyncQueryTestUser(AsyncActiveRecord):
     """Async test user model for query connection pool tests."""
-    __table_name__ = "test_users"
+    @classmethod
+    def table_name(cls):
+        return "test_users"
+
     id: Optional[int] = None
     name: str
     email: str

tests/rhosocial/activerecord_mariadb_test/feature/backend/ddl/test_ddl_source_collection.py

@@ -168,8 +168,14 @@ def apply(cls, new_class, field_name, annotation, metadata):
 
 
 class DDLDeclarations:
-    __table_name__ = "ddl_source_orders"
-    __primary_key__ = ("tenant_key", "order_key")
+    @classmethod
+    def table_name(cls):
+        return "ddl_source_orders"
+
+    @classmethod
+    def primary_key(cls):
+        return ("tenant_key", "order_key")
+
     __table_constraints__ = TABLE_CONSTRAINTS
     __table_indexes__ = TABLE_INDEXES
     _feature_handlers = [BackendColumnOptionsHandler]
@@ -235,8 +241,13 @@ class AsyncDDLSource(DDLDeclarations, AsyncActiveRecord):
 
 
 class SingleKeyDeclarations:
-    __table_name__ = "ddl_source_single_key"
-    __primary_key__ = "record_pk"
+    @classmethod
+    def table_name(cls):
+        return "ddl_source_single_key"
+
+    @classmethod
+    def primary_key(cls):
+        return "record_pk"
 
     record_id: Annotated[
         int,

tests/rhosocial/activerecord_mariadb_test/feature/backend/ddl/test_derived_ddl_inline_index.py

@@ -22,7 +22,9 @@
 
 
 class Indexed(ActiveRecord):
-    __table_name__ = "indexed"
+    @classmethod
+    def table_name(cls):
+        return "indexed"
 
     id: int
     email: Annotated[str, UseIndex("idx_indexed_email", unique=True)]
@@ -36,7 +38,7 @@ def _create_indexed_table():
     dialect = mariadb_dialect()
     return CreateTableStatement(
         dialect,
-        Table(dialect, Indexed.__table_name__),
+        Table(dialect, Indexed.table_name()),
         columns=[
             ColumnDefinition(dialect, "id", IntegerType(dialect)),
             ColumnDefinition(dialect, "email", VarCharType(dialect, 255)),