[copr/copr] 05/08: [frontend] de-duplicate *_private ids

This is an automated email from the git hooks/post-receive script. praiskup pushed a commit to branch master in repository copr/copr. commit 83723279a072f161a59a2fdaec061a15ee58c884 Author: Pavel Raiskup <praiskup(a)redhat.com&gt; AuthorDate: Wed Apr 3 11:17:46 2019 +0200 [frontend] de-duplicate *_private ids Squash *Private.id and *Private.*_id into *Private.*_id. Another artificial *.id would only cause confusion because it would contain a completely different id range. --- .../29c352bde564_separate_private_stuff_into_private_.py | 10 ++-------- .../7723d580c625_copy_private_data_to_private_tables.py | 2 +- frontend/coprs_frontend/coprs/models.py | 16 ++++++++-------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/frontend/coprs_frontend/alembic/schema/versions/29c352bde564_separate_private_stuff_into_private_.py b/frontend/coprs_frontend/alembic/schema/versions/29c352bde564_separate_private_stuff_into_private_.py index 329385f..a02bcb1 100644 --- a/frontend/coprs_frontend/alembic/schema/versions/29c352bde564_separate_private_stuff_into_private_.py +++ b/frontend/coprs_frontend/alembic/schema/versions/29c352bde564_separate_private_stuff_into_private_.py @@ -16,7 +16,6 @@ import sqlalchemy as sa def upgrade(): op.create_table('user_private', - sa.Column('id', sa.Integer(), nullable=False), sa.Column('mail', sa.String(length=150), nullable=False), sa.Column('timezone', sa.String(length=50), nullable=True), sa.Column('api_login', sa.String(length=40), nullable=False), @@ -24,24 +23,19 @@ def upgrade(): sa.Column('api_token_expiration', sa.Date(), nullable=False), sa.Column('user_id', sa.Integer(), nullable=False), sa.ForeignKeyConstraint(['user_id'], ['user.id'], ), - sa.PrimaryKeyConstraint('id') + sa.PrimaryKeyConstraint('user_id') ) - op.create_index(op.f('ix_user_private_user_id'), 'user_private', ['user_id'], unique=True) op.create_table('copr_private', - sa.Column('id', sa.Integer(), nullable=False), sa.Column('webhook_secret', sa.String(length=100), nullable=True), sa.Column('scm_api_auth_json', sa.Text(), nullable=True), sa.Column('copr_id', sa.Integer(), nullable=False), sa.ForeignKeyConstraint(['copr_id'], ['copr.id'], ), - sa.PrimaryKeyConstraint('id') + sa.PrimaryKeyConstraint('copr_id') ) op.create_index('copr_private_webhook_secret', 'copr_private', ['webhook_secret'], unique=False) - op.create_index(op.f('ix_copr_private_copr_id'), 'copr_private', ['copr_id'], unique=True) def downgrade(): - op.drop_index(op.f('ix_copr_private_copr_id'), table_name='copr_private') op.drop_index('copr_private_webhook_secret', table_name='copr_private') op.drop_table('copr_private') - op.drop_index(op.f('ix_user_private_user_id'), table_name='user_private') op.drop_table('user_private') diff --git a/frontend/coprs_frontend/alembic/schema/versions/7723d580c625_copy_private_data_to_private_tables.py b/frontend/coprs_frontend/alembic/schema/versions/7723d580c625_copy_private_data_to_private_tables.py index 5c266eb..4b2de50 100644 --- a/frontend/coprs_frontend/alembic/schema/versions/7723d580c625_copy_private_data_to_private_tables.py +++ b/frontend/coprs_frontend/alembic/schema/versions/7723d580c625_copy_private_data_to_private_tables.py @@ -19,7 +19,7 @@ def upgrade(): session.execute("""INSERT INTO copr_private(webhook_secret, scm_api_auth_json, copr_id) (select webhook_secret, scm_api_auth_json, id from copr) ON CONFLICT DO NOTHING;""") session.execute("""INSERT INTO user_private(mail, timezone, api_login, api_token, api_token_expiration, user_id) - (select mail, timezone, api_login, api_token, api_token_expiration, id from \"user\") ON CONFLICT DO NOTHING;""") + (select mail, timezone, api_login, api_token, api_token_expiration, id as user_id from \"user\") ON CONFLICT DO NOTHING;""") def downgrade(): # no downgrade diff --git a/frontend/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py index 114be6b..8858124 100644 --- a/frontend/coprs_frontend/coprs/models.py +++ b/frontend/coprs_frontend/coprs/models.py @@ -35,7 +35,10 @@ class UserPrivate(db.Model, helpers.Serializer): """ Records all the private information for a user. """ - id = db.Column(db.Integer, primary_key=True) + # id (primary key + foreign key) + user_id = db.Column(db.Integer, db.ForeignKey("user.id"), + primary_key=True, nullable=False) + user = db.relationship("User", back_populates="private") # email mail = db.Column(db.String(150), nullable=False) @@ -49,8 +52,6 @@ class UserPrivate(db.Model, helpers.Serializer): api_token_expiration = db.Column( db.Date, nullable=False, default=datetime.date(2000, 1, 1)) - user_id = db.Column(db.Integer, db.ForeignKey("user.id"), index=True, nullable=False) - user = db.relationship("User", back_populates="private") class User(db.Model, helpers.Serializer): @@ -255,7 +256,10 @@ class CoprPrivate(db.Model, helpers.Serializer): db.Index('copr_private_webhook_secret', 'webhook_secret'), ) - id = db.Column(db.Integer, primary_key=True) + # copr relation + copr_id = db.Column(db.Integer, db.ForeignKey("copr.id"), index=True, + nullable=False, primary_key=True) + copr = db.relationship("Copr", back_populates="private") # a secret to be used for webhooks authentication webhook_secret = db.Column(db.String(100)) @@ -263,10 +267,6 @@ class CoprPrivate(db.Model, helpers.Serializer): # remote Git sites auth info scm_api_auth_json = db.Column(db.Text) - # copr relation - copr_id = db.Column(db.Integer, db.ForeignKey("copr.id"), index=True, nullable=False) - copr = db.relationship("Copr", back_populates="private") - class Copr(db.Model, helpers.Serializer, CoprSearchRelatedData): """ -- To stop receiving notification emails like this one, please contact the administrator of this repository.