db: use more consistent sorting using real objects, strings are deprecated in laters sqlalchemy query syntax.

rhodecode/api/tests/test_close_pull_request.py

@@ -49,7 +49,7 @@ class TestClosePullRequest(object):
         assert_ok(id_, expected, response.body)
         journal = UserLog.query()\
             .filter(UserLog.user_id == author) \
-            .order_by('user_log_id') \
+            .order_by(UserLog.user_log_id.asc()) \
             .filter(UserLog.repository_id == repo)\
             .all()
         assert journal[-1].action == 'repo.pull_request.close'

rhodecode/api/tests/test_comment_pull_request.py

@@ -65,7 +65,7 @@ class TestCommentPullRequest(object):
         journal = UserLog.query()\
             .filter(UserLog.user_id == author)\
             .filter(UserLog.repository_id == repo) \
-            .order_by('user_log_id') \
+            .order_by(UserLog.user_log_id.asc()) \
             .all()
         assert journal[-1].action == 'repo.pull_request.comment.create'
 

rhodecode/api/tests/test_merge_pull_request.py

@@ -120,7 +120,7 @@ class TestMergePullRequest(object):
         journal = UserLog.query()\
             .filter(UserLog.user_id == author)\
             .filter(UserLog.repository_id == repo) \
-            .order_by('user_log_id') \
+            .order_by(UserLog.user_log_id.asc()) \
             .all()
         assert journal[-2].action == 'repo.pull_request.merge'
         assert journal[-1].action == 'repo.pull_request.close'
@@ -221,7 +221,7 @@ class TestMergePullRequest(object):
         journal = UserLog.query() \
             .filter(UserLog.user_id == merge_user_id) \
             .filter(UserLog.repository_id == repo) \
-            .order_by('user_log_id') \
+            .order_by(UserLog.user_log_id.asc()) \
             .all()
         assert journal[-2].action == 'repo.pull_request.merge'
         assert journal[-1].action == 'repo.pull_request.close'

rhodecode/apps/admin/views/repo_groups.py

@@ -180,7 +180,7 @@ class AdminRepoGroupsView(BaseAppView, DataGridAppView):
                 # generate multiple IN to fix limitation problems
                 *in_filter_generator(RepoGroup.group_id, allowed_ids)
             )) \
-            .outerjoin(Repository) \
+            .outerjoin(Repository,  Repository.group_id == RepoGroup.group_id) \
             .join(User, User.user_id == RepoGroup.user_id) \
             .group_by(RepoGroup, User)
 

rhodecode/apps/admin/views/user_groups.py

@@ -134,7 +134,7 @@ class AdminUserGroupsView(BaseAppView, DataGridAppView):
                 # generate multiple IN to fix limitation problems
                 *in_filter_generator(UserGroup.users_group_id, allowed_ids)
             )) \
-            .outerjoin(UserGroupMember) \
+            .outerjoin(UserGroupMember, UserGroupMember.users_group_id == UserGroup.users_group_id) \
             .join(User, User.user_id == UserGroup.user_id) \
             .group_by(UserGroup, User)
 

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -284,7 +284,7 @@ class TestPullrequestsView(object):
         journal = UserLog.query()\
             .filter(UserLog.user_id == author)\
             .filter(UserLog.repository_id == repo) \
-            .order_by('user_log_id') \
+            .order_by(UserLog.user_log_id.asc()) \
             .all()
         assert journal[-1].action == 'repo.pull_request.close'
 
@@ -323,7 +323,7 @@ class TestPullrequestsView(object):
 
         journal = UserLog.query()\
             .filter(UserLog.user_id == author, UserLog.repository_id == repo) \
-            .order_by('user_log_id') \
+            .order_by(UserLog.user_log_id.asc()) \
             .all()
         assert journal[-1].action == 'repo.pull_request.close'
 
@@ -563,7 +563,7 @@ class TestPullrequestsView(object):
             pull_request, ChangesetStatus.STATUS_APPROVED)
 
         # Check the relevant log entries were added
-        user_logs = UserLog.query().order_by('-user_log_id').limit(3)
+        user_logs = UserLog.query().order_by(UserLog.user_log_id.desc()).limit(3)
         actions = [log.action for log in user_logs]
         pr_commit_ids = PullRequestModel()._get_commit_ids(pull_request)
         expected_actions = [
@@ -573,7 +573,7 @@ class TestPullrequestsView(object):
         ]
         assert actions == expected_actions
 
-        user_logs = UserLog.query().order_by('-user_log_id').limit(4)
+        user_logs = UserLog.query().order_by(UserLog.user_log_id.desc()).limit(4)
         actions = [log for log in user_logs]
         assert actions[-1].action == 'user.push'
         assert actions[-1].action_data['commit_ids'] == pr_commit_ids

rhodecode/tests/lib/test_hooks_base.py

@@ -48,7 +48,7 @@ def test_post_push_truncates_commits(user_regular, repo_stub):
     # Calculate appropriate action string here
     commit_ids = extras.commit_ids[:400]
 
-    entry = UserLog.query().order_by('-user_log_id').first()
+    entry = UserLog.query().order_by(UserLog.user_log_id.desc()).first()
     assert entry.action == 'user.push'
     assert entry.action_data['commit_ids'] == commit_ids
     Session().delete(entry)
@@ -149,3 +149,4 @@ def test_hooks_propagates_not_on_shadow(func, extension, event, hook_extras):
     # Assert that extensions are *not* called and event was *not* fired.
     assert not extension_mock.called
     assert not events_mock.trigger.called
+