aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
...
* | Use Arel to build subquery. Adapt tests to changed fixtures.John Mileham2011-03-241-13/+12
| |
* | Merge branch 'master' of github.com:rails/rails into count_behaviorJohn Mileham2011-03-2441-503/+692
|\|
| * add #first! and #last! to models & relationsJosh Susser2011-03-241-0/+10
| |
| * Fix before_type_cast for timezone aware attributes by caching converted ↵Adam Meehan2011-03-231-4/+5
| | | | | | | | value on write. Also remove read method reload arg on timezone attributes.
| * Make clearing of HABTM join table contents happen in an after_destory callback.Murray Steele2011-03-231-12/+12
| | | | | | | | The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded. Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed. Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too.
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-232-4/+2
| |\
| | * remove bank linePaco Guzman2011-03-181-1/+0
| | |
| | * Remove incorrect comment that a default value of NULL cannot be set with ↵Manuel Meurer2011-03-161-3/+2
| | | | | | | | | | | | change_column_default.
| * | use class_eval with a string when it's possibleSantiago Pastorino2011-03-222-5/+13
| | |
| * | Allow to read and write AR attributes with non valid identifiersSantiago Pastorino2011-03-222-2/+7
| | |
| * | Do not in place modify what table_name returnsSantiago Pastorino2011-03-221-1/+1
| | |
| * | Merge branch 'master' into fuuuAaron Patterson2011-03-228-17/+57
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | pushing id insertion and prefetch primary keys down to Relation#insertAaron Patterson2011-03-224-12/+23
| | | |
| | * | use prepared statements to fetch the last insert idAaron Patterson2011-03-211-3/+4
| | | |
| | * | escaping binary data encoding when inserting to sqlite3. Thanks Naruse! ↵Aaron Patterson2011-03-211-0/+8
| | | | | | | | | | | | | | | | [#6559 state:resolved]
| | * | schemas set by set_table_name are respected by the mysql adapter. [#5322 ↵Aaron Patterson2011-03-211-2/+16
| | | | | | | | | | | | | | | | state:resolved]
| | * | Reapply extensions when using except and onlyIain Hecker2011-03-211-0/+6
| | |/
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-165-10/+20
| |\|
| | * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-143-8/+15
| | |\
| | | * Adjust unique constraint comment to include info about the RecordNotUnique ↵Anders Elfving2011-03-131-4/+11
| | | | | | | | | | | | | | | | exception
| | | * remove some blanksPaco Guzman2011-03-112-4/+4
| | | |
| | * | Fixed a bug when empty? was called on a grouped Relation that wasn't loadedChris Oliver2011-03-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | [#5829 state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| | * | Add additional text to NotImplementedErrors [#6328 state:resolved]Mike Gehard2011-03-121-1/+1
| | |/ | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * Referencing a table via the ON condition in a join should force that table ↵Jon Leighton2011-03-071-1/+12
| | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries.
| * | Fix tests under postgres - we should always put conditions in the WHERE part ↵Jon Leighton2011-03-123-18/+22
| | | | | | | | | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it.
| * | Resolve some TODO comments which I decided did not need anything doneJon Leighton2011-03-123-9/+5
| | |
| * | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-111-22/+2
| | |
| * | Abstract some common code from AssociationScope and ↵Jon Leighton2011-03-114-97/+83
| | | | | | | | | | | | JoinDependency::JoinAssociation into a JoinHelper module
| * | Refactor JoinAssociationJon Leighton2011-03-101-100/+54
| | |
| * | Rename Reflection#through_reflection_chain and #through_options to ↵Jon Leighton2011-03-104-45/+48
| | | | | | | | | | | | Reflection#chain and Reflection#options as they now no longer relate solely to through associations.
| * | Move the code which builds a scope for through associations into a generic ↵Jon Leighton2011-03-109-215/+162
| | | | | | | | | | | | AssociationScope class which is capable of building a scope for any association.
| * | Fix ↵Jon Leighton2011-03-072-2/+2
| | | | | | | | | | | | test_has_many_association_through_a_has_many_association_with_nonstandard_primary_keys
| * | Referencing a table via the ON condition in a join should force that table ↵Jon Leighton2011-03-071-1/+12
| | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries.
| * | Refactor ThroughAssociation#join_to to be much smaller, and independent of ↵Jon Leighton2011-03-062-84/+34
| | | | | | | | | | | | construct_owner_conditions.
| * | Refactor ThroughAssociation#tables to just be a flat array of tables in the ↵Jon Leighton2011-03-061-75/+70
| | | | | | | | | | | | order that they should be joined together.
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-056-9/+19
| |\| | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG
| | * use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-052-4/+4
| | |
| | * Active Record typos.R.T. Lechow2011-03-053-4/+4
| | |
| | * fixes a missmatched column in examplemjy2011-03-051-1/+1
| | |
| | * implements ActiveRecord::Base.connection_config to be able to check the ↵Xavier Noria2011-03-051-0/+10
| | | | | | | | | | | | configuration of the current connection at runtime
| | * When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-041-2/+4
| | | | | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.)
| | * Fix a couple of tests in join_model_test.rb which were failing when the ↵Jon Leighton2011-03-041-2/+2
| | | | | | | | | | | | identity map is turned off
| * | Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
| | |
| * | Push source_type and polymorphic conditions out of ThroughAssociation and ↵Jon Leighton2011-03-053-45/+11
| | | | | | | | | | | | JoinDependency::JoinAssociation and into the reflection instead.
| * | Add a test for STI on the through where the through is nested, and change ↵Jon Leighton2011-03-052-13/+25
| | | | | | | | | | | | the code which support this
| * | Stop identity-mapping the through records in the preloader since I fixed the ↵Jon Leighton2011-03-041-5/+0
| | | | | | | | | | | | underlying problem in the habtm preloader.
| * | Fix a couple of tests in join_model_test.rb which were failing when the ↵Jon Leighton2011-03-041-2/+2
| | | | | | | | | | | | identity map is turned off
| * | When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-041-2/+4
| | | | | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.)
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-041-0/+5
| |\|
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0497-4167/+5631
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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