kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'sh-fix-issue-38246' into 'master'

Browse source 
Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration

Closes #38246

See merge request gitlab-org/gitlab-ce!14460
This commit is contained in:
Yorick Peterse 2017-09-23 12:30:59 +00:00
commit b146415798
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/sh-fix-issue-38246.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration
merge_request:
author:
type: fixed

2
db/migrate/20170828135939_migrate_user_external_mail_data.rb
View file

@ -33,7 +33,7 @@ class MigrateUserExternalMailData < ActiveRecord::Migration
SELECT true
FROM user_synced_attributes_metadata
WHERE user_id = users.id
AND provider = users.email_provider
AND provider = users.email_provider OR (provider IS NULL AND users.email_provider IS NULL)
)
AND id BETWEEN #{start_id} AND #{end_id}
EOF

2
db/post_migrate/20170828170502_post_deploy_migrate_user_external_mail_data.rb
View file

@ -33,7 +33,7 @@ class PostDeployMigrateUserExternalMailData < ActiveRecord::Migration
SELECT true
FROM user_synced_attributes_metadata
WHERE user_id = users.id
AND provider = users.email_provider
AND provider = users.email_provider OR (provider IS NULL AND users.email_provider IS NULL)
)
AND id BETWEEN #{start_id} AND #{end_id}
EOF