aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Use ARel in SQL generation through associations"Emilio Tagua2009-06-101-28/+10
| | | | This reverts commit 7be3e3ba0547587313d87bccb788a8466a62628a.
* Use ARel in SQL generation through associationsEmilio Tagua2009-06-101-10/+28
|
* Use ARel in SQL generation through associationsEmilio Tagua2009-06-102-15/+19
|
* Merge commit 'rails/master'Emilio Tagua2009-06-097-63/+89
|\
| * disabled base_test.rb tests that were not Oracle compatible (TIME datatype ↵Raimonds Simanovskis2009-06-092-30/+60
| | | | | | | | | | | | is not supported on Oracle, UPDATE does not support ORDER BY) _before_type_cast on Oracle returns Time and not String added Oracle specific schema definition that was missing for test_default_values test Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * PostgreSQL adapter should call thread safe quote_string functionEugene Pimenov2009-06-091-2/+14
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Fix AR json encodingJeremy Kemper2009-06-083-31/+14
| |
| * Update for Active Model yielding per error not per attributeJeremy Kemper2009-06-081-0/+1
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-0238-2731/+1050
|\| | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb
| * 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
| | | |
* | | | Set ActiveRecord as Arel engine on load.Emilio Tagua2009-06-022-2/+3
| | | |
* | | | No need to specify the engine now that it is in active_record.rbEmilio Tagua2009-06-021-2/+2
| | | |
* | | | Refactors to work with latest Arel implementation.Emilio Tagua2009-06-027-20/+26
| | | |
* | | | Merge commit 'rails/master'Emilio Tagua2009-05-262-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | | |
* | | | Merge commit 'rails/master'Emilio Tagua2009-05-193-2/+9
|\| | |
| * | | Add missing models and fixtures [#2673 state:resolved]Emilio Tagua2009-05-193-25/+32
| | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | | Merge commit 'rails/master'Emilio Tagua2009-05-189-12/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule
| * | | 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.
* | | | Merge branch 'master' of git://github.com/rails/railsEmilio Tagua2009-05-181-2/+2
|\| | |
| * | | 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>
* | | | Merge commit 'rails/master'Emilio Tagua2009-05-1845-144/+281
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb activerecord/lib/active_record/migration.rb activerecord/test/cases/helper.rb
| * | | 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>