Merge pull request #2529 from alphagov/add-expiry-date-to-constraint

Allow api_keys names to be reused

app/models.py

@@ -748,7 +748,7 @@ class ApiKey(db.Model, Versioned):
     created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)
 
     __table_args__ = (
-        UniqueConstraint('service_id', 'name', name='uix_service_to_key_name'),
+        Index('uix_service_to_key_name', 'service_id', 'name', unique=True, postgresql_where=expiry_date.is_(None)),
     )
 
     @property