aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-09-26 23:09:36 +0930
committerGitHub <noreply@github.com>2016-09-26 23:09:36 +0930
commit15a8740d68ccf1f376b5f2cf29c5336d8716278f (patch)
tree7491d67c9f235f973a2be906c9202eee12191461 /activerecord/lib/active_record
parent134a008e79f367a40272fe3cace1424a23c50701 (diff)
parent7caaee932f81751db119315672bebce5173728ad (diff)
downloadrails-15a8740d68ccf1f376b5f2cf29c5336d8716278f.tar.gz
rails-15a8740d68ccf1f376b5f2cf29c5336d8716278f.tar.bz2
rails-15a8740d68ccf1f376b5f2cf29c5336d8716278f.zip
Merge pull request #26626 from alexcameron89/pg_result_doc
[ci skip] Update PG adapter documentation
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
index 24ee442d3d..092543259f 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
@@ -90,7 +90,7 @@ module ActiveRecord
end
# Executes an SQL statement, returning a PG::Result object on success
- # or raising a PG exception otherwise.
+ # or raising a PG::Error exception otherwise.
# Note: the PG::Result object is manually memory managed; if you don't
# need it specifically, you may want consider the <tt>exec_query</tt> wrapper.
def execute(sql, name = nil)