aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-08-055-21/+209
|\
| * Revert "fallback_string_to_date sets Date._parse comp arg to true, so that ↵Geoff Buesing2009-08-051-6/+0
| | | | | | | | | | | | strings with two-digit years, e.g. '1/1/09', are interpreted as modern years" [#2019 state:wontfix] This reverts commit 55d1d12c32a1b99f3f07d2346b49a63650ba2e9d.
| * Extract generic attribute method generation to AMoJoshua Peek2009-08-042-48/+1
| |
| * Added reset_attribute! method to ActiveRecord::AttributeMethods::Dirty which ↵Paul Gillard2009-08-041-0/+10
| | | | | | | | | | | | will reset an attribute to its original value should it have changed. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Modified ActiveRecord::AttributeMethods to allow classes to specify ↵Paul Gillard2009-08-041-15/+79
| | | | | | | | | | | | attribute method prefixes and/or suffixes. Previously only suffixes were allowed. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Add simple support for ActiveModel's StateMachine for ActiveRecordJoshua Peek2009-08-041-0/+42
| |
| * fallback_string_to_date sets Date._parse comp arg to true, so that strings ↵Matt Ganderup2009-08-031-0/+6
| | | | | | | | with two-digit years, e.g. '1/1/09', are interpreted as modern years [#2019 state:resolved]
| * quoted_date converts time-like objects to ↵Geoff Buesing2009-08-032-0/+119
| | | | | | | | ActiveRecord::Base.default_timezone before serialization. This allows you to use Time.now in find conditions and have it correctly be serialized as the current time in UTC when default_timezone == :utc [#2946 state:resolved]
* | Added collection iteration to AR::Relation.Emilio Tagua2009-08-031-1/+0
| |
* | Don't use local vars before testing its conditional.Emilio Tagua2009-08-031-2/+0
| |
* | Merge commit 'rails/master'Emilio Tagua2009-07-314-13/+6
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Undefine id and let it automatically be generatedJoshua Peek2009-07-302-9/+0
| |
| * Restore DangerousAttributeErrorJoshua Peek2009-07-301-0/+14
| |
| * Generate methods for all suffixesJoshua Peek2009-07-301-14/+0
| |
| * Revert "Methods invoked within named scope Procs should respect the scope ↵Jeremy Kemper2009-07-291-4/+0
| | | | | | | | | | | | | | | | | | | | stack. [#1267 state:resolved]" This reverts commit 6a13376525f34a00e013fc3a6022838329dfe856. Conflicts: activerecord/test/cases/named_scope_test.rb
| * Patch to ActiveModel's (and ActiveRecord, by association) XML serialization: ↵John Maxwell2009-07-221-0/+6
| | | | | | | | | | | | If two parameters are present in Procs supplied to to_xml's :procs option, the model being serialized will be passed as the second argument [#2373 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Added ActiveRecord::Relation tests. Allow Relation to accept conditionalEmilio Tagua2009-07-311-0/+78
| | | | | | | | hashes and arrays like #find does.
* | Introduced ActiveRecord::Relation, a layer between an ARel relation and an ↵Emilio Tagua2009-07-214-9/+9
| | | | | | | | AR relation
* | Removed legacy test.Emilio Tagua2009-07-201-19/+0
| |
* | Merge commit 'rails/master'Emilio Tagua2009-07-163-6/+104
|\|
| * Add primary_key option to belongs_to associationSzymon Nowak2009-07-153-6/+104
| | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | 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