aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-07-143-9/+29
|\
| * Optimize <association>_ids for hm:t with belongs_to sourcePratik Naik2009-07-131-2/+6
| |
| * Make it so AR attributes which conflict with object-private methods (e.g. ↵Sam Goldstein2009-07-091-0/+16
| | | | | | | | | | | | | | | | | | system) don't 'randomly' cause NoMethodErrors Previously if you called this attribute before others, you'd get exceptions. But if it was the second-or-subsequent attribute you retrieved you'd get the correct behaviour. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2808 state:committed]
| * Add support for dumping non-standard primary keys when using the SQLite3 ↵Hongli Lai (Phusion)2009-07-071-7/+7
| | | | | | | | | | | | adapter. Fix unit tests so that this feature is tested for all adapters. [#2868 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
* | Merge commit 'rails/master'Emilio Tagua2009-07-012-2/+4
|\|
| * Added AR:B#dup method for duplicationg object without frozen attributes ↵Yehuda Katz + Carl Lerche2009-07-011-0/+4
| | | | | | | | | | [#2859 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
| * Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 ↵Yehuda Katz + Carl Lerche2009-07-011-2/+0
| | | | | | | | state:resolved]
* | Merge commit 'rails/master'Emilio Tagua2009-06-307-11/+23
|\|
| * Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵Pratik Naik2009-07-017-11/+23
| | | | | | | | | | | | | | | | | | a newline character immediately following 'SELECT' [#2118 state:resolved]"" This reverts commit 80f1f863cd0f9cba89079511282de5710a2e1832. The feature doesn't work on Postgres, so don't test it on Postgres. Also, Postgres compatibility is irrelevant to the ticket/patch in question.
* | Merge commit 'rails/master'Emilio Tagua2009-06-301-1/+7
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb
| * Changed ActiveRecord::Base.human_name to underscore the class name before it ↵Justin French2009-06-301-1/+7
| | | | | | | | | | | | | | | | | | humanizes it This gives you 'Post comment' rather than 'Postcomment' by default. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2120 state:committed]
* | Merge commit 'rails/master'Emilio Tagua2009-06-301-0/+15
|\| | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb
| * Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.Michael Schuerig2009-06-261-0/+8
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Translate adapter errors that indicate a violated uniqueness constraint to ↵Michael Schuerig2009-06-261-0/+7
| | | | | | | | | | | | ActiveRecord::RecordNotUnique exception derived from ActiveReecord::StatementInvalid. Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | Merge commit 'rails/master'Emilio Tagua2009-06-232-0/+39
|\|
| * Revert "Generate proper :counter_sql from :finder_sql when there is a ↵Yehuda Katz + Carl Lerche2009-06-227-21/+11
| | | | | | | | | | | | | | | | newline character immediately following 'SELECT' [#2118 state:resolved]" This reverts commit 4851ca9e13a4317342df02ae25b1929340523f7a. The tests do not pass for postgresql.
| * Generate proper :counter_sql from :finder_sql when there is a newline ↵Patrick Joyce2009-06-217-11/+21
| | | | | | | | | | | | character immediately following 'SELECT' [#2118 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fixed a bug where create_table could not be called without a block [#2221 ↵Joseph Wilk2009-06-211-0/+7
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure table names are quoted while renaming for sqlite3 adapter [#2272 ↵Brian Hogan2009-06-211-0/+26
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure hm:t#create respects source associations hash conditions [#2090 ↵mattbauer2009-06-211-0/+6
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Removed unused methods.Emilio Tagua2009-06-231-21/+0
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-092-34/+45
|\|
| * disabled base_test.rb tests that were not Oracle compatible (TIME datatype ↵Raimonds Simanovskis2009-06-091-30/+41
| | | | | | | | | | | | 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>
| * Fix AR json encodingJeremy Kemper2009-06-081-4/+4
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-0211-1742/+691
|\| | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb
| * Schema dumper now records scale 0 decimal columns as decimal not integer.Giles Alexander2009-06-011-0/+5
| | | | | | | | | | | | | | | | | | | | 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]
| * Merge branch 'master' into active_modelJoshua Peek2009-05-2922-146/+666
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-282-2/+2
| | | | | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern.
| * | Merge branch 'master' into active_modelPratik Naik2009-04-227-7/+179
| |\ \ | | | | | | | | | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb
| * | | Deprecate Model#validate/validate_on_create/validate_on_update. Use ↵Pratik Naik2009-03-211-0/+34
| | | | | | | | | | | | | | | | Model.validate :method and likewise
| * | | Deprecate Errors#on_base/add_to_base/invalid?/each_fullPratik Naik2009-03-211-2/+2
| | | |
| * | | 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-203-0/+754
| | | | | | | | | | | | | | | | ActiveRecord::Validations
| * | | 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
| | | |
| * | | Move all the Active Record validations to Active ModelPratik Naik2009-03-193-131/+129
| | | |
* | | | Merge commit 'rails/master'Emilio Tagua2009-05-261-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | 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>
* | | | 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-183-2/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule
| * | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-182-2/+18
| |\ \ \
| | * | | Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵Luca Guidi2009-05-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * | | Make sure default_scope#create checks for options[:conditions] [#2181 ↵Pratik Naik2009-05-181-0/+10
| | | | | | | | | | | | | | | | | | | | state:resolved] [James Le Cuirot]
| * | | | Reimplement Fixtures.identify so that it consistently generates identities ↵Ken Collins2009-05-181-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | | | 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-1813-55/+127
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>