Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace reset_counter_cache with reset_counters that has API inline with ↵ | Gabe da Silveira | 2009-12-03 | 1 | -8/+13 |
| | | | | | | | | existing update_counters method [#1211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Add support for Mysql column positioning via #add_column and #change_column | Ben Marini | 2009-12-03 | 1 | -0/+15 |
| | | | | | | | | | | | | | | add_column and change_column in the Mysql adapter now accept some additional options: :first => true # Put the column in front of all the columns :after => column_name # Put the colmn after 'column_name' add_column :new_col, :string, :first => true add_column :another_col, :integer, :default => 0, :after => :new_col [#3286 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix instance_eval calls to association proxies | Mat Brown | 2009-12-02 | 1 | -6/+2 |
| | | | | | | | | In the current stable, ActiveRecord::Associations::AssociationProxy#method_missing calls yield() if a block is given, causing the block to always be evaluated in its calling context. However, in the case of instance_eval, correct behavior requires that the block be passed directly to the @target, rather than being evaluated inside a different block. Incidentally, this also simplifies the code slightly. [#3412 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Implement ActiveRecord#reset_counter_cache | Mike Breen | 2009-12-02 | 1 | -0/+18 |
| | | | | | | [#1211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Revert "Revert "Assert primary key does not exist in habtm when the ↵ | Jeremy Kemper | 2009-11-23 | 2 | -14/+10 |
| | | | | | | | | | | | | | association is defined, instead of doing that everytime a record is inserted."" This reverts commit 2b82708b0efb3a3458e8177beab58f0c585788ae. [#3128 state:resolved] Conflicts: activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | ||||
* | Insert generated association members in the same order they are specified ↵ | Gabe da Silveira | 2009-11-17 | 1 | -2/+3 |
| | | | | | | | | when assigning to a has_many :through using the generated *_ids method [#3491 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Revert "Ensure Model#destroy respects optimistic locking" | Jeremy Kemper | 2009-11-17 | 1 | -34/+0 |
| | | | | | | | | | | [#1966 state:open] This reverts commit 0d922885fb54c19f04680482f024452859218910. Conflicts: activerecord/lib/active_record/locking/optimistic.rb | ||||
* | No need to check for generated method, just redispatch | Jeremy Kemper | 2009-11-14 | 1 | -4/+3 |
| | |||||
* | Ruby 1.9.2: use recursive flatten | Jeremy Kemper | 2009-11-14 | 1 | -7/+1 |
| | |||||
* | Ruby 1.9.2: fix flatten_deeper to preserve nils | Jeremy Kemper | 2009-11-14 | 1 | -1/+1 |
| | |||||
* | Revert "Split arel_table into method to get a relation and another to ↵ | Jeremy Kemper | 2009-11-13 | 5 | -13/+13 |
| | | | | | | memoize the default relation." This reverts commit bd51790895fc75a3b4e19e8dd7aa6dc389d77068. | ||||
* | Split arel_table into method to get a relation and another to memoize the ↵ | Jeremy Kemper | 2009-11-13 | 5 | -13/+13 |
| | | | | default relation. | ||||
* | Ruby 1.9.2: avoid #flatten | Jeremy Kemper | 2009-11-13 | 3 | -18/+38 |
| | |||||
* | Update AR logger subscriber for Notifications subscriber args change | Jeremy Kemper | 2009-11-11 | 1 | -2/+2 |
| | |||||
* | Ruby 1.9: fix Relation respond_to? and method_missing | Jeremy Kemper | 2009-11-10 | 1 | -6/+4 |
| | |||||
* | delete correct records for a has_many with :primary_key and :dependent => ↵ | Matt Jones | 2009-11-10 | 1 | -1/+1 |
| | | | | | | :delete_all Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Integer#even? and Integer#odd? are not needed for Ruby >= 1.8.7 | Xavier Noria | 2009-11-09 | 1 | -2/+0 |
| | |||||
* | Object#tap is not needed for Ruby >= 1.8.7 | Xavier Noria | 2009-11-09 | 1 | -2/+0 |
| | |||||
* | Symbol#to_proc is not needed for Ruby >= 1.8.7 | Xavier Noria | 2009-11-09 | 1 | -1/+0 |
| | |||||
* | Define autosave association callbacks when using accepts_nested_attributes_for. | Eloy Duran | 2009-11-07 | 1 | -0/+2 |
| | | | | | | | This way we don't define all the validation methods for all associations by default, but only when needed. [#3355 state:resolved] | ||||
* | Arel::In -> Arel::Predicates::In | Jeremy Kemper | 2009-11-02 | 3 | -3/+3 |
| | |||||
* | Move validator, human_name and human_attribute_name to ActiveModel, remove ↵ | José Valim | 2009-10-20 | 3 | -184/+5 |
| | | | | | | deprecated error messages and add i18n_scope and lookup_ancestors. Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | Fixed: #without_typecast should only disable typecasting on the duplicated ↵ | Eric Chapweske | 2009-10-18 | 1 | -0/+6 |
| | | | | | | attributes [#3387 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Refactoring attributes/types [#3348 state:resolved] | Eric Chapweske | 2009-10-17 | 16 | -148/+429 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Fix Rails root in sqlite adapter | Joshua Peek | 2009-10-16 | 1 | -3/+3 |
| | |||||
* | Modify connection pool callbacks to be compatible w/ new style | Nick Sieger | 2009-10-16 | 1 | -6/+8 |
| | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
* | Renamed Orchestra to Notifications once again [#3321 state:resolved] | José Valim | 2009-10-15 | 2 | -3/+3 |
| | |||||
* | Unify benchmark APIs. | José Valim | 2009-10-15 | 1 | -33/+3 |
| | |||||
* | Update Orchestra instrumentations and move part of logging to Orchestra. | José Valim | 2009-10-15 | 3 | -10/+11 |
| | |||||
* | Revert "Rename Orchestra to Notifications [#3321 state:resolved]" | José Valim | 2009-10-15 | 1 | -1/+1 |
| | | | | This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2. | ||||
* | Merge branch 'arel' | Jeremy Kemper | 2009-10-14 | 17 | -612/+613 |
|\ | |||||
| * | Use ActiveSupport::Callbacks instead of | Emilio Tagua | 2009-10-13 | 1 | -1/+1 |
| | | | | | | | | ActiveSupport::DeprecatedCallbacks. | ||||
| * | Merge commit 'rails/master' | Emilio Tagua | 2009-10-13 | 5 | -25/+41 |
| |\ | |||||
| * \ | Merge commit 'rails/master' | Emilio Tagua | 2009-10-08 | 1 | -8/+35 |
| |\ \ | |||||
| * | | | Relations: Added offset when finding with associations. Delegate array instance | Emilio Tagua | 2009-10-07 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | methods to to_a. | ||||
| * | | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-07 | 1 | -27/+38 |
| |\ \ \ | |||||
| * | | | | Don't send table_name when updating attributes, use the class arel_table. | Emilio Tagua | 2009-10-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Don't send table_name when there's no need to. | Emilio Tagua | 2009-10-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Allow preload and eager_load to work on relations at the same time. | Emilio Tagua | 2009-10-07 | 1 | -6/+8 |
| | | | | | |||||
| * | | | | Initial documentation to Base#all. | Emilio Tagua | 2009-10-05 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'associations_2' | Emilio Tagua | 2009-10-05 | 3 | -9/+46 |
| |\ \ \ \ | |||||
| | * | | | | Added eager loading support to Relation and ActiveRecord#all. | Emilio Tagua | 2009-10-05 | 3 | -20/+33 |
| | | | | | | |||||
| | * | | | | Moved relation's test to relation_test. | Emilio Tagua | 2009-10-05 | 1 | -2/+1 |
| | | | | | | |||||
| | * | | | | Added association preload to relation. | Emilio Tagua | 2009-09-01 | 2 | -3/+28 |
| | | | | | | |||||
| * | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-02 | 2 | -1/+12 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-09-22 | 1 | -13/+9 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-09-21 | 2 | -30/+23 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-09-14 | 6 | -71/+77 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 5 | -192/+149 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 4 | -13/+22 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb |