diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-08-30 21:24:10 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-31 10:41:59 -0500 |
| commit | d836a359b7a9eee7dd379a99022e3bb709cd9995 (patch) | |
| tree | 7be85ec3321a406e808474e22f9c5165d2c7779b | |
| parent | 636a1c7c984148971d0fb70c25b0d627813fd1b8 (diff) | |
| download | gitlab-ce-d836a359b7a9eee7dd379a99022e3bb709cd9995.tar.gz | |
Merge branch 'lock_fix' into 'master'
Remove default value for lock_version
From the very beginning we added `lock_version` column with default value, then we reverted that MR. A bit later we added that migration again but column's default value has been removed from migration. So if you installed GitLab form master it's possible that you have default value, which caused the bug.
We don't need to change a CHANGELOG here I think.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21527 and https://dev.gitlab.org/gitlab/organization/issues/971
See merge request !6111
Conflicts:
db/schema.rb
| -rw-r--r-- | db/migrate/20160827011312_ensure_lock_version_has_no_default.rb | 16 | ||||
| -rw-r--r-- | db/schema.rb | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/db/migrate/20160827011312_ensure_lock_version_has_no_default.rb b/db/migrate/20160827011312_ensure_lock_version_has_no_default.rb new file mode 100644 index 00000000000..7c55bc23cf2 --- /dev/null +++ b/db/migrate/20160827011312_ensure_lock_version_has_no_default.rb @@ -0,0 +1,16 @@ +class EnsureLockVersionHasNoDefault < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + change_column_default :issues, :lock_version, nil + change_column_default :merge_requests, :lock_version, nil + + execute('UPDATE issues SET lock_version = 1 WHERE lock_version = 0') + execute('UPDATE merge_requests SET lock_version = 1 WHERE lock_version = 0') + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 6cbc766831b..0e1d9fb880b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160819221833) do +ActiveRecord::Schema.define(version: 20160827011312) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1154,4 +1154,4 @@ ActiveRecord::Schema.define(version: 20160819221833) do add_foreign_key "protected_branch_merge_access_levels", "protected_branches" add_foreign_key "protected_branch_push_access_levels", "protected_branches" add_foreign_key "u2f_registrations", "users" -end
\ No newline at end of file +end |