Changeset - c17d2c466323
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Mads Kiilerich - 11 years ago 2015-01-06 00:54:36
madski@unity3d.com
db: cascade=all already imply delete - don't make it look like we didn't know
1 file changed with 9 insertions and 9 deletions:
kallithea/model/db.py
9
9
0 comments (0 inline, 0 general)
kallithea/model/db.py
➞
Show inline comments
 
@@ -784,25 +784,25 @@ class UserGroup(Base, BaseModel):
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
 
    )
 

			




	
	
	
		
 
    users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    users_group_name = Column("users_group_name", String(255, convert_unicode=False), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    user_group_description = Column("user_group_description", String(10000, convert_unicode=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)

			




	
	
	
		
 
    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)

			




	
	
	
		
 
    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 
    _group_data = Column("group_data", LargeBinary(), nullable=True)  # JSON data

			




	
	
	
		
 

			




	
	
	
		
 
    members = relationship('UserGroupMember', cascade="all, delete, delete-orphan", lazy="joined")

			




	
	
	
		
 
    members = relationship('UserGroupMember', cascade="all, delete-orphan", lazy="joined")

			




	
	
	
		
 
    users_group_to_perm = relationship('UserGroupToPerm', cascade='all')

			




	
	
	
		
 
    users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')

			




	
	
	
		
 
    users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')

			




	
	
	
		
 
    user_user_group_to_perm = relationship('UserUserGroupToPerm ', cascade='all')

			




	
	
	
		
 
    user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 

			




	
	
	
		
 
    @hybrid_property

			




	
	
	
		
 
    def group_data(self):

			




	
	
	
		
 
        if not self._group_data:

			




	
	
	
		
 
            return {}

			




	
	
		
 
@@ -962,36 +962,36 @@ class Repository(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 
    fork = relationship('Repository', remote_side=repo_id)

			




	
	
	
		
 
    group = relationship('RepoGroup')

			




	
	
	
		
 
    repo_to_perm = relationship('UserRepoToPerm', cascade='all', order_by='UserRepoToPerm.repo_to_perm_id')

			




	
	
	
		
 
    users_group_to_perm = relationship('UserGroupRepoToPerm', cascade='all')

			




	
	
	
		
 
    stats = relationship('Statistics', cascade='all', uselist=False)

			




	
	
	
		
 

			




	
	
	
		
 
    followers = relationship('UserFollowing',

			




	
	
	
		
 
                             primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',

			




	
	
	
		
 
                             cascade='all')

			




	
	
	
		
 
    extra_fields = relationship('RepositoryField',

			




	
	
	
		
 
                                cascade="all, delete, delete-orphan")

			




	
	
	
		
 
                                cascade="all, delete-orphan")

			




	
	
	
		
 

			




	
	
	
		
 
    logs = relationship('UserLog')

			




	
	
	
		
 
    comments = relationship('ChangesetComment', cascade="all, delete, delete-orphan")

			




	
	
	
		
 
    comments = relationship('ChangesetComment', cascade="all, delete-orphan")

			




	
	
	
		
 

			




	
	
	
		
 
    pull_requests_org = relationship('PullRequest',

			




	
	
	
		
 
                    primaryjoin='PullRequest.org_repo_id==Repository.repo_id',

			




	
	
	
		
 
                    cascade="all, delete, delete-orphan")

			




	
	
	
		
 
                    cascade="all, delete-orphan")

			




	
	
	
		
 

			




	
	
	
		
 
    pull_requests_other = relationship('PullRequest',

			




	
	
	
		
 
                    primaryjoin='PullRequest.other_repo_id==Repository.repo_id',

			




	
	
	
		
 
                    cascade="all, delete, delete-orphan")

			




	
	
	
		
 
                    cascade="all, delete-orphan")

			




	
	
	
		
 

			




	
	
	
		
 
    def __unicode__(self):

			




	
	
	
		
 
        return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,

			




	
	
	
		
 
                                   safe_unicode(self.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    @hybrid_property

			




	
	
	
		
 
    def landing_rev(self):

			




	
	
	
		
 
        # always should return [rev_type, rev]

			




	
	
	
		
 
        if self._landing_revision:

			




	
	
	
		
 
            _rev_info = self._landing_revision.split(':')

			




	
	
	
		
 
            if len(_rev_info) < 2:

			




	
	
	
		
 
                _rev_info.insert(0, 'rev')

			




	
	
		
 
@@ -2160,25 +2160,25 @@ class ChangesetComment(Base, BaseModel):

			




	
	
	
		
 
    revision = Column('revision', String(40), nullable=True)

			




	
	
	
		
 
    pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)

			




	
	
	
		
 
    line_no = Column('line_no', Unicode(10), nullable=True)

			




	
	
	
		
 
    hl_lines = Column('hl_lines', Unicode(512), nullable=True)

			




	
	
	
		
 
    f_path = Column('f_path', Unicode(1000), nullable=True)

			




	
	
	
		
 
    user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)

			




	
	
	
		
 
    text = Column('text', UnicodeText(25000), nullable=False)

			




	
	
	
		
 
    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 
    modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 

			




	
	
	
		
 
    author = relationship('User', lazy='joined')

			




	
	
	
		
 
    repo = relationship('Repository')

			




	
	
	
		
 
    status_change = relationship('ChangesetStatus', cascade="all, delete, delete-orphan")

			




	
	
	
		
 
    status_change = relationship('ChangesetStatus', cascade="all, delete-orphan")

			




	
	
	
		
 
    pull_request = relationship('PullRequest')

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def get_users(cls, revision=None, pull_request_id=None):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns user associated with this ChangesetComment. ie those

			




	
	
	
		
 
        who actually commented

			




	
	
	
		
 

			




	
	
	
		
 
        :param cls:

			




	
	
	
		
 
        :param revision:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        q = Session().query(User)\

			




	
	
		
 
@@ -2274,30 +2274,30 @@ class PullRequest(Base, BaseModel):

			




	
	
	
		
 
        self._revisions = safe_unicode(':'.join(val))

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def org_ref_parts(self):

			




	
	
	
		
 
        return self.org_ref.split(':')

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def other_ref_parts(self):

			




	
	
	
		
 
        return self.other_ref.split(':')

			




	
	
	
		
 

			




	
	
	
		
 
    author = relationship('User', lazy='joined')

			




	
	
	
		
 
    reviewers = relationship('PullRequestReviewers',

			




	
	
	
		
 
                             cascade="all, delete, delete-orphan")

			




	
	
	
		
 
                             cascade="all, delete-orphan")

			




	
	
	
		
 
    org_repo = relationship('Repository', primaryjoin='PullRequest.org_repo_id==Repository.repo_id')

			




	
	
	
		
 
    other_repo = relationship('Repository', primaryjoin='PullRequest.other_repo_id==Repository.repo_id')

			




	
	
	
		
 
    statuses = relationship('ChangesetStatus')

			




	
	
	
		
 
    comments = relationship('ChangesetComment',

			




	
	
	
		
 
                             cascade="all, delete, delete-orphan")

			




	
	
	
		
 
                             cascade="all, delete-orphan")

			




	
	
	
		
 

			




	
	
	
		
 
    def is_closed(self):

			




	
	
	
		
 
        return self.status == self.STATUS_CLOSED

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def last_review_status(self):

			




	
	
	
		
 
        return str(self.statuses[-1].status) if self.statuses else ''

			




	
	
	
		
 

			




	
	
	
		
 
    def __json__(self):

			




	
	
	
		
 
        return dict(

			




	
	
	
		
 
            revisions=self.revisions

			




	
	
	
		
 
        )

			




	
	
		
 
@@ -2351,25 +2351,25 @@ class Notification(Base, BaseModel):

			




	
	
	
		
 
    TYPE_PULL_REQUEST = u'pull_request'

			




	
	
	
		
 
    TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'

			




	
	
	
		
 

			




	
	
	
		
 
    notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)

			




	
	
	
		
 
    subject = Column('subject', Unicode(512), nullable=True)

			




	
	
	
		
 
    body = Column('body', UnicodeText(50000), nullable=True)

			




	
	
	
		
 
    created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)

			




	
	
	
		
 
    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 
    type_ = Column('type', Unicode(256))

			




	
	
	
		
 

			




	
	
	
		
 
    created_by_user = relationship('User')

			




	
	
	
		
 
    notifications_to_users = relationship('UserNotification', lazy='joined',

			




	
	
	
		
 
                                          cascade="all, delete, delete-orphan")

			




	
	
	
		
 
                                          cascade="all, delete-orphan")

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def recipients(self):

			




	
	
	
		
 
        return [x.user for x in UserNotification.query()\

			




	
	
	
		
 
                .filter(UserNotification.notification == self)\

			




	
	
	
		
 
                .order_by(UserNotification.user_id.asc()).all()]

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def create(cls, created_by, subject, body, recipients, type_=None):

			




	
	
	
		
 
        if type_ is None:

			




	
	
	
		
 
            type_ = Notification.TYPE_MESSAGE

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.