agdsn · lukasjuhrich · Oct 31, 2025 · Nov 2, 2025 · Nov 2, 2025
diff --git a/pycroft/model/alembic.ini b/pycroft/model/alembic.ini
diff --git a/...c/versions/4784a128a6dd_empty_revision.py → ...08_19_2059-4784a128a6dd_empty_revision.py b/...c/versions/4784a128a6dd_empty_revision.py → ...08_19_2059-4784a128a6dd_empty_revision.py
diff --git a/...e44e_revise_subnet_address_reservation.py → ...e44e_revise_subnet_address_reservation.py b/...e44e_revise_subnet_address_reservation.py → ...e44e_revise_subnet_address_reservation.py
diff --git a/...32def81e36a_add_name_attribute_to_host.py → ...32def81e36a_add_name_attribute_to_host.py b/...32def81e36a_add_name_attribute_to_host.py → ...32def81e36a_add_name_attribute_to_host.py
diff --git a/...dd_bankaccount_used_for_usersheets_to_.py → ...dd_bankaccount_used_for_usersheets_to_.py b/...dd_bankaccount_used_for_usersheets_to_.py → ...dd_bankaccount_used_for_usersheets_to_.py
diff --git a/...ions/6f1a37baa574_hosts_and_interfaces.py → ...0952-6f1a37baa574_hosts_and_interfaces.py b/...ions/6f1a37baa574_hosts_and_interfaces.py → ...0952-6f1a37baa574_hosts_and_interfaces.py
diff --git a/...c5b_make_membership_fees_more_flexible.py → ...c5b_make_membership_fees_more_flexible.py b/...c5b_make_membership_fees_more_flexible.py → ...c5b_make_membership_fees_more_flexible.py
diff --git a/...08fa5b3cc555_add_some_groups_to_config.py → ...08fa5b3cc555_add_some_groups_to_config.py b/...08fa5b3cc555_add_some_groups_to_config.py → ...08fa5b3cc555_add_some_groups_to_config.py
diff --git a/...8fa_add_table_for_mt940_parsing_errors.py → ...8fa_add_table_for_mt940_parsing_errors.py b/...8fa_add_table_for_mt940_parsing_errors.py → ...8fa_add_table_for_mt940_parsing_errors.py
diff --git a/...ons/7a6449f2489c_infrastructure_change.py → ...104-7a6449f2489c_infrastructure_change.py b/...ons/7a6449f2489c_infrastructure_change.py → ...104-7a6449f2489c_infrastructure_change.py
diff --git a/...0e06e_remove_traffic_credit_and_groups.py → ...0e06e_remove_traffic_credit_and_groups.py b/...0e06e_remove_traffic_credit_and_groups.py → ...0e06e_remove_traffic_credit_and_groups.py
diff --git a/...ions/7855ecffe722_fix_finance_triggers.py → ...2342-7855ecffe722_fix_finance_triggers.py b/...ions/7855ecffe722_fix_finance_triggers.py → ...2342-7855ecffe722_fix_finance_triggers.py
diff --git a/...bccdf410_add_column_for_interface_name.py → ...bccdf410_add_column_for_interface_name.py b/...bccdf410_add_column_for_interface_name.py → ...bccdf410_add_column_for_interface_name.py
diff --git a/...d_permission_level_for_property_groups.py → ...d_permission_level_for_property_groups.py b/...d_permission_level_for_property_groups.py → ...d_permission_level_for_property_groups.py
diff --git a/...6a_add_confirmed_status_to_transaction.py → ...6a_add_confirmed_status_to_transaction.py b/...6a_add_confirmed_status_to_transaction.py → ...6a_add_confirmed_status_to_transaction.py
diff --git a/...lembic/versions/305a51819d48_add_tasks.py → ...2019_06_05_0837-305a51819d48_add_tasks.py b/...lembic/versions/305a51819d48_add_tasks.py → ...2019_06_05_0837-305a51819d48_add_tasks.py
diff --git a/...fc7626e9_add_legacy_status_to_accounts.py → ...fc7626e9_add_legacy_status_to_accounts.py b/...fc7626e9_add_legacy_status_to_accounts.py → ...fc7626e9_add_legacy_status_to_accounts.py
diff --git a/...ersions/f85ef1ef556c_add_wifi_password.py → ...29_1226-f85ef1ef556c_add_wifi_password.py b/...ersions/f85ef1ef556c_add_wifi_password.py → ...29_1226-f85ef1ef556c_add_wifi_password.py
diff --git a/...ions/ff700db83195_add_address_relation.py → ...1219-ff700db83195_add_address_relation.py b/...ions/ff700db83195_add_address_relation.py → ...1219-ff700db83195_add_address_relation.py
diff --git a/...s/f8f1883f81af_allow_deleting_of_rooms.py → ...7-f8f1883f81af_allow_deleting_of_rooms.py b/...s/f8f1883f81af_allow_deleting_of_rooms.py → ...7-f8f1883f81af_allow_deleting_of_rooms.py
diff --git a/...6e83ae_allow_deleting_of_unix_accounts.py → ...6e83ae_allow_deleting_of_unix_accounts.py b/...6e83ae_allow_deleting_of_unix_accounts.py → ...6e83ae_allow_deleting_of_unix_accounts.py
diff --git a/...154b920_allow_deleting_of_switch_ports.py → ...154b920_allow_deleting_of_switch_ports.py b/...154b920_allow_deleting_of_switch_ports.py → ...154b920_allow_deleting_of_switch_ports.py
diff --git a/...undo_set_null_for_user_unix_account_id.py → ...undo_set_null_for_user_unix_account_id.py b/...undo_set_null_for_user_unix_account_id.py → ...undo_set_null_for_user_unix_account_id.py
diff --git a/...ke_address_state_and_addition_not_null.py → ...ke_address_state_and_addition_not_null.py b/...ke_address_state_and_addition_not_null.py → ...ke_address_state_and_addition_not_null.py
diff --git a/..._add_field_which_indicates_a_building_.py → ..._add_field_which_indicates_a_building_.py b/..._add_field_which_indicates_a_building_.py → ..._add_field_which_indicates_a_building_.py
diff --git a/...emove_length_restriction_on_patchport_.py → ...emove_length_restriction_on_patchport_.py b/...emove_length_restriction_on_patchport_.py → ...emove_length_restriction_on_patchport_.py
diff --git a/...ions/c11d3d8b16ae_building_fee_account.py → ...1531-c11d3d8b16ae_building_fee_account.py b/...ions/c11d3d8b16ae_building_fee_account.py → ...1531-c11d3d8b16ae_building_fee_account.py
diff --git a/...ions/3ec1d29bfd10_add_fints_product_id.py → ...2156-3ec1d29bfd10_add_fints_product_id.py b/...ions/3ec1d29bfd10_add_fints_product_id.py → ...2156-3ec1d29bfd10_add_fints_product_id.py
diff --git a/...embic/versions/d8cfeaaee75d_online_reg.py → ...020_08_31_2258-d8cfeaaee75d_online_reg.py b/...embic/versions/d8cfeaaee75d_online_reg.py → ...020_08_31_2258-d8cfeaaee75d_online_reg.py
diff --git a/...rsions/5905825242ff_add_password_token.py → ...7_1318-5905825242ff_add_password_token.py b/...rsions/5905825242ff_add_password_token.py → ...7_1318-5905825242ff_add_password_token.py
diff --git a/...c_add_triggers_for_cleanup_of_address_.py → ...c_add_triggers_for_cleanup_of_address_.py b/...c_add_triggers_for_cleanup_of_address_.py → ...c_add_triggers_for_cleanup_of_address_.py
diff --git a/...9e80a9388_remove_config_cache_group_id.py → ...9e80a9388_remove_config_cache_group_id.py b/...9e80a9388_remove_config_cache_group_id.py → ...9e80a9388_remove_config_cache_group_id.py
diff --git a/...sions/fb8d553a7268_add_account_pattern.py → ..._1448-fb8d553a7268_add_account_pattern.py b/...sions/fb8d553a7268_add_account_pattern.py → ..._1448-fb8d553a7268_add_account_pattern.py
diff --git a/...ions/27f7f8832dfa_add_pre_member_group.py → ...1906-27f7f8832dfa_add_pre_member_group.py b/...ions/27f7f8832dfa_add_pre_member_group.py → ...1906-27f7f8832dfa_add_pre_member_group.py
diff --git a/...83dad0b_use_native_tstzrange_type_for_.py → ...83dad0b_use_native_tstzrange_type_for_.py b/...83dad0b_use_native_tstzrange_type_for_.py → ...83dad0b_use_native_tstzrange_type_for_.py
diff --git a/...24c5_use_bytea_instead_of_textfor_web_.py → ...24c5_use_bytea_instead_of_textfor_web_.py b/...24c5_use_bytea_instead_of_textfor_web_.py → ...24c5_use_bytea_instead_of_textfor_web_.py
diff --git a/...8_use_tstzrange_for_room_history_entry.py → ...8_use_tstzrange_for_room_history_entry.py b/...8_use_tstzrange_for_room_history_entry.py → ...8_use_tstzrange_for_room_history_entry.py
diff --git a/...add_exclusion_constraint_to_membership.py → ...add_exclusion_constraint_to_membership.py b/...add_exclusion_constraint_to_membership.py → ...add_exclusion_constraint_to_membership.py
diff --git a/...4_add_hostname_column_to_dhcphost_view.py → ...4_add_hostname_column_to_dhcphost_view.py b/...4_add_hostname_column_to_dhcphost_view.py → ...4_add_hostname_column_to_dhcphost_view.py
diff --git a/..._add_custom_non_blocking_radius_groups.py → ..._add_custom_non_blocking_radius_groups.py b/..._add_custom_non_blocking_radius_groups.py → ..._add_custom_non_blocking_radius_groups.py
diff --git a/...ons/bc0e0dd480d4_add_bankaccount_owner.py → ...614-bc0e0dd480d4_add_bankaccount_owner.py b/...ons/bc0e0dd480d4_add_bankaccount_owner.py → ...614-bc0e0dd480d4_add_bankaccount_owner.py
diff --git a/...ersions/5234d7ac2b4a_add_unixtombstone.py → ...09_0954-5234d7ac2b4a_add_unixtombstone.py b/...ersions/5234d7ac2b4a_add_unixtombstone.py → ...09_0954-5234d7ac2b4a_add_unixtombstone.py
diff --git a/...c/versions/dda39ad43536_add_mpskclient.py → ...10_02_1435-dda39ad43536_add_mpskclient.py b/...c/versions/dda39ad43536_add_mpskclient.py → ...10_02_1435-dda39ad43536_add_mpskclient.py
diff --git a/...9a3b_add_account_for_non_attributable_.py → ...9a3b_add_account_for_non_attributable_.py b/...9a3b_add_account_for_non_attributable_.py → ...9a3b_add_account_for_non_attributable_.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -117,6 +117,9 @@ include-package-data = true
 [tool.setuptools.packages]
 find = {namespaces = false}
 
