PAUSED: Use git resume to continue working.

db/migrate/20171103212526_move_zone_ntp_settings_to_settings.rb

@@ -1,9 +1,9 @@
 class MoveZoneNtpSettingsToSettings < ActiveRecord::Migration[5.0]
   class SettingsChange < ActiveRecord::Base
-    serialize :value
+    serialize :value, :coder => YAML
   end
   class Zone < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20180606083431_convert_quadicon_settings_keys.rb

@@ -1,6 +1,6 @@
 class ConvertQuadiconSettingsKeys < ActiveRecord::Migration[5.0]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20180718132840_remove_transformation_product_setting.rb

@@ -1,6 +1,6 @@
 class RemoveTransformationProductSetting < ActiveRecord::Migration[5.0]
   class SettingsChange < ActiveRecord::Base
-    serialize :value
+    serialize :value, :coder => YAML
   end
 
   def up

db/migrate/20181001131632_add_conversion_host_id_to_miq_request_tasks.rb

@@ -3,7 +3,7 @@ class MiqRequestTask < ActiveRecord::Base
     self.inheritance_column = :_type_disabled
     include ActiveRecord::IdRegions
 
-    serialize :options, :type => Hash
+    serialize :options, :coder => YAML, :type => Hash
     belongs_to :conversion_host, :class_name => "AddConversionHostIdToMiqRequestTasks::ConversionHost"
   end
 

db/migrate/20190617191109_move_awx_credentials_to_authentications.rb

@@ -2,7 +2,7 @@ class MoveAwxCredentialsToAuthentications < ActiveRecord::Migration[5.0]
   class Authentication < ActiveRecord::Base
     include ActiveRecord::IdRegions
     self.inheritance_column = :_type_disabled
-    serialize :options
+    serialize :options, :coder => YAML
   end
 
   # This class is port of the code found in both the awx code base, and the

db/migrate/20190809193031_move_embedded_ansible_proxy_setting_to_git_repository_proxy_settings.rb

@@ -1,6 +1,6 @@
 class MoveEmbeddedAnsibleProxySettingToGitRepositoryProxySettings < ActiveRecord::Migration[5.1]
   class SettingsChange < ActiveRecord::Base
-    serialize :value
+    serialize :value, :coder => YAML
   end
 
   def up

db/migrate/20191002103406_remove_quadicon_settings.rb

@@ -1,6 +1,6 @@
 class RemoveQuadiconSettings < ActiveRecord::Migration[5.0]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20191122203218_replace_server_capabilities_with_vix_disk_lib.rb

@@ -1,6 +1,6 @@
 class ReplaceServerCapabilitiesWithVixDiskLib < ActiveRecord::Migration[5.1]
   class MiqServer < ActiveRecord::Base
-    serialize :capabilities
+    serialize :capabilities, :coder => YAML
     include ActiveRecord::IdRegions
   end
 

db/migrate/20200331150436_rename_foreman_features.rb

