aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Setup explicit requires for files with exceptions. Removed them from ↵Łukasz Strzałkowski2010-09-024-0/+5
| | | | | | autoloading. Signed-off-by: José Valim <jose.valim@gmail.com>
* Reset default scope in Thread.current when class is unloaded [#5497 ↵Andrew White2010-09-011-0/+8
| | | | | | state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com>
* Make all the Relation finder methods consistentPratik Naik2010-08-311-32/+67
|
* Merge remote branch 'miloops/rails_master_fixes'Pratik Naik2010-08-311-15/+26
|\
| * Avoid calling build_where is no argument is given.Emilio Tagua2010-08-311-1/+1
| |
| * Improved conditionals usage to prevent calling methods.Emilio Tagua2010-08-311-8/+19
| |
| * Don't test conditional in iteration if it is not present just clone it.Emilio Tagua2010-08-311-9/+9
| |
* | Remove default values for Relation#limit/offset/from/create_withPratik Naik2010-08-311-4/+4
| |
* | Change relation merging to always append select, group and order valuesPratik Naik2010-08-311-7/+10
|/
* replacing superclass_delegating_accessor with class_attributeNeeraj Singh2010-08-311-6/+6
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Replacing superclass_delegating_accessoror with class_attribute.Neeraj Singh2010-08-311-1/+1
| | | | | | | :store_full_sti_class will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com>
* Replacing superclass_delegating_accessoror with class_attribute.Neeraj Singh2010-08-311-1/+1
| | | | | | | :partial_attributes will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com>
* resolves merge conflictXavier Noria2010-08-311-3/+0
|\
| * The call-seq directive has no useful effect on our documentation and is not ↵Joost Baaij2010-08-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | used anywhere else. Worse still, its use breaks some rdoc, replacing method names with a curly brace. Having just one call-seq directive doesn't add anything since this is covered by regular rdoc. Having multiple might make sense, but these are already documented with examples. This partly re-reverts 60de0e56b7f57f0052d7e4f43bd2ef9e363c6a1a but does not touch the vendorized code in html-scanner.
* | PERF: Avoid two method callsSantiago Pastorino2010-08-281-1/+1
|/
* Fix em_mysql2 error in rake db:createSam Aarons2010-08-271-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* lifecycle should be two words, life cycleJaime Iniesta2010-08-263-4/+4
|
* Merge remote branch 'docrails/master'Xavier Noria2010-08-261-8/+6
|\
| * minor formatting fixesNeeraj Singh2010-08-251-8/+6
| |
* | Catch mysql2 access denied errors in rake db:create [#5432 state:resolved]Andrew White2010-08-251-2/+4
| | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* | use blank? instead of present?, mark SQL literals as SQL literalsAaron Patterson2010-08-251-5/+5
| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb
* | no need to send on a public methodAaron Patterson2010-08-251-1/+1
| |
* | refactor select { is_a? } to grep()Aaron Patterson2010-08-251-1/+1
| |
* | mark SQL literals as SQL literalsAaron Patterson2010-08-251-1/+1
|/
* :nodoc:s #unscoped until its behavior is more clear, now sometimes works, ↵Xavier Noria2010-08-251-1/+1
| | | | sometimes not
* edit pass to a recent doc patchXavier Noria2010-08-251-3/+10
|
* Merge remote branch 'docrails/master'Xavier Noria2010-08-252-2/+11
|\
| * touch operationg if used along with belongs_to will also be invoked on ↵Neeraj Singh2010-08-241-2/+6
| | | | | | | | associated objects
| * unscoped does not work when chained with named_scopeNeeraj Singh2010-08-231-0/+5
| |
* | @user.touch should not fail if User does not have updated_at/updated_on column.Neeraj Singh2010-08-241-9/+11
| | | | | | | | | | | | [#5439 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | fix broken relative links [#5415 state:committed]Joost Baaij2010-08-241-1/+1
| | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* | Ensure timestamps are not generated when explicitly set to false [#5440 ↵José Valim2010-08-241-1/+1
| | | | | | | | state:resolved]
* | Master is now targeting 3.1.0.betaDavid Heinemeier Hansson2010-08-231-2/+2
| |
* | marking sql literals as sql literalsAaron Patterson2010-08-231-1/+1
| |
* | we should mark sql strings as sql literalsAaron Patterson2010-08-231-1/+1
| |
* | sql literal strings should be marked as sql literal stringsAaron Patterson2010-08-231-1/+3
| |
* | we should mark strings as SQL Literal valuesAaron Patterson2010-08-231-1/+1
| |
* | mysql2 adapter is being maintained in the mysql2 gem itselfBrian Lopez2010-08-231-644/+0
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | removing unused codeAaron Patterson2010-08-221-3/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-08-232-8/+10
|\
| * Revert "Just add connection management middleware if running in a concurrent ↵Jeremy Kemper2010-08-201-8/+5
| | | | | | | | | | | | environment." This reverts commit 6b29dc876fe185881d46731c3ae170478a3828fe.
| * adding FOUND_ROWS to the connect flags for mysql2Aaron Patterson2010-08-201-0/+5
| |
* | Fix docs to reference ActiveRecord::LogSubscriberEvgeniy Dolzhenko2010-08-211-1/+1
|/ | | | since Rails::LogSubscriber doesn't seem to be defined anymore
* Merge remote branch 'rails/master'Xavier Noria2010-08-208-22/+29
|\
| * fisting after_rollback and after commit callbacksAaron Patterson2010-08-201-1/+1
| |
| * updates return number of rows matched rather than number of rows affectedAaron Patterson2010-08-191-0/+1
| |
| * Optimize find_sti_class when store_full_sti_class is trueAndrew White2010-08-191-1/+5
| | | | | | | | | | | | [#5403] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * While creating a new record using has_many create method default scope of ↵Neeraj Singh2010-08-192-5/+13
| | | | | | | | | | | | | | | | | | | | | | child should be respected. author.posts.create should take into account default_scope defined on post. [#3939: state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * removing useless ternaryAaron Patterson2010-08-191-1/+1
| |
| * we should wrap strings as sql literalsAaron Patterson2010-08-191-1/+1
| |