BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
edb82271
Commit
edb82271
authored
Sep 25, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix PG::UniqueViolation external_email migration
Missing parens prevented this migration from working in some cases. Closes #38246
parent
6c57d894
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
20170828135939_migrate_user_external_mail_data.rb
db/migrate/20170828135939_migrate_user_external_mail_data.rb
+1
-1
20170828170502_post_deploy_migrate_user_external_mail_data.rb
...0828170502_post_deploy_migrate_user_external_mail_data.rb
+1
-1
No files found.
db/migrate/20170828135939_migrate_user_external_mail_data.rb
View file @
edb82271
...
...
@@ -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
View file @
edb82271
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment