aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Do not in place modify what table_name returnsSantiago Pastorino2011-03-221-1/+1
|
* adding missing requireAaron Patterson2011-03-221-0/+1
|
* Merge branch 'master' into fuuuAaron Patterson2011-03-2211-17/+120
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-212-0/+27
| | | | | | | | [#6559 state:resolved]
| * schemas set by set_table_name are respected by the mysql adapter. [#5322 ↵Aaron Patterson2011-03-212-2/+52
| | | | | | | | state:resolved]
| * Reapply extensions when using except and onlyIain Hecker2011-03-212-0/+14
| |
* | 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-166-10/+46
|\|
| * 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
| | |
| * | 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-122-1/+34
| | | | | | | | | | | | | | | | | | [#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>
* | | 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-124-19/+23
| | | | | | | | | | | | 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-112-23/+3
| | |
* | | 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
| | |
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-102-2/+2
|\| |
| * | 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
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-071-1/+1
| |\
| | * "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-071-1/+1
| | | | | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
| * | Referencing a table via the ON condition in a join should force that table ↵Jon Leighton2011-03-072-1/+27
| |/ | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries.
* | Rename Reflection#through_reflection_chain and #through_options to ↵Jon Leighton2011-03-105-50/+53
| | | | | | | | 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-072-1/+27
| | | | | | | | 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-0511-15/+33
|\| | | | | | | | | 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-056-10/+10
| |
| * fixes a missmatched column in examplemjy2011-03-051-1/+1
| |
| * implements ActiveRecord::Base.connection_config to be able to check the ↵Xavier Noria2011-03-053-0/+18
| | | | | | | | configuration of the current connection at runtime
| * When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-042-2/+20
| | | | | | | | 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-054-47/+13
| | | | | | | | 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-056-13/+46
| | | | | | | | 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-042-2/+20
| | | | | | | | 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-042-4/+5
|\|
| * Move ActiveModel::AttributeMethods#attribute_methods_generated? to ↵Alexander Uvarov2011-03-011-0/+11
| | | | | | | | | | | | | | | | ActiveRecord, so it's flexible now [#6428 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04207-5362/+9286
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Move JoinDependency and friends from ↵Jon Leighton2011-02-2811-626/+618
| | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-16 00:10:20 +0000