kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #29253 from kamipo/prevent_extra_query

Browse source 
Prevent extra `current_database` query for `encoding`/`collation`/`ctype`
This commit is contained in:
Matthew Draper 2017-05-29 00:07:17 +09:30 committed by GitHub
commit 919bc57747
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
View file

@ -186,17 +186,17 @@ module ActiveRecord
# Returns the current database encoding format. # Returns the current database encoding format.
def encoding def encoding
select_value("SELECT pg_encoding_to_char(encoding) FROM pg_database WHERE datname LIKE '#{current_database}'", "SCHEMA") select_value("SELECT pg_encoding_to_char(encoding) FROM pg_database WHERE datname = current_database()", "SCHEMA")
end end
# Returns the current database collation. # Returns the current database collation.
def collation def collation
select_value("SELECT datcollate FROM pg_database WHERE datname LIKE '#{current_database}'", "SCHEMA") select_value("SELECT datcollate FROM pg_database WHERE datname = current_database()", "SCHEMA")
end end
# Returns the current database ctype. # Returns the current database ctype.
def ctype def ctype
select_value("SELECT datctype FROM pg_database WHERE datname LIKE '#{current_database}'", "SCHEMA") select_value("SELECT datctype FROM pg_database WHERE datname = current_database()", "SCHEMA")
end end
# Returns an array of schema names. # Returns an array of schema names.

12
activerecord/test/cases/adapters/postgresql/connection_test.rb
View file

@ -31,15 +31,21 @@ module ActiveRecord
end end
def test_encoding def test_encoding
assert_not_nil @connection.encoding assert_queries(1) do
assert_not_nil @connection.encoding
end
end end
def test_collation def test_collation
assert_not_nil @connection.collation assert_queries(1) do
assert_not_nil @connection.collation
end
end end
def test_ctype def test_ctype
assert_not_nil @connection.ctype assert_queries(1) do
assert_not_nil @connection.ctype
end
end end
def test_default_client_min_messages def test_default_client_min_messages