+[tool.alembic]
+script_location = "pycroft/model/alembic"
+
 # TOOLS
 [tool.black]
 line-length = 100

diff --git a/scripts/alembic_wrapper.py b/scripts/alembic_wrapper.py
@@ -1,110 +1,41 @@
 #!/usr/bin/env python3
 import logging
-import sys
 import typing as t
-from dataclasses import dataclass
 
-import click
-from alembic import command
 from alembic import autogenerate as autogen
 from alembic.migration import MigrationContext
-from alembic.config import Config
-from rich import print
+from alembic.config import Config, CommandLine
 from rich.console import RenderableType
 from rich.table import Table
 from rich.text import Text
-from sqlalchemy import Connection
 
 from pycroft.model.alembic import get_alembic_config
 from pycroft.model.base import ModelBase
 
 from .connection import get_connection_string, try_create_connection
 
+logger = logging.getLogger(__name__)
 
-@dataclass
-class ContextObject:
-    alembic_cfg: Config
-    conn: Connection
-    logger: logging.Logger
+# TODO this is nice and all for a new custom command, but this does not
+#  solve the problem of making `alembic` work in a production context
+#  (where the files do not exist in $PWD, but in the `pycroft` package's
+#  installation site)
+def main():
+    cli = CommandLine()
+    cli.register_command(diff)
+    cli.main()
 
 
-@click.group()
-@click.pass_context
-@click.option('--verbose', '-v', is_flag=True,
-              help="Verbose, i.e. create the connection with `echo=True`")
-def cli(ctx, verbose: bool):
-    logger = logging.getLogger('alembic_wrapper')
-    logger.setLevel(logging.INFO)
-    logger.addHandler(logging.StreamHandler(sys.stdout))
-
-    conn, engine = try_create_connection(get_connection_string(), logger=logger, wait_for_db=False,
-                                 echo=verbose)
-    ctx.obj = ContextObject(
-        conn=conn,
-        logger=logger,
-        alembic_cfg=get_alembic_config(),
-    )
-
-
-assert isinstance(cli, click.Group)
-
-
-@cli.command(help=command.current.__doc__)
-@click.pass_obj
-def current(obj: ContextObject):
-    command.current(obj.alembic_cfg)
-
-
-@cli.command(help=command.check.__doc__)
-@click.pass_obj
-def check(obj: ContextObject):
-    command.check(obj.alembic_cfg)
-
-
-@cli.command()
-@click.pass_obj
-def diff(obj: ContextObject):
-    # https://alembic.sqlalchemy.org/en/latest/api/autogenerate.html#getting-diffs
-    migration_context = MigrationContext.configure(obj.conn)
+def diff(config: Config) -> None:
+    """Produce a diff of the code-defined schema and actual schema."""
+    breakpoint()
+    conn, _ = try_create_connection(get_connection_string(), logger=logger, wait_for_db=False,
+                                 echo=False)
+    migration_context = MigrationContext.configure(conn)
     metadata = ModelBase.metadata
