aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-28 10:33:41 -0300
committerGitHub <noreply@github.com>2016-07-28 10:33:41 -0300
commitbe85efe8db42edb50a4f90e9f39f069bb5479b8e (patch)
tree0fc67f8da7550ec167305160c8766bce192ad7bf /activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
parentb3348819c5d6acf13b97cb6c4825f0b1a004f7e9 (diff)
parenta31e837431ee131fbc6900f1b3c3d6ef09753f7a (diff)
downloadrails-be85efe8db42edb50a4f90e9f39f069bb5479b8e.tar.gz
rails-be85efe8db42edb50a4f90e9f39f069bb5479b8e.tar.bz2
rails-be85efe8db42edb50a4f90e9f39f069bb5479b8e.zip
Merge pull request #25340 from kamipo/prevent_table_comment_query
Prevent `table_comment` query if a table doesn't have a comment
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb4
1 files changed, 4 insertions, 0 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 cc606e4828..4cf6d4b14a 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -238,6 +238,10 @@ module ActiveRecord
PostgreSQLColumn.new(*args)
end
+ def table_options(table_name) # :nodoc:
+ { comment: table_comment(table_name) }
+ end
+
# Returns a comment stored in database for given table
def table_comment(table_name) # :nodoc:
name = Utils.extract_schema_qualified_name(table_name.to_s)