feat(mysql): adapt to derived DDL with typed table and column options

.github/workflows/test.yml

@@ -58,7 +58,7 @@
       - name: Install activerecord and testsuite
         run: |
           pip install "rhosocial-activerecord @ git+https://github.com/rhosocial/python-activerecord.git@release/v1.0.0.dev30"
-          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@feature/activerecord-derived-ddl"
+          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@release/v1.0.0.dev17"
 
       - name: Create and test database
         run: |
@@ -249,7 +249,7 @@
       - name: Install activerecord and testsuite
         run: |
           pip install "rhosocial-activerecord @ git+https://github.com/rhosocial/python-activerecord.git@release/v1.0.0.dev30"
-          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@feature/activerecord-derived-ddl"
+          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@release/v1.0.0.dev17"
 
       - name: Create and test database
         run: |
@@ -356,7 +356,7 @@
       - name: Install activerecord and testsuite
         run: |
           pip install "rhosocial-activerecord @ git+https://github.com/rhosocial/python-activerecord.git@release/v1.0.0.dev30"
-          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@feature/activerecord-derived-ddl"
+          pip install "rhosocial-activerecord-testsuite @ git+https://github.com/rhosocial/python-activerecord-testsuite.git@release/v1.0.0.dev17"
 
       - name: Create and test database
         run: |

CLAUDE.md

@@ -28,4 +28,10 @@ This project is under active development. Key features implemented:
 
 ## Version Control and Changelog
 
-This project adheres to the same version control, branching, commit message, and changelog management standards as the main `python-activerecord` project.
+This project adheres to the same version control, branching, commit message, and changelog management standards as the main `python-activerecord` project.
+
+## Search Scope
+
+- Use `rg` for repository searches; never use `grep`.
+- Limit searches to this `python-activerecord` repository and its related testsuite/backend directories.
+- Exclude `.git/`, `.venv*/`, `__pycache__/`, `build/`, `dist/`, and other cache directories.

changelog.d/56.added.md

@@ -0,0 +1 @@
+Adapt the MySQL backend to derived DDL with typed table and column options: `MySQLColumnDefinition`, `MySQLCreateTableOptions` with typed `AUTO_INCREMENT` and `ROW_FORMAT`, a partition lifecycle provider with validated subpartition names, a version-aware charset/collation/storage-engine protocol, `MySQLInsertExpression` with typed `IGNORE`/`REPLACE`, and `MySQLAddColumn` with a typed `after` field. Add a type-domain negative contract plus coverage for `DDLSource` collection, table inheritance, tablespace and inline-index rendering.

changelog.d/56.internal.md

@@ -0,0 +1 @@
+Install core and testsuite from release branches in CI instead of the derived-DDL feature branch, repair TYPE_CHECKING imports broken by the expression namespace split, register the pytest markers the suite already uses, and stop the pre-commit hook from blocking commits on revisions that predate `scripts/preflight.sh`.

changelog.d/56.removed.md

@@ -0,0 +1 @@
+Remove the reserved `dialect_options` bag from data-type value objects, DDL and admin expressions, and partition definitions, along with the legacy identity fields on column classes.

pyproject.toml

@@ -99,6 +99,9 @@ markers = [
     "benchmark_sync: marks sync benchmark tests",
     "benchmark_write: marks write benchmark tests",
     "benchmark_read: marks read benchmark tests",
+    "feature: category label for feature-area tests; changes collection grouping only, not ordering",
+    "benchmark_relation: marks relation benchmarks; changes collection grouping only, not ordering",
+
 ]
 
 [tool.coverage.run]

scripts/install-git-hooks.sh

@@ -4,21 +4,42 @@
 # Installs an optional pre-commit hook that runs scripts/preflight.sh so a
 # broken import/lint is caught before the commit (and before a CI round-trip).
 # Bypass a single commit with: git commit --no-verify
+#
+# Re-run this after pulling, and re-run it from the repository root. To remove
+# the hook, delete .git/hooks/pre-commit (or the core.hooksPath directory).
 set -euo pipefail
 
 cd "$(dirname "$0")/.."
 
