diff options
author | Xavier Noria <fxn@hashref.com> | 2011-05-25 22:48:47 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-05-25 22:48:47 +0200 |
commit | 00e1d0832e1242fe41cf43490b0a3a21a40f3c26 (patch) | |
tree | 06d3fcf35727a37f78885fc63fe15ff265aa309a /activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | |
parent | d25b7c2eeefff3a0abf7b532c10ce25a71d0fba2 (diff) | |
parent | 03f418370a4266e414ff32706381bb2b60baadfc (diff) | |
download | rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.gz rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.bz2 rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
actionmailer/lib/action_mailer/base.rb
activesupport/lib/active_support/core_ext/kernel/requires.rb
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | 4 |
1 files changed, 2 insertions, 2 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 b3eb23bbb3..79134a0f27 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -42,7 +42,7 @@ module ActiveRecord undef_method :execute # Executes +sql+ statement in the context of this connection using - # +binds+ as the bind substitutes. +name+ is logged along with + # +binds+ as the bind substitutes. +name+ is logged along with # the executed +sql+ statement. def exec_query(sql, name = 'SQL', binds = []) end @@ -276,7 +276,7 @@ module ActiveRecord # Set the sequence to the max value of the table's column. def reset_sequence!(table, column, sequence = nil) - # Do nothing by default. Implement for PostgreSQL, Oracle, ... + # Do nothing by default. Implement for PostgreSQL, Oracle, ... end # Inserts the given fixture into the table. Overridden in adapters that require |