aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/rails into count_behaviorJohn Mileham2011-03-2454-108/+1188
|\
| * add #first! and #last! to models & relationsJosh Susser2011-03-241-0/+24
| |
| * Fix before_type_cast for timezone aware attributes by caching converted ↵Adam Meehan2011-03-231-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 Steele2011-03-231-0/+34
| | | | | | | | model is destroyed but the destruction is blocked by a before_destroy.
| * Allow to read and write AR attributes with non valid identifiersSantiago Pastorino2011-03-222-0/+15
| |
| * adding missing requireAaron Patterson2011-03-221-0/+1
| |
| * Merge branch 'master' into fuuuAaron Patterson2011-03-223-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 Patterson2011-03-211-0/+19
| | | | | | | | | | | | [#6559 state:resolved]
| | * schemas set by set_table_name are respected by the mysql adapter. [#5322 ↵Aaron Patterson2011-03-211-0/+36
| | | | | | | | | | | | state:resolved]
| | * Reapply extensions when using except and onlyIain Hecker2011-03-211-0/+8
| | |
| * | Add order clauses to fix some tests which were failing under 1.8 on oracle ↵Jon Leighton2011-03-182-14/+14
| | | | | | | | | | | | and postgres
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-161-0/+26
| |\|
| | * Remove invalid testAndrew White2011-03-131-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 loadedChris Oliver2011-03-121-0/+30
| | | | | | | | | | | | | | | | | | [#5829 state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * | oracle, y u defy meJon Leighton2011-03-165-13/+15
| | |
| * | Fix tests under postgres - we should always put conditions in the WHERE part ↵Jon Leighton2011-03-121-1/+1
| | | | | | | | | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it.
| * | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-111-1/+1
| | |
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-101-1/+1
| |\|
| | * revises links to the API websites of individual components (no longer ↵Xavier Noria2011-03-091-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 Leighton2011-03-071-0/+15
| | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries.
| * | Rename Reflection#through_reflection_chain and #through_options to ↵Jon Leighton2011-03-101-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 Leighton2011-03-071-0/+15
| | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries.
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-054-6/+11
| |\| | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG
| | * Active Record typos.R.T. Lechow2011-03-053-6/+6
| | |
| | * implements ActiveRecord::Base.connection_config to be able to check the ↵Xavier Noria2011-03-051-0/+5
| | | | | | | | | | | | configuration of the current connection at runtime
| | * When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-041-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 Leighton2011-03-051-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 Leighton2011-03-054-0/+21
| | | | | | | | | | | | the code which support this
| * | When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-041-0/+16
| | | | | | | | | | | | 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-04100-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
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2010-12-1227-95/+363
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG 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_through_association.rb
| * \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-2721-79/+508
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb
| * \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-1732-182/+299
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/test/cases/associations/has_many_through_associations_test.rb
| * \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-0813-61/+79
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * | | | | | Update new tests in cascaded_eager_loading_test.rb to work with the modified ↵Jon Leighton2010-10-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixtures in this branch
| * | | | | | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵Jon Leighton2010-10-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixtures declaration in cascaded_eager_loading_test.rb
| * | | | | | Fix naughty trailing whitespaceJon Leighton2010-10-3114-126/+126
| | | | | | |
| * | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-315-0/+45
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb
| * \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-2821-83/+422
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb
| * | | | | | | | Rename nested_has_many_through_associations_test.rb because it does not only ↵Jon Leighton2010-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concern has_many associations
| * | | | | | | | Add explicit ordering in relations_test.rb, as the lack of this was causing ↵Jon Leighton2010-10-191-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failures against postgres
| * | | | | | | | Add explicit ordering to nested_has_many_through_associations_test.rb as ↵Jon Leighton2010-10-191-32/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was causing failures under postgres
| * | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-193-14/+38
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove various comments and code which were just being used during the ↵Jon Leighton2010-10-191-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development of nested through association support (OMFGZ, I might just have nearly finished this\!
| * | | | | | | | | Add explicit tests for the nested through association changes in reflection.rbJon Leighton2010-10-194-0/+67
| | | | | | | | | |
| * | | | | | | | | Fix broken testJon Leighton2010-10-191-1/+5
| | | | | | | | | |
| * | | | | | | | | Support the :primary_key option on a through reflection in a nested through ↵Jon Leighton2010-10-195-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association
| * | | | | | | | | Support for :primary_key option on the source reflection of a through ↵Jon Leighton2010-10-197-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association, where the source is a has_one or has_many
| * | | | | | | | | Respect the :primary_key option on the through_reflection of (non-nested) ↵Jon Leighton2010-10-196-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through associations
| * | | | | | | | | Properly support conditions on any of the reflections involved in a nested ↵Jon Leighton2010-10-1913-22/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through association
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 11:15:26 +0000