From 14737744adea8593f9923c3efca70b4291611eae Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 11 2016 10:31:26 +0000
Subject: Adjust the database model with the feedback from @puiterwijk


---

diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index e15d467..d02c13c 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -854,9 +854,11 @@ class IssueKeys(BASE):
         sa.ForeignKey(
             'projects.id', onupdate='CASCADE',
         ),
-        nullable=True)
+        nullable=False)
     name = sa.Column(sa.Text(), nullable=False)
-    type_ = sa.Column(sa.String(255), nullable=False)
+    key_type = sa.Column(sa.String(255), nullable=False)
+
+    __table_args__ = (sa.UniqueConstraint('project_id', 'name'),)
 
     project = relation(
         'Project', foreign_keys=[project_id], remote_side=[Project.id],
@@ -873,19 +875,18 @@ class IssueValues(BASE):
 
     __tablename__ = 'issue_values'
 
-    id = sa.Column(sa.Integer, primary_key=True)
     key_id = sa.Column(
         sa.Integer,
         sa.ForeignKey(
             'issue_keys.id', ondelete='CASCADE', onupdate='CASCADE',
         ),
-        index=True)
+        primary_key=True)
     issue_uid = sa.Column(
         sa.String(32),
         sa.ForeignKey(
             'issues.uid', ondelete='CASCADE', onupdate='CASCADE',
         ),
-        index=True)
+        primary_key=True)
     value = sa.Column(sa.Text(), nullable=False)
 
     issue = relation(