-HOOK=".git/hooks/pre-commit"
-if [ ! -d .git/hooks ]; then
-  echo "install-git-hooks: .git/hooks not found (not a git repo?)" >&2
-  exit 2
+# git ignores .git/hooks entirely once core.hooksPath is set, so a hook written
+# there would never run while this script still reported success.
+HOOKS_PATH="$(git config core.hooksPath || true)"
+if [ -n "$HOOKS_PATH" ]; then
+  echo "install-git-hooks: core.hooksPath is set to '$HOOKS_PATH'." >&2
+  echo "install-git-hooks: .git/hooks is ignored by git; writing the hook to" >&2
+  echo "                 '$HOOKS_PATH/pre-commit' instead." >&2
+  HOOK="$HOOKS_PATH/pre-commit"
+  mkdir -p "$HOOKS_PATH"
+else
+  HOOK=".git/hooks/pre-commit"
+  if [ ! -d .git/hooks ]; then
+    echo "install-git-hooks: .git/hooks not found (not a git repo?)" >&2
+    exit 2
+  fi
 fi
 
 cat > "$HOOK" <<'HOOK_BODY'
 #!/usr/bin/env bash
 # Installed by scripts/install-git-hooks.sh — runs the local pre-flight.
 # Skip with: git commit --no-verify
-exec "$(git rev-parse --show-toplevel)/scripts/preflight.sh"
+#
+# The guard below matters on older revisions: this hook is a local, untracked
+# artifact, so it survives a checkout of a commit that predates
+# scripts/preflight.sh. Without the guard, exec fails with a bare
+# "No such file or directory" and blocks the commit with nothing to act on.
+PREFLIGHT="$(git rev-parse --show-toplevel)/scripts/preflight.sh"
+[ -x "$PREFLIGHT" ] || exit 0
+exec "$PREFLIGHT"
 HOOK_BODY
 chmod +x "$HOOK"
 

src/rhosocial/activerecord/backend/impl/mysql/__init__.py

@@ -21,7 +21,7 @@
 from .backend import MySQLBackend
 from .async_backend import AsyncMySQLBackend
 from .config import MySQLConnectionConfig
-from .collation import MySQLCollation, MySQLCollationValidator
+from .mixins.charset_collation import MySQLCharset, MySQLCollation, MySQLStorageEngine
 from .dialect import MySQLDialect
 from .transaction import MySQLTransactionManager
 from .async_transaction import AsyncMySQLTransactionManager
@@ -158,7 +158,8 @@
     # Dialect related
     "MySQLDialect",
     "MySQLCollation",
-    "MySQLCollationValidator",
+    "MySQLCharset",
+    "MySQLStorageEngine",
     # Transaction - Sync and Async
     "MySQLTransactionManager",
     "AsyncMySQLTransactionManager",

src/rhosocial/activerecord/backend/impl/mysql/async_transaction.py

@@ -18,7 +18,7 @@
 from .mixins import MySQLTransactionMixin
 
 if TYPE_CHECKING:
-    from .backend import AsyncMySQLBackend
+    from .async_backend import AsyncMySQLBackend
 
 
 class AsyncMySQLTransactionManager(MySQLTransactionMixin, AsyncTransactionManager):

src/rhosocial/activerecord/backend/impl/mysql/dialect.py

