Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-22 11:46:04 +0300
committerRémy Coutable <remy@rymai.me>2016-07-22 11:46:04 +0300
commit50124864e389e6813296cc803efac76f7c23b633 (patch)
treef75e74fbab5674a9e89f26b33b8aa6634d5d5cf1 /app/models
parentcbe787c5872318befb9d3cbd2918a44878e04497 (diff)
parent0b67945c99fde0d2c1ac6287f826001ef4c5d03b (diff)
Merge branch 'artifacts-from-ref-and-build-name-api' into 'master'
Simpler two queries than one JOIN with subquery This is a follow up from !5347 Originally it was: ``` ruby pipeline = pipelines.latest_successful_for(ref) builds.where(pipeline: pipeline).latest.with_artifacts ``` However MySQL would complain that we can't use `IN` against a subquery which has `LIMIT`. Using `INNER JOIN` would be a workaround, however, doing that is too complicated in current version of Rails. So let's just use two queries in this case. Closes #14419 See merge request !5388
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index f09d915f20e..5452d9f768f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -431,13 +431,13 @@ class Project < ActiveRecord::Base
# ref can't be HEAD, can only be branch/tag name or SHA
def latest_successful_builds_for(ref = default_branch)
- pipeline = pipelines.latest_successful_for(ref).to_sql
- join_sql = "INNER JOIN (#{pipeline}) pipelines" +
- " ON pipelines.id = #{Ci::Build.quoted_table_name}.commit_id"
- builds.joins(join_sql).latest.with_artifacts
- # TODO: Whenever we dropped support for MySQL, we could change to:
- # pipeline = pipelines.latest_successful_for(ref)
- # builds.where(pipeline: pipeline).latest.with_artifacts
+ latest_pipeline = pipelines.latest_successful_for(ref).first
+
+ if latest_pipeline
+ latest_pipeline.builds.latest.with_artifacts
+ else
+ builds.none
+ end
end
def merge_base_commit(first_commit_id, second_commit_id)