aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-06-0138-2730/+1048
|\
| * Schema dumper now records scale 0 decimal columns as decimal not integer.Giles Alexander2009-06-013-2/+15
| | | | | | | | | | | | | | | | | | | | The schema dumper would dump out any decimal or numeric column that had a zero scale as an integer column. This will cause problems for very large precision columns on some DBMSs, particularly PostgreSQL. It also looks strange to see your column change type after moving through schema.rb. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2741 state:committed]
| * AS::Concern redefines "include" to lazy include modules as dependenciesJoshua Peek2009-05-291-2/+2
| |
| * AS::Concern includes InstanceMethods module if it existsJoshua Peek2009-05-291-2/+0
| |
| * Merge branch 'master' into active_modelJoshua Peek2009-05-2983-410/+1198
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/core.rb activemodel/test/cases/state_machine/event_test.rb activemodel/test/cases/state_machine/state_transition_test.rb activerecord/lib/active_record/validations.rb activerecord/test/cases/validations/i18n_validation_test.rb activeresource/lib/active_resource.rb activeresource/test/abstract_unit.rb
| | * Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵Joshua Peek2009-05-2821-21/+21
| | | | | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern.
| * | Merge branch 'master' into active_modelPratik Naik2009-04-2221-86/+373
| |\ \ | | | | | | | | | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb
| * | | Deprecate Model#validate/validate_on_create/validate_on_update. Use ↵Pratik Naik2009-03-215-22/+67
| | | | | | | | | | | | | | | | Model.validate :method and likewise
| * | | Deprecate Errors#on_base/add_to_base/invalid?/each_fullPratik Naik2009-03-211-2/+2
| | | |
| * | | Move validate_on_create and validate_on_update from ActiveModel to ActiveRecordPratik Naik2009-03-212-4/+13
| | | |
| * | | Add ActiveModel::Validations tests for regular ruby classesPratik Naik2009-03-201-0/+9
| | | |
| * | | Add I18n translations to ActiveModel and move more AR specific parts to ↵Pratik Naik2009-03-204-0/+869
| | | | | | | | | | | | | | | | ActiveRecord::Validations
| * | | Include ActiveModel::Validations from ActiveRecord::ValidationsPratik Naik2009-03-202-21/+30
| | | |
| * | | Deprecate Error#on(attribute) in favour of Errors#[attribute]Pratik Naik2009-03-205-25/+25
| | | |
| * | | Move relevant validation tests from Active Record to Active ModelPratik Naik2009-03-206-2384/+506
| | | |
| * | | Make Active Model test suite similar to Active RecordPratik Naik2009-03-201-1/+1
| | | |
| * | | Make Active Resource use ActiveModel::ErrorsPratik Naik2009-03-191-3/+1
| | | |
| * | | Move uniqueness and association validations to Active RecordPratik Naik2009-03-193-0/+211
| | | |
| * | | Move all the Active Record validations to Active ModelPratik Naik2009-03-198-1139/+147
| | | |
* | | | Documenting :inverse_of options for associations.Murray Steele2009-05-311-0/+66
| | | |
* | | | suggests using Hash#(except|slice) to be able to implement access logic ↵Xavier Noria2009-05-261-0/+30
| | | | | | | | | | | | | | | | where attr_(accessible|protected) is not enough
* | | | Merge commit 'mainstream/master'Pratik Naik2009-05-2426-81/+238
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: actionpack/lib/action_controller/base/mime_responds.rb
| * | | Fix eager association test related to different ordering on sqliteChad Woolley2009-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [#2686 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | | Remove 'core' fluff. Hookable ActiveSupport.load_all!Jeremy Kemper2009-05-201-1/+1
| | | |
| * | | Add missing models and fixtures [#2673 state:resolved]Emilio Tagua2009-05-193-25/+32
| | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-181-2/+2
| |\ \ \
| | * | | Remove unnecessary condition and local variable [#2602 state:resolved]Emilio Tagua2009-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-185-3/+36
| |\| | |
| | * | | Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵Luca Guidi2009-05-182-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * | | Make sure default_scope#create checks for options[:conditions] [#2181 ↵Pratik Naik2009-05-183-1/+21
| | | | | | | | | | | | | | | | | | | | state:resolved] [James Le Cuirot]
| * | | | Reimplement Fixtures.identify so that it consistently generates identities ↵Ken Collins2009-05-182-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | | | Missing 1.8.7 backport extensionsJeremy Kemper2009-05-182-0/+3
| | | | |
| * | | | Revert "Get AR CI passing again by requiring the entire core_ext"Jeremy Kemper2009-05-181-3/+0
| |/ / / | | | | | | | | | | | | This reverts commit 8e6a18d8672f7efe6ef79b49185e4a6a23e4e547.
| * | | Add missing model and fixtures to finder_test [#2671 state:resolved]Emilio Tagua2009-05-181-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | Fixed limited eager loading associations with numbers in the name [#2668 ↵Benjamin Floering2009-05-185-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | Fix reset_session with ActiveRecord store [#2200 state:resolved]Joshua Peek2009-05-171-1/+9
| | | |
| * | | replace the aaa_create_tables_test hack with loading test database schema in ↵Mislav Marohnić2009-05-174-31/+22
| | | | | | | | | | | | | | | | | | | | | | | | the test helper [#2663 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | Implement #many? for NamedScope and AssociationCollection using #size [#1500 ↵Chris Kampmeier2009-05-175-1/+94
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | has_one :through should not create a new association when assigned nil [#698 ↵Daniel Guettler2009-05-172-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | Get AR CI passing again by requiring the entire core_extYehuda Katz2009-05-161-0/+3
| | | | | | | | | | | | | | | | | | | | Note that this includes Time and Date; we should really figure out what parts of core_ext are really required for AR and require just those.
* | | | Merge commit 'mainstream/master'Pratik Naik2009-05-1567-270/+837
|\| | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb
| * | | Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-143-12/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb
| | * | | Changed ActiveRecord::Base#exists? to invoke find_initial so that it is ↵Peter Marklund2009-05-142-8/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed]
| * | | Simple examples for require profilingJeremy Kemper2009-05-131-0/+14
| | | |
| * | | Cherry-pick core extensionsJeremy Kemper2009-05-1330-33/+82
| | | |
| * | | isolated_test taskJeremy Kemper2009-05-131-6/+14
| | | |
| * | | Remove support for deprecated validation message interpolation formatJeremy Kemper2009-05-133-53/+8
| | | |
| * | | Use DependencyModule for included hooks in ActiveRecordBryan Helmkamp2009-05-1121-125/+111
| | | |
| * | | Revert "Fixed bug with polymorphic has_one :as pointing to an STI record"Jeremy Kemper2009-05-116-21/+5
| | | | | | | | | | | | | | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5.
| * | | Allow you to pass :all_blank to :reject_if option to automatically create a ↵Mike Breen2009-05-104-2/+30
| | | | | | | | | | | | | | | | Proc that will reject any record with blank attributes.