@@ -2,7 +2,7 @@ class RenameForemanFeatures < ActiveRecord::Migration[5.1]
   class MiqProductFeature < ActiveRecord::Base; end
   class MiqRolesFeature < ActiveRecord::Base; end
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   FEATURE_MAPPING = {

db/migrate/20200512201614_update_chargeback_startpage.rb

@@ -1,6 +1,6 @@
 class UpdateChargebackStartpage < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20200520182548_update_chargeback_assignments_startpage.rb

@@ -1,6 +1,6 @@
 class UpdateChargebackAssignmentsStartpage < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
     include ActiveRecord::IdRegions
   end
 

db/migrate/20200520210200_update_chargeback_reports_startpage.rb

@@ -1,6 +1,6 @@
 class UpdateChargebackReportsStartpage < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
     include ActiveRecord::IdRegions
   end
 

db/migrate/20200910163718_adjust_control_explorer_startpage_entries.rb

@@ -1,6 +1,6 @@
 class AdjustControlExplorerStartpageEntries < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20201227173629_update_startup_shortcut_after_policy_profile_deexplorization.rb

@@ -1,6 +1,6 @@
 class UpdateStartupShortcutAfterPolicyProfileDeexplorization < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20201230005555_update_startpage_shortcut_after_actions_de_explorization.rb

@@ -1,6 +1,6 @@
 class UpdateStartpageShortcutAfterActionsDeExplorization < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210105011714_update_policy_startpage_url_after_de_explorization.rb

@@ -1,6 +1,6 @@
 class UpdatePolicyStartpageUrlAfterDeExplorization < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210106180202_update_policy_rsop_startpage_url.rb

@@ -1,6 +1,6 @@
 class UpdatePolicyRsopStartpageUrl < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210106200226_update_policy_export_startpage_url.rb

@@ -1,6 +1,6 @@
 class UpdatePolicyExportStartpageUrl < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210106201124_update_policy_log_startpage_url.rb

@@ -1,6 +1,6 @@
 class UpdatePolicyLogStartpageUrl < ActiveRecord::Migration[5.2]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210112000610_update_alerts_startpage_url_after_de_explorization.rb

@@ -1,6 +1,6 @@
 class UpdateAlertsStartpageUrlAfterDeExplorization < ActiveRecord::Migration[6.0]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210112001749_update_alert_profiles_startpage_url_after_de_explorization.rb

@@ -1,6 +1,6 @@
 class UpdateAlertProfilesStartpageUrlAfterDeExplorization < ActiveRecord::Migration[6.0]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210112003720_update_events_startpage_url_after_de_explorization.rb

@@ -1,6 +1,6 @@
 class UpdateEventsStartpageUrlAfterDeExplorization < ActiveRecord::Migration[6.0]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210112004301_update_conditions_startpage_url_after_de_explorization.rb

@@ -1,6 +1,6 @@
 class UpdateConditionsStartpageUrlAfterDeExplorization < ActiveRecord::Migration[6.0]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210315161230_update_automation_provider_startpage.rb

@@ -1,6 +1,6 @@
 class UpdateAutomationProviderStartpage < ActiveRecord::Migration[6.0]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20210330012001_remove_regex_from_settings.rb

@@ -1,6 +1,6 @@
 class RemoveRegexFromSettings < ActiveRecord::Migration[6.0]
   class SettingsChange < ActiveRecord::Base
-    serialize :value
+    serialize :value, :coder => YAML
   end
 
   def up

db/migrate/20220223095704_remove_col3_from_miq_widget_set.rb

@@ -2,7 +2,7 @@ class RemoveCol3FromMiqWidgetSet < ActiveRecord::Migration[6.0]
   class MiqWidgetSet < ActiveRecord::Base
     include ActiveRecord::IdRegions
     self.table_name = "miq_sets"
-    serialize :set_data
+    serialize :set_data, :coder => YAML
   end
 
   def up

db/migrate/20220617140542_move_become_method_from_options.rb

@@ -18,7 +18,7 @@ class Authentication < ActiveRecord::Base
     include ActiveRecord::IdRegions
     self.inheritance_column = :_type_disabled
 
-    serialize :options
+    serialize :options, :coder => YAML
   end
 
   def up

db/migrate/20220629110748_update_startpage_shortcut_after_services_de_explorization.rb

@@ -1,6 +1,6 @@
 class UpdateStartpageShortcutAfterServicesDeExplorization < ActiveRecord::Migration[6.0]
   class User < ActiveRecord::Base
-    serialize :settings, :type => Hash
+    serialize :settings, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20230525200407_fix_vpc_provision_instance_type.rb

@@ -11,7 +11,7 @@ class MiqRequest < ActiveRecord::Base
 
     self.inheritance_column = :_type_disabled
 
-    serialize :options, :type => Hash
+    serialize :options, :coder => YAML, :type => Hash
   end
 
   def up

db/migrate/20230709065227_separate_role_access_restrictions_for_service_templates.rb

@@ -1,6 +1,6 @@
 class SeparateRoleAccessRestrictionsForServiceTemplates < ActiveRecord::Migration[6.0]
   class MiqUserRole < ActiveRecord::Base
-    serialize :settings
+    serialize :settings, :coder => YAML
   end
 
   def up

db/migrate/20240521100629_add_vault_credential_id_to_options_in_service_templates.rb

@@ -1,7 +1,7 @@
 class AddVaultCredentialIdToOptionsInServiceTemplates < ActiveRecord::Migration[6.1]
   class ServiceTemplate < ActiveRecord::Base
     self.inheritance_column = :_type_disabled
-    serialize :options
+    serialize :options, :coder => YAML
   end
 
   def up

lib/manageiq/schema/serialize_positional_to_kwargs_bridge.rb

@@ -6,10 +6,10 @@ def serialize(*args, **options)
 
         # For rails 7.0.x, convert 7.1+ kwargs for coder/type into the positional argument
         # class_name_or_coder
-        if options[:coder]
-          args << options.delete(:coder)
-        elsif options[:type]
+        if options[:type]
           args << options.delete(:type)
+        elsif options[:coder]
+          args << options.delete(:coder)
         end
 
         super(*args, **options)

spec/dummy/config/application.rb

@@ -23,11 +23,6 @@ class Application < Rails::Application
     # migration specs to honor it.
     config.active_record.belongs_to_required_by_default = false
 
-    # Note, you can't pass kwargs :coder => YAML to serialize until rails 7.1 as it was a positional
-    # argument previously.  To avoid a case statement in all usages of serialize, we're defaulting
-    # all serialized columns to YAML for rails 7.1+ here. Ideally, we would use JSON if we find we can
-    # use a simpler datatype. See: https://github.com/rails/rails/pull/47463
-    config.active_record.default_column_serializer = YAML if Rails.version >= "7.1"
     config.active_record.use_yaml_unsafe_load = true
   end
 end

spec/support/migration_stubs.rb

@@ -5,7 +5,7 @@ def self.reserved_stub
         Class.new(ActiveRecord::Base) do
           self.table_name = "reserves"
           self.inheritance_column = :_type_disabled # disable STI
-          serialize :reserved
+          serialize :reserved, :coder => YAML
         end
       end
     end