From 5abd5db313c871678bcf54e7a2c2a0fc056401b0 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Sat, 13 Aug 2022 19:23:19 -0700 Subject: [PATCH] Revert "feat(db): add an index for SSHPubKeys.PubKey" This reverts commit 1a7f6e1fa9f500fead3650ef1e4ec9521884e1d8. This commit broke account creation in some way. We'd still like to do this, but we need to ensure it does not intrude on other facets. Extra: We should really work out how this even passed tests; it should not have. --- aurweb/schema.py | 1 - ...d70103d2e82_add_sshpubkeys_pubkey_index.py | 28 ------------------- test/test_migration.py | 23 --------------- 3 files changed, 52 deletions(-) delete mode 100644 migrations/versions/dd70103d2e82_add_sshpubkeys_pubkey_index.py delete mode 100644 test/test_migration.py diff --git a/aurweb/schema.py b/aurweb/schema.py index e1373bf4..d2644541 100644 --- a/aurweb/schema.py +++ b/aurweb/schema.py @@ -87,7 +87,6 @@ SSHPubKeys = Table( Column('UserID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False), Column('Fingerprint', String(44), primary_key=True), Column('PubKey', String(4096), nullable=False), - Index('SSHPubKeysPubKey', 'PubKey'), mysql_engine='InnoDB', mysql_charset='utf8mb4', mysql_collate='utf8mb4_bin', ) diff --git a/migrations/versions/dd70103d2e82_add_sshpubkeys_pubkey_index.py b/migrations/versions/dd70103d2e82_add_sshpubkeys_pubkey_index.py deleted file mode 100644 index 61e4dc79..00000000 --- a/migrations/versions/dd70103d2e82_add_sshpubkeys_pubkey_index.py +++ /dev/null @@ -1,28 +0,0 @@ -"""add SSHPubKeys.PubKey index - -Revision ID: dd70103d2e82 -Revises: d64e5571bc8d -Create Date: 2022-08-12 21:30:26.155465 - -""" -import traceback - -from alembic import op - -# revision identifiers, used by Alembic. -revision = 'dd70103d2e82' -down_revision = 'd64e5571bc8d' -branch_labels = None -depends_on = None - - -def upgrade(): - try: - op.create_index("SSHPubKeysPubKey", "SSHPubKeys", ["PubKey"]) - except Exception: - traceback.print_exc() - print("failing silently...") - - -def downgrade(): - op.drop_index("SSHPubKeysPubKey", "SSHPubKeys") diff --git a/test/test_migration.py b/test/test_migration.py deleted file mode 100644 index cf8702fa..00000000 --- a/test/test_migration.py +++ /dev/null @@ -1,23 +0,0 @@ -import pytest - -from sqlalchemy import inspect - -from aurweb.db import get_engine -from aurweb.models.ssh_pub_key import SSHPubKey - - -@pytest.fixture(autouse=True) -def setup(db_test): - return - - -def test_sshpubkeys_pubkey_index(): - insp = inspect(get_engine()) - indexes = insp.get_indexes(SSHPubKey.__tablename__) - - found_pk = False - for idx in indexes: - if idx.get("name") == "SSHPubKeysPubKey": - assert idx.get("column_names") == ["PubKey"] - found_pk = True - assert found_pk