-    print(render_diffset(autogen.compare_metadata(migration_context, metadata)))
-
-
-@cli.command(help=command.upgrade.__doc__)
-@click.pass_obj
-@click.argument('revision')
-@click.option("--sql", is_flag=True)
-@click.option("--tag")
-def upgrade(
-    obj: ContextObject,
-    revision: str,
-    sql: bool = False,
-    tag: str | None = None,
-):
-    command.upgrade(obj.alembic_cfg, revision)
-
-
-@cli.command(help=command.downgrade.__doc__)
-@click.pass_obj
-@click.argument('revision')
-def downgrade(obj: ContextObject, revision: str):
-    command.downgrade(obj.alembic_cfg, revision)
-
-
-@cli.command(help=command.stamp.__doc__)
-@click.pass_obj
-@click.argument("revision")
-def stamp(obj: ContextObject, revision: str):
-    command.stamp(obj.alembic_cfg, revision)
-
-
-@cli.command(help=command.revision.__doc__)
-@click.pass_obj
-@click.option("-m", "--message", "message")
-@click.option("--autogenerate", is_flag=True, default=False)
-def revision(obj: ContextObject, message: str, autogenerate: bool):
-    command.revision(obj.alembic_cfg, message=message, autogenerate=autogenerate)
-
+    diff_table = render_diffset(autogen.compare_metadata(migration_context, metadata))
+    from rich import print
+    print(diff_table)
 
 def render_diffset(diffs) -> t.Iterator[tuple[t.Any, ...]]:
     table = Table(show_header=False, box=None)
@@ -151,4 +82,5 @@
 
 
 if __name__ == '__main__':
-    cli()
+    # cli()
+    main()