diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-23 14:35:24 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-23 14:35:24 +0000 |
| commit | 7e662dc7cba5440ba21a0a928f035914c48bce37 (patch) | |
| tree | 640c7b2e58593a8d108cde5b18245f99516502a0 /app | |
| parent | a77b40d45e2f474a3d2401125b7b89379a7a7dd5 (diff) | |
| parent | 22d6f96cf982765fa9b957905248a573c6e3c498 (diff) | |
| download | gitlab-ce-7e662dc7cba5440ba21a0a928f035914c48bce37.tar.gz | |
Merge branch '26570-optimize-latest-pipeline-query' into 'master'
Optimize Ci::Pipeline.latest query
Closes #26570
See merge request !9306
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/pipeline.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index dc4590a9923..6e89b18aee5 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -93,8 +93,11 @@ module Ci .select("max(#{quoted_table_name}.id)") .group(:ref, :sha) - relation = ref ? where(ref: ref) : self - relation.where(id: max_id) + if ref + where(ref: ref, id: max_id.where(ref: ref)) + else + where(id: max_id) + end end def self.latest_status(ref = nil) |