Merge pull request #36612 from y-yagi/make_setup_works_when_using_wit…

…h_locales_other_than_en Make "bin/setup" works when using PostgreSQL with locales other than en locale
rails · Jul 8, 2019 · 60809e0 · 60809e0
2 parents 974a59f + aec52c0
commit 60809e0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -46,7 +46,7 @@ def postgresql_connection(config)
       conn = PG.connect(conn_params)
       ConnectionAdapters::PostgreSQLAdapter.new(conn, logger, conn_params, config)
     rescue ::PG::Error => error
-      if error.message.include?("does not exist")
+      if error.message.include?(conn_params[:dbname])
         raise ActiveRecord::NoDatabaseError
       else
         raise