diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2017-05-28 13:27:41 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-05-28 22:42:09 +0900 |
commit | b731f598fc076acbcaeb273636e646dfebeef796 (patch) | |
tree | 9e94d8ab673f5e63f5db08e5f2f5e70bbccea989 /activerecord/lib | |
parent | 352865d0f835c24daa9a2e9863dcc9dde9e5371a (diff) | |
download | rails-b731f598fc076acbcaeb273636e646dfebeef796.tar.gz rails-b731f598fc076acbcaeb273636e646dfebeef796.tar.bz2 rails-b731f598fc076acbcaeb273636e646dfebeef796.zip |
Prevent extra `current_database` query for `encoding`/`collation`/`ctype`
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb index 5b483ad4ab..3eff9e2f83 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -186,17 +186,17 @@ module ActiveRecord # Returns the current database encoding format. 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 # Returns the current database 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 # Returns the current database 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 # Returns an array of schema names. |