Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers/active_record_data_types.rb')
-rw-r--r--config/initializers/active_record_data_types.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/config/initializers/active_record_data_types.rb b/config/initializers/active_record_data_types.rb
index f8f0a69622f..7f4bd32c221 100644
--- a/config/initializers/active_record_data_types.rb
+++ b/config/initializers/active_record_data_types.rb
@@ -45,9 +45,13 @@ class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
NATIVE_DATABASE_TYPES[:datetime_with_timezone] = { name: 'timestamptz' }
end
-# Ensure `datetime_with_timezone` columns are correctly written to schema.rb
-if (ActiveRecord::Base.connection.active? rescue false)
- ActiveRecord::Base.connection.send :reload_type_map
+def connection_active?
+ ActiveRecord::Base.connection.active? # rubocop:disable Database/MultipleDatabases
+rescue StandardError
+ false
end
+# Ensure `datetime_with_timezone` columns are correctly written to schema.rb
+ActiveRecord::Base.connection.send(:reload_type_map) if connection_active?
+
ActiveRecord::Base.time_zone_aware_types += [:datetime_with_timezone]