Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2010-12-20 | 103 | -1281/+2034 |
|\ | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb | ||||
| * | Small changes on AD::Reloader. | José Valim | 2010-12-20 | 1 | -1/+1 |
| | | |||||
| * | Use AD::Reloader.to_cleanup for reloading [#2873 state:resolved] | John Firebaugh | 2010-12-20 | 1 | -5/+3 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepare | John Firebaugh | 2010-12-20 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Remove weak_passwords list and the length/strong password validator, leave ↵ | Santiago Pastorino | 2010-12-19 | 1 | -5/+5 |
| | | | | | | | | that up to the programmer | ||||
| * | Switch from SHA2 to BCrypt (easy Windows compatibility is coming shortly ↵ | David Heinemeier Hansson | 2010-12-18 | 1 | -1/+1 |
| | | | | | | | | with new compiled gem) | ||||
| * | Added ActiveRecord::Base#has_secure_password (via ↵ | David Heinemeier Hansson | 2010-12-18 | 2 | -0/+20 |
| | | | | | | | | ActiveModel::SecurePassword) to encapsulate dead-simple password usage with SHA2 encryption and salting | ||||
| * | Generate add_index by default when giving type belongs_to or references | Santiago Pastorino | 2010-12-16 | 2 | -0/+26 |
| | | |||||
| * | ActiveRecord::Base.joins should allow single nil argument [#6181 state:resolved] | Piotr Sarnacki | 2010-12-16 | 2 | -1/+5 |
| | | |||||
| * | Fix various issues with the :primary_key option in :through associations ↵ | Jon Leighton | 2010-12-15 | 6 | -18/+48 |
| | | | | | | | | [#2421 state:resolved] | ||||
| * | Fix problem with duplicated records when a :uniq :through association is ↵ | Jon Leighton | 2010-12-15 | 3 | -2/+16 |
| | | | | | | | | preloaded [#2447 state:resolved] | ||||
| * | dry up compute type in attribute | Aaron Patterson | 2010-12-15 | 1 | -16/+10 |
| | | |||||
| * | Replace rudimentary named_scope with scope. [#6052 state:resolved] | Pavel Gorbokon | 2010-12-15 | 5 | -35/+35 |
| | | | | | | | | | | | | | | * rename method names (actually in tests) * rename instance variable @_named_scopes_cache to @_scopes_cache * rename references in doc comments * don't touch CHANGELOG :) | ||||
| * | Provide test for #4840: to_xml doesn't work in such case: ↵ | Franck Verrot | 2010-12-15 | 1 | -0/+6 |
| | | | | | | | | Event.select('title as t').to_xml | ||||
| * | to_xml doesn't work in such case: Event.select('title as t').to_xml [#4840 ↵ | Víctor Martínez | 2010-12-15 | 1 | -2/+8 |
| | | | | | | | | | | | | state:resolved] NilClass.type is no longer defined in Ruby 1.9 and causes ActiveRecord::Base.to_xml to fail with message: undefined method `type' for nil:NilClass | ||||
| * | test for eager load of has_one association with condition on the through table | Pivotal Labs | 2010-12-16 | 1 | -1/+9 |
| | | |||||
| * | make sure that join nodes are uniq | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | | |||||
| * | Verify that creating a has_many through record where there is a ↵ | Jon Leighton | 2010-12-16 | 4 | -1/+22 |
| | | | | | | | | default_scope on the join model works correctly (creates the join record with the default scope applied) | ||||
| * | Respect the default_scope on a join model when reading a through association | Jon Leighton | 2010-12-16 | 8 | -4/+34 |
| | | |||||
| * | Fix hm:t to self table aliasing in construct_scope | Ernie Miller | 2010-12-16 | 3 | -3/+12 |
| | | |||||
| * | add test which fails for has_many through self join [#4361 state:open] | Joe Hannon | 2010-12-16 | 1 | -0/+7 |
| | | |||||
| * | class names are already strings, so we do not need to call to_s on the ↵ | Aaron Patterson | 2010-12-16 | 1 | -2/+2 |
| | | | | | | | | strings that are already strings | ||||
| * | build SQL AST nodes rather than generate strings | Aaron Patterson | 2010-12-16 | 1 | -10/+8 |
| | | |||||
| * | construct_joins no longer needs an argument | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | | |||||
| * | supporting arel AST nodes when building join statements | Aaron Patterson | 2010-12-16 | 2 | -18/+32 |
| | | |||||
| * | just copy the joins to the list | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | | |||||
| * | bucketing based on join type | Aaron Patterson | 2010-12-16 | 1 | -8/+17 |
| | | |||||
| * | taking advantage of the JoinSource node in the SQL AST | Aaron Patterson | 2010-12-16 | 4 | -32/+14 |
| | | |||||
| * | fixing whitespace errors | Aaron Patterson | 2010-12-16 | 1 | -4/+4 |
| | | |||||
| * | stop delegating inserts to ARel, use the INSERT SQL ourselves | Aaron Patterson | 2010-12-16 | 1 | -1/+13 |
| | | |||||
| * | persisted? should be able to return a truthy object | Aaron Patterson | 2010-12-16 | 1 | -8/+8 |
| | | |||||
| * | Only call save on belongs_to associations if the record has changed or any ↵ | Chiel Wester | 2010-12-16 | 2 | -1/+12 |
| | | | | | | | | | | | | nested associations have changed (resolves #3353) Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | just use the regexp directly | Aaron Patterson | 2010-12-16 | 1 | -6/+4 |
| | | |||||
| * | combine regexp | Aaron Patterson | 2010-12-16 | 1 | -4/+2 |
| | | |||||
| * | reduce method calls | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | | |||||
| * | move ivar to initialize, use triple dot rather than minus | Aaron Patterson | 2010-12-16 | 2 | -2/+2 |
| | | |||||
| * | explicitly set prefix | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | | |||||
| * | remove lasgn since AST is mutated | Aaron Patterson | 2010-12-16 | 2 | -3/+9 |
| | | |||||
| * | just mutate the ast, fewer lasgns | Aaron Patterson | 2010-12-16 | 1 | -3/+2 |
| | | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-11 | 1 | -9/+11 |
| |\ | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/transactions.rb | ||||
| | * | reviews commit 53bbbcc | Xavier Noria | 2010-12-11 | 1 | -9/+11 |
| | | | |||||
| | * | Fix doc about nested transaction rollback | Ivan Evtukhovich | 2010-12-09 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | Because AR::Rollback do not reraise and inner transaction is not "real" nothing rollback at all | ||||
| * | | use table alias nodes rather than Table nodes | Aaron Patterson | 2010-12-10 | 1 | -3/+2 |
| | | | |||||
| * | | use alias nodes to represent table aliases | Aaron Patterson | 2010-12-10 | 1 | -3/+2 |
| | | | |||||
| * | | avoid *args on join_target_table | Aaron Patterson | 2010-12-10 | 1 | -3/+5 |
| | | | |||||
| * | | only quote the table name once per call | Aaron Patterson | 2010-12-10 | 1 | -6/+7 |
| | | | |||||
| * | | no more manager manipulation if there is no custom join ast | Aaron Patterson | 2010-12-10 | 1 | -6/+5 |
| | | | |||||
| * | | froms should never equal 0 | Aaron Patterson | 2010-12-10 | 1 | -2/+0 |
| | | | |||||
| * | | manager will always be a manager | Aaron Patterson | 2010-12-10 | 1 | -10/+6 |
| | | | |||||
| * | | eliminate lasgns | Aaron Patterson | 2010-12-10 | 1 | -10/+10 |
| | | |