Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
df0603cf
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
df0603cf
编写于
3月 22, 2017
作者:
M
mhasbini
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
simplify projects, mrs search queries
上级
b26d4d2a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
11 deletion
+8
-11
app/models/merge_request.rb
app/models/merge_request.rb
+4
-2
app/models/project.rb
app/models/project.rb
+4
-9
未找到文件。
app/models/merge_request.rb
浏览文件 @
df0603cf
...
...
@@ -155,8 +155,10 @@ class MergeRequest < ActiveRecord::Base
#
# Returns an ActiveRecord::Relation.
def
self
.
in_projects
(
relation
)
source
=
where
(
source_project_id:
relation
).
select
(
:id
)
target
=
where
(
target_project_id:
relation
).
select
(
:id
)
# unscoping unnecessary conditions that'll be applied
# when executing `where("merge_requests.id IN (#{union.to_sql})")`
source
=
unscoped
.
where
(
source_project_id:
relation
).
select
(
:id
)
target
=
unscoped
.
where
(
target_project_id:
relation
).
select
(
:id
)
union
=
Gitlab
::
SQL
::
Union
.
new
([
source
,
target
])
where
(
"merge_requests.id IN (
#{
union
.
to_sql
}
)"
)
...
...
app/models/project.rb
浏览文件 @
df0603cf
...
...
@@ -313,20 +313,15 @@ class Project < ActiveRecord::Base
ntable
=
Namespace
.
arel_table
pattern
=
"%
#{
query
}
%"
projects
=
select
(
:id
).
where
(
# unscoping unnecessary conditions that'll be applied
# when executing `where("projects.id IN (#{union.to_sql})")`
projects
=
unscoped
.
select
(
:id
).
where
(
ptable
[
:path
].
matches
(
pattern
).
or
(
ptable
[
:name
].
matches
(
pattern
)).
or
(
ptable
[
:description
].
matches
(
pattern
))
)
# We explicitly remove any eager loading clauses as they're:
#
# 1. Not needed by this query
# 2. Combined with .joins(:namespace) lead to all columns from the
# projects & namespaces tables being selected, leading to a SQL error
# due to the columns of all UNION'd queries no longer being the same.
namespaces
=
select
(
:id
).
except
(
:includes
).
namespaces
=
unscoped
.
select
(
:id
).
joins
(
:namespace
).
where
(
ntable
[
:name
].
matches
(
pattern
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录