Skip to content

Commit 6178b8b

Browse files
authored
Merge pull request rails#50089 from fatkodima/fix-console-with-database-url
Fix rails console to work with `DATABASE_URL` for PostgreSQL
2 parents e514c58 + c009329 commit 6178b8b

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

activerecord/lib/active_record/railtie.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ class Railtie < Rails::Railtie # :nodoc:
8888

8989
initializer "active_record.postgresql_time_zone_aware_types" do
9090
ActiveSupport.on_load(:active_record_postgresqladapter) do
91-
ActiveRecord::Base.time_zone_aware_types << :timestamptz
91+
ActiveSupport.on_load(:active_record) do
92+
ActiveRecord::Base.time_zone_aware_types << :timestamptz
93+
end
9294
end
9395
end
9496

railties/test/application/runner_test.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,14 @@ def self.count
148148

149149
assert_match "42", rails("runner", "puts Task.count")
150150
end
151+
152+
def test_works_with_database_url
153+
db_name = use_postgresql
154+
previous_url = ENV["DATABASE_URL"]
155+
ENV["DATABASE_URL"] = "postgres://localhost/#{db_name}"
156+
assert_equal "1", rails("runner", "print 1")
157+
ensure
158+
ENV["DATABASE_URL"] = previous_url
159+
end
151160
end
152161
end

0 commit comments

Comments
 (0)