aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-05-19 11:55:55 -0700
committerRyuta Kamizono <kamipo@gmail.com>2015-05-19 12:01:41 -0700
commit653eb853b8e62f3ea33d67dffa86fdab7a475089 (patch)
tree42f27fddc14225ad58ca8166e3b207e8a08a8782 /activerecord/lib
parentb7afca19936d5bc90e9209493123f436756b2893 (diff)
downloadrails-653eb853b8e62f3ea33d67dffa86fdab7a475089.tar.gz
rails-653eb853b8e62f3ea33d67dffa86fdab7a475089.tar.bz2
rails-653eb853b8e62f3ea33d67dffa86fdab7a475089.zip
Avoid the heredoc in one line queries and simple queries
Related with #20028.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb25
1 files changed, 5 insertions, 20 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 412999f0fe..595c635fc0 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -70,11 +70,7 @@ module ActiveRecord
# Returns the list of all tables in the schema search path or a specified schema.
def tables(name = nil)
- select_values(<<-SQL, 'SCHEMA')
- SELECT tablename
- FROM pg_tables
- WHERE schemaname = ANY (current_schemas(false))
- SQL
+ select_values("SELECT tablename FROM pg_tables WHERE schemaname = ANY(current_schemas(false))", 'SCHEMA')
end
# Returns true if table exists.
@@ -100,11 +96,7 @@ module ActiveRecord
# Returns true if schema exists.
def schema_exists?(name)
- select_value(<<-SQL, 'SCHEMA').to_i > 0
- SELECT COUNT(*)
- FROM pg_namespace
- WHERE nspname = '#{name}'
- SQL
+ select_value("SELECT COUNT(*) FROM pg_namespace WHERE nspname = '#{name}'", 'SCHEMA').to_i > 0
end
# Verifies existence of an index with a given name.
@@ -192,24 +184,17 @@ module ActiveRecord
# Returns the current database encoding format.
def encoding
- select_value(<<-end_sql, 'SCHEMA')
- SELECT pg_encoding_to_char(pg_database.encoding) FROM pg_database
- WHERE pg_database.datname LIKE '#{current_database}'
- end_sql
+ select_value("SELECT pg_encoding_to_char(encoding) FROM pg_database WHERE datname LIKE '#{current_database}'", 'SCHEMA')
end
# Returns the current database collation.
def collation
- select_value(<<-end_sql, 'SCHEMA')
- SELECT pg_database.datcollate FROM pg_database WHERE pg_database.datname LIKE '#{current_database}'
- end_sql
+ select_value("SELECT datcollate FROM pg_database WHERE datname LIKE '#{current_database}'", 'SCHEMA')
end
# Returns the current database ctype.
def ctype
- select_value(<<-end_sql, 'SCHEMA')
- SELECT pg_database.datctype FROM pg_database WHERE pg_database.datname LIKE '#{current_database}'
- end_sql
+ select_value("SELECT datctype FROM pg_database WHERE datname LIKE '#{current_database}'", 'SCHEMA')
end
# Returns an array of schema names.