aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Moss <maclover7@users.noreply.github.com>2016-09-25 21:32:07 -0400
committerGitHub <noreply@github.com>2016-09-25 21:32:07 -0400
commit134a008e79f367a40272fe3cace1424a23c50701 (patch)
tree14b8b33146fb8447f997bc76efcf49754b29e6d6
parent6b8e6c4fbde27920b25b5567546ea9c4f4ad538f (diff)
parent65f694ff2940f75b648454a77951f6c63d318fa9 (diff)
downloadrails-134a008e79f367a40272fe3cace1424a23c50701.tar.gz
rails-134a008e79f367a40272fe3cace1424a23c50701.tar.bz2
rails-134a008e79f367a40272fe3cace1424a23c50701.zip
Merge pull request #26622 from alexcameron89/pg_result_doc
[ci skip] Clarify Postgresql Documentation
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb8
1 files changed, 4 insertions, 4 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 7414eba6c5..24ee442d3d 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
@@ -89,10 +89,10 @@ module ActiveRecord
end
end
- # Executes an SQL statement, returning a PGresult object on success
- # or raising a PGError exception otherwise.
- # Note: the PGresult object is manually memory managed; if you don't
- # need it specifically, you many want consider the exec_query wrapper.
+ # Executes an SQL statement, returning a PG::Result object on success
+ # or raising a PG 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)
log(sql, name) do
@connection.async_exec(sql)