Include Carto::ActiveRecordCompatibility in all Sequel models

pull/15879/head
Alberto Miedes Garcés 4 years ago
parent bb647a125e
commit a864a87b58

@ -60,6 +60,7 @@ Development
* Fix Organization.overquota exception logging [#15873](https://github.com/CartoDB/cartodb/pull/15873)
* Revamp Rubocop config
* Fix visualization backup when permission is missing [#15874](https://github.com/CartoDB/cartodb/pull/15874)
* Include `::Carto::ActiveRecordCompatibility` in all `Sequel` models [#15879](https://github.com/CartoDB/cartodb/pull/15879)
4.41.1 (2020-09-03)
-------------------

@ -25,7 +25,6 @@ require_dependency 'carto/email_domain_validator'
require_dependency 'carto/visualization'
require_dependency 'carto/gcloud_user_settings'
require_dependency 'carto/helpers/user_commons'
require_dependency 'carto/helpers/active_record_compatibility'
class User < Sequel::Model
include CartoDB::MiniSequel
@ -37,7 +36,6 @@ class User < Sequel::Model
include Carto::EmailCleaner
include SequelFormCompatibility
include Carto::UserCommons
include Carto::ActiveRecordCompatibility
self.strict_param_setting = false

@ -1,4 +1,5 @@
require_dependency 'carto/configuration'
require_dependency 'carto/helpers/active_record_compatibility'
require 'sequel_rails/railties/legacy_model_config'
Sequel::Model.plugin :after_initialize
@ -22,3 +23,5 @@ end
# Disable schema dumping, it is broken with the combination of sequel-rails >= 0.4.4 and sequel < 3.47
Rails.application.config.sequel.schema_dump = false
Sequel::Model.class_eval { include Carto::ActiveRecordCompatibility }

Loading…
Cancel
Save