Skip to content

Commit a5fec77

Browse files
wangjohnrafaelfranca
authored andcommitted
Using ActiveRecord::Base.application_record.
This method gets the correct application record that is currently defined. This will be used in place of ActiveRecord::Base to access configurations.
1 parent 04bebd5 commit a5fec77

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

activerecord/lib/active_record/connection_adapters/abstract/quoting.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def unquoted_false
8080

8181
def quoted_date(value)
8282
if value.acts_like?(:time)
83-
zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
83+
zone_conversion_method = ActiveRecord::Base.application_record.default_timezone == :utc ? :getutc : :getlocal
8484

8585
if value.respond_to?(zone_conversion_method)
8686
value = value.send(zone_conversion_method)

activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def execute(sql, name = nil)
217217
if @connection
218218
# make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been
219219
# made since we established the connection
220-
@connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone
220+
@connection.query_options[:database_timezone] = ActiveRecord::Base.application_record.default_timezone
221221
end
222222

223223
super

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ def configure_connection
694694
# If using Active Record's time zone support configure the connection to return
695695
# TIMESTAMP WITH ZONE types in UTC.
696696
# (SET TIME ZONE does not use an equals sign like other SET variables)
697-
if ActiveRecord::Base.default_timezone == :utc
697+
if ActiveRecord::Base.application_record.default_timezone == :utc
698698
execute("SET time zone 'UTC'", 'SCHEMA')
699699
elsif @local_tz
700700
execute("SET time zone '#{@local_tz}'", 'SCHEMA')

activerecord/lib/active_record/migration.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -721,17 +721,17 @@ def proper_table_name(name, options = {})
721721

722722
# Determines the version number of the next migration.
723723
def next_migration_number(number)
724-
if ActiveRecord::Base.timestamped_migrations
724+
if ActiveRecord::Base.application_record.timestamped_migrations
725725
[Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % number].max
726726
else
727727
SchemaMigration.normalize_migration_number(number)
728728
end
729729
end
730730

731-
def table_name_options(config = ActiveRecord::Base)
731+
def table_name_options
732732
{
733-
table_name_prefix: config.table_name_prefix,
734-
table_name_suffix: config.table_name_suffix
733+
table_name_prefix: ActiveRecord::Base.application_record.table_name_prefix,
734+
table_name_suffix: ActiveRecord::Base.application_record.table_name_suffix
735735
}
736736
end
737737

activerecord/lib/active_record/translation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module Translation
66
def lookup_ancestors #:nodoc:
77
klass = self
88
classes = [klass]
9-
return classes if klass == ActiveRecord::Base
9+
return classes if klass == ActiveRecord::Base || klass == ApplicationRecord
1010

1111
while klass != klass.base_class
1212
classes << klass = klass.superclass

0 commit comments

Comments
 (0)