aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-04-04 12:42:22 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-04-04 12:42:22 +0530
commit02b9c22df8053d71782ae11900d0194f217afc3c (patch)
tree8a581720153199868492fb6ebec7be54573a1861 /activerecord/lib/active_record
parente25eeed5b873f05f9614ecf6720c0eb636d52b63 (diff)
parentf89f74896b711d5b073289c9e485e3357c032cc8 (diff)
downloadrails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.gz
rails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.bz2
rails-02b9c22df8053d71782ae11900d0194f217afc3c.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: guides/source/engines.textile
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index 174450eb00..e919068909 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -57,21 +57,21 @@ module ActiveRecord
end
# Executes insert +sql+ statement in the context of this connection using
- # +binds+ as the bind substitutes. +name+ is the logged along with
+ # +binds+ as the bind substitutes. +name+ is logged along with
# the executed +sql+ statement.
def exec_insert(sql, name, binds)
exec_query(sql, name, binds)
end
# Executes delete +sql+ statement in the context of this connection using
- # +binds+ as the bind substitutes. +name+ is the logged along with
+ # +binds+ as the bind substitutes. +name+ is logged along with
# the executed +sql+ statement.
def exec_delete(sql, name, binds)
exec_query(sql, name, binds)
end
# Executes update +sql+ statement in the context of this connection using
- # +binds+ as the bind substitutes. +name+ is the logged along with
+ # +binds+ as the bind substitutes. +name+ is logged along with
# the executed +sql+ statement.
def exec_update(sql, name, binds)
exec_query(sql, name, binds)