@@ -6,10 +6,9 @@
 based on the MySQL version provided at initialization.
 """
 
-from typing import Any, Dict, List, Optional, Tuple, TYPE_CHECKING
+from typing import Any, List, Optional, Tuple, TYPE_CHECKING
 
 from rhosocial.activerecord.backend.dialect.base import SQLDialectBase
-from rhosocial.activerecord.backend.expression.bases import ToSQLProtocol
 from rhosocial.activerecord.backend.dialect.protocols import (
     CollationSupport,
     CTESupport,
@@ -36,7 +35,9 @@
     TruncateSupport,
     TransactionControlSupport,
     SQLFunctionSupport,
-    DDLTypeSupport,
+    DataTypeSupport,
+    UserDefinedTypeSupport,
+    DomainSupport,
 )
 from rhosocial.activerecord.backend.dialect.mixins import (
     CollationMixin,
@@ -70,10 +71,11 @@
     DQLMixin,
     DMLMixin,
     DDLColumnMixin,
+    UserDefinedTypeMixin,
+    DomainMixin,
     TransactionControlMixin,
     SetOperationMixin,
 )
-from rhosocial.activerecord.backend.dialect.exceptions import UnsupportedFeatureError
 from .protocols import (
     MySQLTriggerSupport,
     MySQLTableSupport,
@@ -120,7 +122,7 @@
     MySQLLoadXMLLMixin,
     MySQLAdminCommandMixin,
     MySQLDateTimeMixin,
-    MySQLCollationMixin,
+    MySQLCharsetCollationMixin,
     MySQLCTEMixin,
     MySQLWindowMixin,
     MySQLGroupingMixin,
@@ -131,6 +133,7 @@
     MySQLDDLColumnMixin,
     MySQLViewMixin,
     MySQLSchemaMixin,
+    MySQLDatabaseMixin,
     MySQLConstraintMixin,
     MySQLGeneratedColumnMixin,
     MySQLFunctionMixin,
@@ -139,32 +142,16 @@
 from .show.dialect import MySQLShowDialectMixin
 
 if TYPE_CHECKING:
-    from rhosocial.activerecord.backend.expression.collation import CollateExpression
     from rhosocial.activerecord.backend.expression.statements import (
-        CreateTableExpression,
-        CreateViewExpression,
-        DropViewExpression,
-        ExplainExpression,
         InsertExpression,
     )
-    from rhosocial.activerecord.backend.expression.statements.fulltext_match import (
-        FulltextMatchExpression,
-    )
-    from rhosocial.activerecord.backend.expression.statements.ddl_trigger import (
-        CreateTriggerExpression,
-        DropTriggerExpression,
-    )
-    from rhosocial.activerecord.backend.expression.transaction import (
-        SetTransactionExpression,
-        BeginTransactionExpression,
-    )
 
 
 class MySQLDialect(
     SQLDialectBase,
     # MySQL-specific mixins (before generic mixins to override methods)
     MySQLDateTimeMixin,
-    MySQLCollationMixin,
+    MySQLCharsetCollationMixin,
     MySQLCTEMixin,
     MySQLWindowMixin,
     MySQLGroupingMixin,
@@ -175,6 +162,7 @@ class MySQLDialect(
     MySQLDDLColumnMixin,
     MySQLViewMixin,
     MySQLSchemaMixin,
+    MySQLDatabaseMixin,
     MySQLConstraintMixin,
     MySQLGeneratedColumnMixin,
     MySQLFunctionMixin,
@@ -221,6 +209,8 @@ class MySQLDialect(
     MySQLModifyColumnMixin,
     MySQLJsonDualityViewMixin,
     MySQLTypeSupportMixin,
+    UserDefinedTypeMixin,
+    DomainMixin,
     MySQLOptimizerHintMixin,
     MySQLTableStatementMixin,
     MySQLMaintenanceMixin,
@@ -281,7 +271,9 @@ class MySQLDialect(
     MySQLLoadXMLSupport,
     MySQLAdminCommandSupport,
     SQLFunctionSupport,
-    DDLTypeSupport,
+    DataTypeSupport,
+    UserDefinedTypeSupport,
+    DomainSupport,
 ):
     """
     MySQL dialect implementation that adapts to the MySQL version.
