##// END OF EJS Templates
Merge stable
Mads Kiilerich -
r7270:b45994c0 merge default
parent child Browse files
Show More
@@ -1525,7 +1525,6 b' class Repository(Base, BaseDbModel):'
1525 class RepoGroup(Base, BaseDbModel):
1525 class RepoGroup(Base, BaseDbModel):
1526 __tablename__ = 'groups'
1526 __tablename__ = 'groups'
1527 __table_args__ = (
1527 __table_args__ = (
1528 CheckConstraint('group_id != group_parent_id', name='ck_groups_no_self_parent'),
1529 _table_args_default_dict,
1528 _table_args_default_dict,
1530 )
1529 )
1531 __mapper_args__ = {'order_by': 'group_name'} # TODO: Deprecated as of SQLAlchemy 1.1.
1530 __mapper_args__ = {'order_by': 'group_name'} # TODO: Deprecated as of SQLAlchemy 1.1.
@@ -1949,7 +1948,6 b' class UserGroupUserGroupToPerm(Base, Bas'
1949 __tablename__ = 'user_group_user_group_to_perm'
1948 __tablename__ = 'user_group_user_group_to_perm'
1950 __table_args__ = (
1949 __table_args__ = (
1951 UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
1950 UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
1952 CheckConstraint('target_user_group_id != user_group_id', name='ck_user_group_user_group_to_perm_no_self_target'),
1953 _table_args_default_dict,
1951 _table_args_default_dict,
1954 )
1952 )
1955
1953
General Comments 0
You need to be logged in to leave comments. Login now