Mercurial > kallithea

changeset 5622:96222fc10c83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
db: avoid specifying uniqueness constraints twice Having both UniqueConstraint for a column on a table and unique=True on the same column is both wrong, redundant, deprecated and cause warnings.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 05 Jan 2016 16:30:12 +0100
parents d3fed4806ef7
children 2e977722f349
files kallithea/model/db.py
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/model/db.py	Tue Jan 05 16:30:12 2016 +0100
+++ b/kallithea/model/db.py	Tue Jan 05 16:30:12 2016 +0100
@@ -396,7 +396,8 @@
 class User(Base, BaseModel):
     __tablename__ = 'users'
     __table_args__ = (
-        UniqueConstraint('username'), UniqueConstraint('email'),
+        UniqueConstraint('username'),
+        UniqueConstraint('email'),
         Index('u_username_idx', 'username'),
         Index('u_email_idx', 'email'),
         _table_args_default_dict,
@@ -696,7 +697,6 @@
     __table_args__ = (
         Index('uak_api_key_idx', 'api_key'),
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
-        UniqueConstraint('api_key'),
         _table_args_default_dict,
     )
     __mapper_args__ = {}
@@ -954,7 +954,6 @@
 class Repository(Base, BaseModel):
     __tablename__ = 'repositories'
     __table_args__ = (
-        UniqueConstraint('repo_name'),
         Index('r_repo_name_idx', 'repo_name'),
         _table_args_default_dict,
     )
@@ -1990,7 +1989,6 @@
 class Statistics(Base, BaseModel):
     __tablename__ = 'statistics'
     __table_args__ = (
-         UniqueConstraint('repository_id'),
          _table_args_default_dict,
     )