BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit a884273b by Yorick Peterse Committed by Jarka Kadlecova
Options

Merge branch 'sh-fix-email-provider-take2' into 'master'

Fix PG::UniqueViolation external_email migration Closes #38246 See merge request gitlab-org/gitlab-ce!14474
parent d7a027dd
Showing with 2 additions and 2 deletions
db/migrate/20170828135939_migrate_user_external_mail_data.rb
......@@ -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 OR (provider IS NULL AND users.email_provider IS NULL)
AND (provider = users.email_provider OR (provider IS NULL AND users.email_provider IS NULL))
)
AND id BETWEEN #{start_id} AND #{end_id}
EOF
......
db/post_migrate/20170828170502_post_deploy_migrate_user_external_mail_data.rb
......@@ -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 OR (provider IS NULL AND users.email_provider IS NULL)
AND (provider = users.email_provider OR (provider IS NULL AND users.email_provider IS NULL))
)
AND id BETWEEN #{start_id} AND #{end_id}
EOF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment