From a068d3dfc7e6ddf53c0eef9b17c835e5299544e8 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 31 2016 06:22:54 +0000 Subject: Name the foreign keys in the model as well --- diff --git a/pagure/lib/model.py b/pagure/lib/model.py index ce5092a..25276d5 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -221,7 +221,9 @@ class UserEmail(BASE): id = sa.Column(sa.Integer, primary_key=True) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='user_emails_user_id_fkey'), nullable=False, index=True) email = sa.Column(sa.String(255), nullable=False, unique=True) @@ -244,7 +246,9 @@ class UserEmailPending(BASE): id = sa.Column(sa.Integer, primary_key=True) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='user_emails_pending_user_id_fkey'), nullable=False, index=True) email = sa.Column(sa.String(255), nullable=False, unique=True) @@ -275,7 +279,9 @@ class Project(BASE): id = sa.Column(sa.Integer, primary_key=True) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='projects_user_id_fkey'), nullable=False, index=True) name = sa.Column(sa.String(255), nullable=False, index=True) @@ -286,7 +292,9 @@ class Project(BASE): avatar_email = sa.Column(sa.Text, nullable=True) parent_id = sa.Column( sa.Integer, - sa.ForeignKey('projects.id', onupdate='CASCADE'), + sa.ForeignKey( + 'projects.id', onupdate='CASCADE' + name='projects_parent_id_fkey'), nullable=True) _priorities = sa.Column(sa.Text, nullable=True) _milestones = sa.Column(sa.Text, nullable=True) @@ -479,11 +487,15 @@ class ProjectUser(BASE): id = sa.Column(sa.Integer, primary_key=True) project_id = sa.Column( sa.Integer, - sa.ForeignKey('projects.id', onupdate='CASCADE'), + sa.ForeignKey( + 'projects.id', onupdate='CASCADE', + name='user_projects_project_id_fkey'), nullable=False) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='user_projects_user_id_fkey'), nullable=False, index=True) @@ -501,7 +513,8 @@ class Issue(BASE): project_id = sa.Column( sa.Integer, sa.ForeignKey( - 'projects.id', onupdate='CASCADE'), + 'projects.id', onupdate='CASCADE', + name='issues_project_id_fkey'), primary_key=True) title = sa.Column( sa.Text, @@ -511,18 +524,23 @@ class Issue(BASE): nullable=False) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='issues_user_id_fkey'), nullable=False, index=True) assignee_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='issues_assignee_id_fkey'), nullable=True, index=True) status = sa.Column( sa.String(255), sa.ForeignKey( - 'status_issue.status', onupdate='CASCADE'), + 'status_issue.status', onupdate='CASCADE', + name='issues_status_fkey'), default='Open', nullable=False) private = sa.Column(sa.Boolean, nullable=False, default=False) @@ -623,12 +641,14 @@ class IssueToIssue(BASE): parent_issue_id = sa.Column( sa.String(32), sa.ForeignKey( - 'issues.uid', ondelete='CASCADE', onupdate='CASCADE'), + 'issues.uid', ondelete='CASCADE', onupdate='CASCADE', + name='issue_to_issue_parent_issue_id_fkey'), primary_key=True) child_issue_id = sa.Column( sa.String(32), sa.ForeignKey( - 'issues.uid', ondelete='CASCADE', onupdate='CASCADE'), + 'issues.uid', ondelete='CASCADE', onupdate='CASCADE', + name='issue_to_issue_child_issue_id_fkey'), primary_key=True) @@ -644,24 +664,31 @@ class IssueComment(BASE): issue_uid = sa.Column( sa.String(32), sa.ForeignKey( - 'issues.uid', ondelete='CASCADE', onupdate='CASCADE'), + 'issues.uid', ondelete='CASCADE', onupdate='CASCADE', + name='issue_comments_issue_uid_fkey'), index=True) comment = sa.Column( sa.Text(), nullable=False) parent_id = sa.Column( sa.Integer, - sa.ForeignKey('issue_comments.id', onupdate='CASCADE'), + sa.ForeignKey( + 'issue_comments.id', onupdate='CASCADE', + name='issue_comments_parent_id_fkey'), nullable=True) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='issue_comments_user_id_fkey'), nullable=False, index=True) edited_on = sa.Column(sa.DateTime, nullable=True) editor_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='issue_comments_editor_id_fkey'), nullable=True) date_created = sa.Column(sa.DateTime, nullable=False, @@ -732,12 +759,14 @@ class TagIssue(BASE): tag = sa.Column( sa.String(255), sa.ForeignKey( - 'tags.tag', ondelete='CASCADE', onupdate='CASCADE'), + 'tags.tag', ondelete='CASCADE', onupdate='CASCADE', + name='tags_issues_tag_fkey'), primary_key=True) issue_uid = sa.Column( sa.String(32), sa.ForeignKey( - 'issues.uid', ondelete='CASCADE', onupdate='CASCADE'), + 'issues.uid', ondelete='CASCADE', onupdate='CASCADE', + name='tags_issues_issue_uid_fkey'), primary_key=True) date_created = sa.Column(sa.DateTime, nullable=False, default=datetime.datetime.utcnow) @@ -763,12 +792,14 @@ class TagProject(BASE): tag = sa.Column( sa.String(255), sa.ForeignKey( - 'tags.tag', ondelete='CASCADE', onupdate='CASCADE'), + 'tags.tag', ondelete='CASCADE', onupdate='CASCADE', + name='tags_projects_tag_fkey'), primary_key=True) project_id = sa.Column( sa.Integer, sa.ForeignKey( - 'projects.id', ondelete='CASCADE', onupdate='CASCADE'), + 'projects.id', ondelete='CASCADE', onupdate='CASCADE', + name='tags_projects_project_id_fkey'), primary_key=True) date_created = sa.Column(sa.DateTime, nullable=False, default=datetime.datetime.utcnow) @@ -800,7 +831,8 @@ class PullRequest(BASE): project_id = sa.Column( sa.Integer, sa.ForeignKey( - 'projects.id', ondelete='CASCADE', onupdate='CASCADE'), + 'projects.id', ondelete='CASCADE', onupdate='CASCADE', + name='pull_requests_project_id_fkey'), primary_key=True) branch = sa.Column( sa.Text(), @@ -808,7 +840,8 @@ class PullRequest(BASE): project_id_from = sa.Column( sa.Integer, sa.ForeignKey( - 'projects.id', ondelete='CASCADE', onupdate='CASCADE'), + 'projects.id', ondelete='CASCADE', onupdate='CASCADE', + name='pull_requests_project_id_from_fkey'), nullable=True) remote_git = sa.Column( sa.Text(), @@ -827,12 +860,16 @@ class PullRequest(BASE): nullable=True) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='pull_requests_user_id_fkey'), nullable=False, index=True) assignee_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='pull_requests_assignee_id_fkey'), nullable=True, index=True) merge_status = sa.Column( @@ -844,12 +881,15 @@ class PullRequest(BASE): status = sa.Column( sa.String(255), sa.ForeignKey( - 'status_pull_requests.status', onupdate='CASCADE'), + 'status_pull_requests.status', onupdate='CASCADE', + name='pull_requests__status_fkey'), default='Open', nullable=False) closed_by_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='pull_requests_closed_by_id_fkey'), nullable=True) closed_at = sa.Column( sa.DateTime, @@ -1000,7 +1040,8 @@ class PullRequestComment(BASE): pull_request_uid = sa.Column( sa.String(32), sa.ForeignKey( - 'pull_requests.uid', ondelete='CASCADE', onupdate='CASCADE'), + 'pull_requests.uid', ondelete='CASCADE', onupdate='CASCADE' + name='pull_request_comments_pull_requests_uid_fkey'), nullable=False) commit_id = sa.Column( sa.String(40), @@ -1008,7 +1049,9 @@ class PullRequestComment(BASE): index=True) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='pull_request_comments_users_id_fkey'), nullable=False, index=True) filename = sa.Column( @@ -1025,7 +1068,9 @@ class PullRequestComment(BASE): nullable=False) parent_id = sa.Column( sa.Integer, - sa.ForeignKey('pull_request_comments.id', onupdate='CASCADE'), + sa.ForeignKey( + 'pull_request_comments.id', onupdate='CASCADE', + name='pull_request_comments_parent_id_fkey'), nullable=True) notification = sa.Column(sa.Boolean, default=False, nullable=False) edited_on = sa.Column(sa.DateTime, nullable=True) @@ -1096,11 +1141,14 @@ class PullRequestFlag(BASE): pull_request_uid = sa.Column( sa.String(32), sa.ForeignKey( - 'pull_requests.uid', ondelete='CASCADE', onupdate='CASCADE'), + 'pull_requests.uid', ondelete='CASCADE', onupdate='CASCADE', + name='pull_request_flags_pull_requests_uid_fkey'), nullable=False) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='pull_request_flags_user_id_fkey'), nullable=False, index=True) username = sa.Column( @@ -1183,12 +1231,16 @@ class PagureGroup(BASE): group_name = sa.Column(sa.String(16), nullable=False, unique=True) group_type = sa.Column( sa.String(16), - sa.ForeignKey('pagure_group_type.group_type'), + sa.ForeignKey( + 'pagure_group_type.group_type', + name='pagure_group_grp_type_fkey'), default='user', nullable=False) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='pagure_group_user_id_fkey'), nullable=False, index=True) created = sa.Column( @@ -1223,7 +1275,8 @@ class ProjectGroup(BASE): primary_key=True) group_id = sa.Column( sa.Integer, sa.ForeignKey( - 'pagure_group.id', name='projects_groups_pagure_group_id_fkey'), + 'pagure_group.id', + name='projects_groups_group_id_fkey'), primary_key=True) # Constraints @@ -1266,12 +1319,16 @@ class Token(BASE): id = sa.Column(sa.String(64), primary_key=True) user_id = sa.Column( sa.Integer, - sa.ForeignKey('users.id', onupdate='CASCADE'), + sa.ForeignKey( + 'users.id', onupdate='CASCADE', + name='tokens_user_id_fkey'), nullable=False, index=True) project_id = sa.Column( sa.Integer, - sa.ForeignKey('projects.id', onupdate='CASCADE'), + sa.ForeignKey( + 'projects.id', onupdate='CASCADE', + name='tokens_project_id_fkey'), nullable=False, index=True) expiration = sa.Column( @@ -1332,9 +1389,15 @@ class TokenAcl(BASE): __tablename__ = 'tokens_acls' token_id = sa.Column( - sa.String(64), sa.ForeignKey('tokens.id'), primary_key=True) + sa.String(64), sa.ForeignKey( + 'tokens.id', + name='tokens_acls_token_id_fkey'), + primary_key=True) acl_id = sa.Column( - sa.Integer, sa.ForeignKey('acls.id'), primary_key=True) + sa.Integer, sa.ForeignKey( + 'acls.id', + name='tokens_acls_acl_id_fkey'), + primary_key=True) # Constraints __table_args__ = ( @@ -1358,7 +1421,10 @@ class PagureUserVisit(BASE): id = sa.Column(sa.Integer, primary_key=True) user_id = sa.Column( - sa.Integer, sa.ForeignKey('users.id'), nullable=False) + sa.Integer, sa.ForeignKey( + 'users.id', + name='pagure_user_visit_user_id_fkey'), + nullable=False) visit_key = sa.Column( sa.String(40), nullable=False, unique=True, index=True) user_ip = sa.Column(sa.String(50), nullable=False) @@ -1376,9 +1442,15 @@ class PagureUserGroup(BASE): __tablename__ = 'pagure_user_group' user_id = sa.Column( - sa.Integer, sa.ForeignKey('users.id'), primary_key=True) + sa.Integer, sa.ForeignKey( + 'users.id', + name='pagure_user_group_user_id_fkey'), + primary_key=True) group_id = sa.Column( - sa.Integer, sa.ForeignKey('pagure_group.id'), primary_key=True) + sa.Integer, sa.ForeignKey( + 'pagure_group.id', + name='pagure_user_group_pkey'), + primary_key=True) # Constraints __table_args__ = (