@@ -411,9 +403,10 @@ def get_upsert_syntax_type(self) -> str:
     def format_insert_statement(self, expr: "InsertExpression") -> Tuple[str, tuple]:
         """Format INSERT statement with MySQL-specific options.
 
-        Extends the base implementation to support:
-        - INSERT IGNORE via dialect_options={'ignore': True}
-        - REPLACE INTO via dialect_options={'replace': True}
+        Extends the base implementation to support the typed flags on
+        ``MySQLInsertExpression``:
+        - ``ignore=True`` → ``INSERT IGNORE``
+        - ``replace=True`` → ``REPLACE INTO``
 
         Args:
             expr: InsertExpression instance
@@ -430,8 +423,8 @@ def format_insert_statement(self, expr: "InsertExpression") -> Tuple[str, tuple]
             expr.validate(strict=True)
 
         # Check for conflicting options
-        is_replace = expr.dialect_options.get("replace", False)
-        is_ignore = expr.dialect_options.get("ignore", False)
+        is_replace = getattr(expr, "replace", False)
+        is_ignore = getattr(expr, "ignore", False)
 
         if is_replace and is_ignore:
             raise ValueError("Cannot use both 'replace' and 'ignore' options together")

src/rhosocial/activerecord/backend/impl/mysql/examples/ddl/create_table.py

@@ -15,6 +15,7 @@
 import os
 from rhosocial.activerecord.backend.impl.mysql import MySQLBackend
 from rhosocial.activerecord.backend.impl.mysql.config import MySQLConnectionConfig
+from rhosocial.activerecord.backend.impl.mysql.expression import MySQLCreateTableOptions
 from rhosocial.activerecord.backend.expression import (
     DropTableExpression,
     CreateTableExpression,
@@ -41,7 +42,7 @@
 dialect = backend.dialect
 
 # Drop if exists for clean setup
-drop = DropTableExpression(dialect=dialect, table_name="products", if_exists=True)
+drop = DropTableExpression(dialect=dialect, table="products", if_exists=True)
 sql, params = drop.to_sql()
 backend.execute(sql, params)
 
@@ -102,14 +103,11 @@
 # Create table with MySQL-specific ENGINE and CHARSET options
 create_expr = CreateTableExpression(
     dialect=dialect,
-    table_name="products",
+    table="products",
     columns=columns,
     indexes=indexes,
     if_not_exists=True,
-    dialect_options={
-        "engine": "InnoDB",
-        "charset": "utf8mb4",
-    },
+    table_options=MySQLCreateTableOptions(dialect, engine="InnoDB", charset="utf8mb4"),
 )
 
 sql, params = create_expr.to_sql()
@@ -131,7 +129,7 @@
 # ============================================================
 # SECTION: Teardown (necessary for execution, reference only)
 # ============================================================
-drop_table = DropTableExpression(dialect=dialect, table_name="products", if_exists=True)
+drop_table = DropTableExpression(dialect=dialect, table="products", if_exists=True)
 sql, params = drop_table.to_sql()
 backend.execute(sql, params)
 backend.disconnect()
@@ -141,7 +139,7 @@
 # ============================================================
 # Key points:
 # 1. Use ColumnConstraint with is_auto_increment=True for AUTO_INCREMENT
-# 2. MySQL dialect_options supports 'engine' and 'charset' keys
+# 2. MySQL table options (engine/charset) are typed on MySQLCreateTableOptions
 # 3. IndexDefinition creates inline indexes within CREATE TABLE
 # 4. Use current_timestamp(dialect) for SQL niladic functions (no parentheses)
 # 5. Use introspector.get_columns() to verify table structure

src/rhosocial/activerecord/backend/impl/mysql/examples/schema_diff/column_order.py

@@ -67,15 +67,18 @@
     MySQLSchemaDiffer,
 )
 from rhosocial.activerecord.backend.expression.statements.ddl_alter import (  # noqa: E402
-    AlterTableExpression, AddColumn,
+    AlterTableExpression,
+)
+from rhosocial.activerecord.backend.impl.mysql.expression import (  # noqa: E402
+    MySQLAddColumn,
 )
 
 builder = SyncSchemaSnapshotBuilder(backend.introspector, dialect)
 snapshot_before = builder.build()
 
 # Add `age` column between `name` and `email` — shifts email to position 4
-add_col = AddColumn(dialect, ColumnDefinition(dialect, "age", IntegerType(dialect)),
-                    dialect_options={"after": "name"})
+add_col = MySQLAddColumn(dialect, ColumnDefinition(dialect, "age", IntegerType(dialect)),
+                         after="name")
 alter_expr = AlterTableExpression(dialect, "users", [add_col])
 sql, params = alter_expr.to_sql()
 backend.execute(sql, params)

src/rhosocial/activerecord/backend/impl/mysql/examples/transaction/exclusive.py

@@ -11,6 +11,7 @@
 import os
 from rhosocial.activerecord.backend.impl.mysql import MySQLBackend
 from rhosocial.activerecord.backend.impl.mysql.config import MySQLConnectionConfig
+from rhosocial.activerecord.backend.impl.mysql.expression import MySQLCreateTableOptions
 from rhosocial.activerecord.backend.expression import (
     CreateTableExpression,
     DropTableExpression,
@@ -78,7 +79,7 @@
         ),
     ],
     if_not_exists=True,
-    dialect_options={"engine": "InnoDB"},
+    table_options=MySQLCreateTableOptions(dialect, engine="InnoDB"),
 )
 sql, params = create_table.to_sql()
 backend.execute(sql, params)

src/rhosocial/activerecord/backend/impl/mysql/examples/transaction/for_update.py

@@ -26,6 +26,7 @@
 backend.connect()
 dialect = backend.dialect
 
+from rhosocial.activerecord.backend.impl.mysql.expression import MySQLCreateTableOptions
 from rhosocial.activerecord.backend.expression import (  # noqa: E402
     CreateTableExpression,
     InsertExpression,
@@ -81,7 +82,7 @@
         ),
     ],
     if_not_exists=True,
-    dialect_options={"engine": "InnoDB"},
+    table_options=MySQLCreateTableOptions(dialect, engine="InnoDB"),
 )
 sql, params = create_table.to_sql()
 backend.execute(sql, params)