summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-17 22:23:19 +0000
committerRobert Speicher <robert@gitlab.com>2017-05-17 22:23:19 +0000
commita009e763345d71228019551ffcf72f5b5e9b9ef2 (patch)
treed3392750a6cafd40b6292d92210f8b35f6f60516
parentfb31c6cedf532e9594ff3d42050f01be0cfc8d57 (diff)
parentcf6ba755c6caa15a41977be619b4e4091d8ca000 (diff)
downloadgitlab-ce-a009e763345d71228019551ffcf72f5b5e9b9ef2.tar.gz
Merge branch 'zj-fix-migration' into 'master'
Fix data migration from trigger schedules See merge request !11460
-rw-r--r--db/post_migrate/20170425121605_migrate_trigger_schedules_to_pipeline_schedules.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/db/post_migrate/20170425121605_migrate_trigger_schedules_to_pipeline_schedules.rb b/db/post_migrate/20170425121605_migrate_trigger_schedules_to_pipeline_schedules.rb
index a44b399c4de..dae9750558f 100644
--- a/db/post_migrate/20170425121605_migrate_trigger_schedules_to_pipeline_schedules.rb
+++ b/db/post_migrate/20170425121605_migrate_trigger_schedules_to_pipeline_schedules.rb
@@ -4,6 +4,13 @@ class MigrateTriggerSchedulesToPipelineSchedules < ActiveRecord::Migration
DOWNTIME = false
def up
+ connection.execute <<~SQL
+ DELETE FROM ci_trigger_schedules WHERE NOT EXISTS
+ (SELECT true FROM projects
+ WHERE ci_trigger_schedules.project_id = projects.id
+ )
+ SQL
+
connection.execute <<-SQL
INSERT INTO ci_pipeline_schedules (
project_id,