kallithea Changeset - 8839e50145df

Changeset - 8839e50145df

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 10 years ago 2016-01-05 16:30:12
madski@unity3d.com

db: consistently use unique=True instead of single column UniqueConstraint

1 file changed with 5 insertions and 10 deletions:

kallithea/model/db.py

0 comments (0 inline, 0 general)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -164,13 +164,12 @@ _table_args_default_dict = {'extend_exis @@
                             'sqlite_autoincrement': True,
+                           }
 class Setting(Base, BaseModel):
     __tablename__ = DB_PREFIX + 'settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         _table_args_default_dict,
+    )
     SETTINGS_TYPES = {
         'str': safe_str,
         'int': safe_int,
@@ @@ -178,13 +177,13 @@ class Setting(Base, BaseModel): @@
         'bool': str2bool,
         'list': functools.partial(aslist, sep=',')
+    }
     DEFAULT_UPDATE_URL = ''
     app_settings_id = Column(Integer(), nullable=False, unique=True, primary_key=True)
-    app_settings_name = Column(String(255), nullable=True, unique=None, default=None)
+    app_settings_name = Column(String(255), nullable=True, unique=True, default=None)
     _app_settings_value = Column("app_settings_value", Unicode(4096), nullable=True, unique=None, default=None)
     _app_settings_type = Column("app_settings_type", String(255), nullable=True, unique=None, default=None)
     def __init__(self, key='', val='', type='unicode'):
         self.app_settings_name = key
         self.app_settings_value = val
@@ @@ -391,30 +390,28 @@ class Ui(Base, BaseModel): @@
                                     self.ui_key, self.ui_value)
 class User(Base, BaseModel):
     __tablename__ = 'users'
     __table_args__ = (
         UniqueConstraint('username'),
         UniqueConstraint('email'),
         Index('u_username_idx', 'username'),
         Index('u_email_idx', 'email'),
         _table_args_default_dict,
+    )
     DEFAULT_USER = 'default'
     DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
     user_id = Column(Integer(), nullable=False, unique=True, primary_key=True)
-    username = Column(String(255), nullable=True, unique=None, default=None)
+    username = Column(String(255), nullable=True, unique=True, default=None)
     password = Column(String(255), nullable=True, unique=None, default=None)
     active = Column(Boolean(), nullable=True, unique=None, default=True)
     admin = Column(Boolean(), nullable=True, unique=None, default=False)
     name = Column("firstname", Unicode(255), nullable=True, unique=None, default=None)
     lastname = Column(Unicode(255), nullable=True, unique=None, default=None)
-    _email = Column("email", String(255), nullable=True, unique=None, default=None)
+    _email = Column("email", String(255), nullable=True, unique=True, default=None)
     last_login = Column(DateTime(timezone=False), nullable=True, unique=None, default=None)
     extern_type = Column(String(255), nullable=True, unique=None, default=None)
     extern_name = Column(String(255), nullable=True, unique=None, default=None)
     api_key = Column(String(255), nullable=True, unique=None, default=None)
     inherit_default_permissions = Column(Boolean(), nullable=False, unique=None, default=True)
     created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
@@ @@ -716,20 +713,19 @@ class UserApiKeys(Base, BaseModel): @@
 class UserEmailMap(Base, BaseModel):
     __tablename__ = 'user_email_map'
     __table_args__ = (
         Index('uem_email_idx', 'email'),
         UniqueConstraint('email'),
         _table_args_default_dict,
+    )
     __mapper_args__ = {}
     email_id = Column(Integer(), nullable=False, unique=True, primary_key=True)
     user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
-    _email = Column("email", String(255), nullable=True, unique=False, default=None)
+    _email = Column("email", String(255), nullable=True, unique=True, default=None)
     user = relationship('User')
     @validates('_email')
     def validate_email(self, key, email):
         # check if this email is not main one
         main_email = Session().query(User).filter(User.email == email).scalar()
@@ @@ -2023,21 +2019,20 @@ class UserFollowing(Base, BaseModel): @@
         return cls.query().filter(cls.follows_repo_id == repo_id)
 class CacheInvalidation(Base, BaseModel):
     __tablename__ = 'cache_invalidation'
     __table_args__ = (
         UniqueConstraint('cache_key'),
         Index('key_idx', 'cache_key'),
         _table_args_default_dict,
+    )
     # cache_id, not used
     cache_id = Column(Integer(), nullable=False, unique=True, primary_key=True)
     # cache_key as created by _get_cache_key
     cache_key = Column(Unicode(255))
+    cache_key = Column(Unicode(255), unique=True)
     # cache_args is a repo_name
     cache_args = Column(Unicode(255))
     # instance sets cache_active True when it is caching, other instances set
     # cache_active to False to indicate that this cache is invalid
     cache_active = Column(Boolean(), nullable=True, unique=None, default=False)

0 comments (0 inline, 0 general)