From 4de93b6a3e4eabd3eae9eb23910c6acd62649cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Thu, 27 Sep 2018 19:28:24 +0200 Subject: Refactor external_pipelines query --- .../populate_external_pipeline_source.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/background_migration/populate_external_pipeline_source.rb b/lib/gitlab/background_migration/populate_external_pipeline_source.rb index f635064cac5..98eb7f0b897 100644 --- a/lib/gitlab/background_migration/populate_external_pipeline_source.rb +++ b/lib/gitlab/background_migration/populate_external_pipeline_source.rb @@ -24,18 +24,15 @@ module Gitlab class CommitStatus < ActiveRecord::Base self.table_name = 'ci_builds' self.inheritance_column = :_type_disabled - end - - class Build < CommitStatus - end - class GenericCommitStatus < CommitStatus + scope :has_pipeline, -> { where('ci_builds.commit_id=ci_pipelines.id') } + scope :of_type, -> (type) { where('type=?', type) } end end def perform(start_id, stop_id) external_pipelines(start_id, stop_id) - .update_all(:source, Migratable::Pipeline.sources[:external]) + .update_all(source: Migratable::Pipeline.sources[:external]) end private @@ -44,8 +41,8 @@ module Gitlab Migratable::Pipeline.where(id: (start_id..stop_id)) .where( 'EXISTS (?) AND NOT EXISTS (?)', - Migratable::GenericCommitStatus.where("type='CommitStatus'").where('ci_builds.commit_id=ci_pipelines.id').select(1), - Migratable::Build.where("type='Ci::Build'").where('ci_builds.commit_id=ci_pipelines.id').select(1) + Migratable::CommitStatus.of_type('GenericCommitStatus').has_pipeline.select(1), + Migratable::CommitStatus.of_type('Ci::Build').has_pipeline.select(1), ) end end -- cgit v1.2.3