Merge pull request #3582 from betagouv/frederic/remove_yaml_hack

Remove compatibility code for legacy values in database column
This commit is contained in:
Frederic Merizen 2019-03-11 11:50:47 +01:00 committed by GitHub
commit c72febfa82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -40,25 +40,17 @@ class TypeDeChamp < ApplicationRecord
store_accessor :options, :cadastres, :quartiers_prioritaires, :parcelles_agricoles, :old_pj
delegate :tags_for_template, to: :dynamic_type
# TODO simplify after migrating `options` column to (non YAML encoded) JSON
class MaybeYaml
def load(options)
case options
when String
YAML.safe_load(options, [ActiveSupport::HashWithIndifferentAccess])
when Hash
options.with_indifferent_access
else
options
end
class WithIndifferentAccess
def self.load(options)
options&.with_indifferent_access
end
def dump(options)
def self.dump(options)
options
end
end
serialize :options, MaybeYaml.new
serialize :options, WithIndifferentAccess
after_initialize :set_dynamic_type
after_create :populate_stable_id