aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Replace reset_counter_cache with reset_counters that has API inline with ↵Gabe da Silveira2009-12-031-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_columnBen Marini2009-12-031-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 proxiesMat Brown2009-12-021-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_cacheMike Breen2009-12-021-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 Kemper2009-11-232-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 Silveira2009-11-171-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 Kemper2009-11-171-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 redispatchJeremy Kemper2009-11-141-4/+3
|
* Ruby 1.9.2: use recursive flattenJeremy Kemper2009-11-141-7/+1
|
* Ruby 1.9.2: fix flatten_deeper to preserve nilsJeremy Kemper2009-11-141-1/+1
|
* Revert "Split arel_table into method to get a relation and another to ↵Jeremy Kemper2009-11-135-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 Kemper2009-11-135-13/+13
| | | | default relation.
* Ruby 1.9.2: avoid #flattenJeremy Kemper2009-11-133-18/+38
|
* Update AR logger subscriber for Notifications subscriber args changeJeremy Kemper2009-11-111-2/+2
|
* Ruby 1.9: fix Relation respond_to? and method_missingJeremy Kemper2009-11-101-6/+4
|
* delete correct records for a has_many with :primary_key and :dependent => ↵Matt Jones2009-11-101-1/+1
| | | | | | :delete_all Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Integer#even? and Integer#odd? are not needed for Ruby >= 1.8.7Xavier Noria2009-11-091-2/+0
|
* Object#tap is not needed for Ruby >= 1.8.7Xavier Noria2009-11-091-2/+0
|
* Symbol#to_proc is not needed for Ruby >= 1.8.7Xavier Noria2009-11-091-1/+0
|
* Define autosave association callbacks when using accepts_nested_attributes_for.Eloy Duran2009-11-071-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::InJeremy Kemper2009-11-023-3/+3
|
* Move validator, human_name and human_attribute_name to ActiveModel, remove ↵José Valim2009-10-203-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 Chapweske2009-10-181-0/+6
| | | | | | attributes [#3387 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Refactoring attributes/types [#3348 state:resolved]Eric Chapweske2009-10-1716-148/+429
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fix Rails root in sqlite adapterJoshua Peek2009-10-161-3/+3
|
* Modify connection pool callbacks to be compatible w/ new styleNick Sieger2009-10-161-6/+8
| | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
* Renamed Orchestra to Notifications once again [#3321 state:resolved]José Valim2009-10-152-3/+3
|
* Unify benchmark APIs.José Valim2009-10-151-33/+3
|
* Update Orchestra instrumentations and move part of logging to Orchestra.José Valim2009-10-153-10/+11
|
* Revert "Rename Orchestra to Notifications [#3321 state:resolved]"José Valim2009-10-151-1/+1
| | | | This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2.
* Merge branch 'arel'Jeremy Kemper2009-10-1417-612/+613
|\
| * Use ActiveSupport::Callbacks instead ofEmilio Tagua2009-10-131-1/+1
| | | | | | | | ActiveSupport::DeprecatedCallbacks.
| * Merge commit 'rails/master'Emilio Tagua2009-10-135-25/+41
| |\
| * \ Merge commit 'rails/master'Emilio Tagua2009-10-081-8/+35
| |\ \
| * | | Relations: Added offset when finding with associations. Delegate array instanceEmilio Tagua2009-10-071-5/+3
| | | | | | | | | | | | | | | | methods to to_a.
| * | | Merge commit 'rails/master'Emilio Tagua2009-10-071-27/+38
| |\ \ \
| * | | | Don't send table_name when updating attributes, use the class arel_table.Emilio Tagua2009-10-071-1/+1
| | | | |
| * | | | Don't send table_name when there's no need to.Emilio Tagua2009-10-071-1/+1
| | | | |
| * | | | Allow preload and eager_load to work on relations at the same time.Emilio Tagua2009-10-071-6/+8
| | | | |
| * | | | Initial documentation to Base#all.Emilio Tagua2009-10-051-2/+2
| | | | |
| * | | | Merge branch 'associations_2'Emilio Tagua2009-10-053-9/+46
| |\ \ \ \
| | * | | | Added eager loading support to Relation and ActiveRecord#all.Emilio Tagua2009-10-053-20/+33
| | | | | |
| | * | | | Moved relation's test to relation_test.Emilio Tagua2009-10-051-2/+1
| | | | | |
| | * | | | Added association preload to relation.Emilio Tagua2009-09-012-3/+28
| | | | | |
| * | | | | Merge commit 'rails/master'Emilio Tagua2009-10-022-1/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-221-13/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-212-30/+23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-146-71/+77
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-085-192/+149
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Emilio Tagua2009-09-084-13/+22
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb