Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add #first! and #last! to models & relations | Josh Susser | 2011-03-24 | 1 | -0/+24 |
| | |||||
* | Fix before_type_cast for timezone aware attributes by caching converted ↵ | Adam Meehan | 2011-03-23 | 1 | -15/+11 |
| | | | | value on write. Also remove read method reload arg on timezone attributes. | ||||
* | Failing test case to show that habtm join table contents are removed when a ↵ | Murray Steele | 2011-03-23 | 1 | -0/+34 |
| | | | | model is destroyed but the destruction is blocked by a before_destroy. | ||||
* | Allow to read and write AR attributes with non valid identifiers | Santiago Pastorino | 2011-03-22 | 2 | -0/+15 |
| | |||||
* | adding missing require | Aaron Patterson | 2011-03-22 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into fuuu | Aaron Patterson | 2011-03-22 | 3 | -0/+63 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Do not show optional (.:format) block for wildcard route [#6605 state:resolved] pushing id insertion and prefetch primary keys down to Relation#insert use prepared statements to fetch the last insert id escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved] schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved] Reapply extensions when using except and only SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test Improved resolver docs a bit [action_view] docs for FileSystemResolver [action_view] added custom patterns to template resolver | ||||
| * | escaping binary data encoding when inserting to sqlite3. Thanks Naruse! ↵ | Aaron Patterson | 2011-03-21 | 1 | -0/+19 |
| | | | | | | | | [#6559 state:resolved] | ||||
| * | schemas set by set_table_name are respected by the mysql adapter. [#5322 ↵ | Aaron Patterson | 2011-03-21 | 1 | -0/+36 |
| | | | | | | | | state:resolved] | ||||
| * | Reapply extensions when using except and only | Iain Hecker | 2011-03-21 | 1 | -0/+8 |
| | | |||||
* | | Add order clauses to fix some tests which were failing under 1.8 on oracle ↵ | Jon Leighton | 2011-03-18 | 2 | -14/+14 |
| | | | | | | | | and postgres | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-16 | 1 | -0/+26 |
|\| | |||||
| * | Remove invalid test | Andrew White | 2011-03-13 | 1 | -5/+1 |
| | | | | | | | | | | The test fails on PostgreSQL when trying to load the records as the comments_count field is not included in the GROUP BY clause. | ||||
| * | Fixed a bug when empty? was called on a grouped Relation that wasn't loaded | Chris Oliver | 2011-03-12 | 1 | -0/+30 |
| | | | | | | | | | | | | [#5829 state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
* | | oracle, y u defy me | Jon Leighton | 2011-03-16 | 5 | -13/+15 |
| | | |||||
* | | Fix tests under postgres - we should always put conditions in the WHERE part ↵ | Jon Leighton | 2011-03-12 | 1 | -1/+1 |
| | | | | | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it. | ||||
* | | Simplify implementation of ThroughReflection#chain | Jon Leighton | 2011-03-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-10 | 1 | -1/+1 |
|\| | |||||
| * | revises links to the API websites of individual components (no longer ↵ | Xavier Noria | 2011-03-09 | 1 | -1/+1 |
| | | | | | | | | maintained), and rewrites the section about after and around filters in the controller guide | ||||
| * | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 1 | -0/+15 |
| | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | ||||
* | | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 1 | -5/+5 |
| | | | | | | | | Reflection#chain and Reflection#options as they now no longer relate solely to through associations. | ||||
* | | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 1 | -0/+15 |
| | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-05 | 4 | -6/+11 |
|\| | | | | | | | | | Conflicts: activerecord/CHANGELOG | ||||
| * | Active Record typos. | R.T. Lechow | 2011-03-05 | 3 | -6/+6 |
| | | |||||
| * | implements ActiveRecord::Base.connection_config to be able to check the ↵ | Xavier Noria | 2011-03-05 | 1 | -0/+5 |
| | | | | | | | | configuration of the current connection at runtime | ||||
| * | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 1 | -0/+16 |
| | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.) | ||||
* | | Push source_type and polymorphic conditions out of ThroughAssociation and ↵ | Jon Leighton | 2011-03-05 | 1 | -2/+2 |
| | | | | | | | | JoinDependency::JoinAssociation and into the reflection instead. | ||||
* | | Add a test for STI on the through where the through is nested, and change ↵ | Jon Leighton | 2011-03-05 | 4 | -0/+21 |
| | | | | | | | | the code which support this | ||||
* | | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 1 | -0/+16 |
| | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.) | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 100 | -1068/+3354 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb | ||||
| * | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 4 | -18/+18 |
| | | |||||
| * | skip this on oracle | Aaron Patterson | 2011-02-28 | 1 | -0/+2 |
| | | |||||
| * | use an attribute rather than a SQL literal | Aaron Patterson | 2011-02-26 | 1 | -0/+1 |
| | | |||||
| * | removing limits and offsets from COUNT queries unless both are specified. ↵ | Aaron Patterson | 2011-02-25 | 1 | -0/+28 |
| | | | | | | | | [#6268 state:resolved] | ||||
| * | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses | Eric Allam | 2011-02-24 | 1 | -0/+4 |
| | | |||||
| * | observers leak across tests, so rather than modify the object, we should ↵ | Aaron Patterson | 2011-02-23 | 1 | -6/+12 |
| | | | | | | | | just count the number of times the observer was called | ||||
| * | Fix observer callbacks firing multiple times on descendant instances | Kamal Fariz Mahyuddin | 2011-02-22 | 1 | -0/+14 |
| | | |||||
| * | expectations change when using IM. Change oracle tests to reflect that | Aaron Patterson | 2011-02-22 | 1 | -2/+6 |
| | | |||||
| * | adding a test case for custom locking | Aaron Patterson | 2011-02-21 | 1 | -0/+17 |
| | | |||||
| * | Use proper objects to do the work to build the associations (adding methods, ↵ | Jon Leighton | 2011-02-21 | 2 | -12/+16 |
| | | | | | | | | callbacks etc) rather than calling a whole bunch of methods with rather long names. | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-21 | 1 | -1/+1 |
| |\ | |||||
| | * | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | | | |||||
| * | | oops, no need for puts! | Aaron Patterson | 2011-02-18 | 1 | -1/+0 |
| | | | |||||
| * | | AR::AttributeMethods does not need to be included in an AR::Base class. | Aaron Patterson | 2011-02-18 | 1 | -0/+62 |
| | | | |||||
| * | | fixes a merge conflict | Xavier Noria | 2011-02-19 | 1 | -10/+0 |
| |/ | |||||
| * | merges docrails | Xavier Noria | 2011-02-18 | 1 | -0/+10 |
| |\ | |||||
| | * | Fix Typos: remove several occurences of the the | Nicholas Rowe | 2011-02-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -8/+0 |
| |\ \ | |||||
| | * | | Remove test which was broken on 1.8. This test is now irrelevant since ↵ | Jon Leighton | 2011-02-18 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | singular associations no longer return a proxy object. | ||||
| * | | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8 | Emilio Tagua | 2011-02-18 | 2 | -8/+4 |
| | | | | |||||
| * | | | Should use "=" instead "replace" after this commit: ↵ | Emilio Tagua | 2011-02-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | 1644663ba7f678d178deab2bf1629dc05626f85b |