Skip to content

Commit 25e8d0a

Browse files
committed
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 77c0d7d commit 25e8d0a

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
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
@@ -113,7 +113,7 @@ def quoted_false
113113

114114
def quoted_date(value)
115115
if value.acts_like?(:time)
116-
zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
116+
zone_conversion_method = ActiveRecord::Base.application_record.default_timezone == :utc ? :getutc : :getlocal
117117

118118
if value.respond_to?(zone_conversion_method)
119119
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
@@ -216,7 +216,7 @@ def execute(sql, name = nil)
216216
if @connection
217217
# make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been
218218
# made since we established the connection
219-
@connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone
219+
@connection.query_options[:database_timezone] = ActiveRecord::Base.application_record.default_timezone
220220
end
221221

222222
super

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

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

activerecord/lib/active_record/migration.rb

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

685685
# Determines the version number of the next migration.
686686
def next_migration_number(number)
687-
if ActiveRecord::Base.timestamped_migrations
687+
if ActiveRecord::Base.application_record.timestamped_migrations
688688
[Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % number].max
689689
else
690690
"%.3d" % number
691691
end
692692
end
693693

694-
def table_name_options(config = ActiveRecord::Base)
694+
def table_name_options
695695
{
696-
table_name_prefix: config.table_name_prefix,
697-
table_name_suffix: config.table_name_suffix
696+
table_name_prefix: ActiveRecord::Base.application_record.table_name_prefix,
697+
table_name_suffix: ActiveRecord::Base.application_record.table_name_suffix
698698
}
699699
end
700700

@@ -830,8 +830,8 @@ def last_migration #:nodoc:
830830
def proper_table_name(name, options = {})
831831
ActiveSupport::Deprecation.warn "ActiveRecord::Migrator.proper_table_name is deprecated and will be removed in Rails 4.2. Use the proper_table_name instance method on ActiveRecord::Migration instead"
832832
options = {
833-
table_name_prefix: ActiveRecord::Base.table_name_prefix,
834-
table_name_suffix: ActiveRecord::Base.table_name_suffix
833+
table_name_prefix: ActiveRecord::Base.application_record.table_name_prefix,
834+
table_name_suffix: ActiveRecord::Base.application_record.table_name_suffix
835835
}.merge(options)
836836
if name.respond_to? :table_name
837837
name.table_name

activerecord/lib/active_record/schema_dumper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def indexes(table, stream)
201201
end
202202

203203
def remove_prefix_and_suffix(table)
204-
table.gsub(/^(#{ActiveRecord::Base.table_name_prefix})(.+)(#{ActiveRecord::Base.table_name_suffix})$/, "\\2")
204+
table.gsub(/^(#{ActiveRecord::Base.application_record.table_name_prefix})(.+)(#{ActiveRecord::Base.application_record.table_name_suffix})$/, "\\2")
205205
end
206206
end
207207
end

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)