| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
|
| |
| |
| |
| | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |
| |
| |
| | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |
| |
| |
| |
| |
| | |
This reverts commit 45c233ef819dc7b67e259dd73f24721fec28b8c8.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |
|
| | |
|
|\| |
|
| | |
|
| |
| |
| |
| | |
value on write. Also remove read method reload arg on timezone attributes.
|
| |
| |
| |
| | |
model is destroyed but the destruction is blocked by a before_destroy.
|
| | |
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | |
| | |
| | |
| | | |
[#6559 state:resolved]
|
| | |
| | |
| | |
| | | |
state:resolved]
|
| | | |
|
| | |
| | |
| | |
| | | |
and postgres
|
| |\| |
|
| | |
| | |
| | |
| | |
| | | |
The test fails on PostgreSQL when trying to load the records as
the comments_count field is not included in the GROUP BY clause.
|
| | |
| | |
| | |
| | |
| | |
| | | |
[#5829 state:resolved]
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
|
| | | |
|
| | |
| | |
| | |
| | | |
not in ON constraints because postgres requires that the table has been joined before the condition references it.
|
| | | |
|
| |\| |
|
| | |
| | |
| | |
| | | |
maintained), and rewrites the section about after and around filters in the controller guide
|
| | |
| | |
| | |
| | | |
to be eager-loaded via a JOIN rather than via subsequent queries.
|
| | |
| | |
| | |
| | | |
Reflection#chain and Reflection#options as they now no longer relate solely to through associations.
|
| | |
| | |
| | |
| | | |
to be eager-loaded via a JOIN rather than via subsequent queries.
|
| |\|
| | |
| | |
| | |
| | | |
Conflicts:
activerecord/CHANGELOG
|
| | | |
|
| | |
| | |
| | |
| | | |
configuration of the current connection at runtime
|
| | |
| | |
| | |
| | | |
instantiate one AR object per actual record in the database. (Even when IM is off.)
|
| | |
| | |
| | |
| | | |
JoinDependency::JoinAssociation and into the reflection instead.
|
| | |
| | |
| | |
| | | |
the code which support this
|
| | |
| | |
| | |
| | | |
instantiate one AR object per actual record in the database. (Even when IM is off.)
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/associations.rb
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
activerecord/lib/active_record/associations/has_many_through_association.rb
activerecord/test/cases/associations/has_many_through_associations_test.rb
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
activerecord/lib/active_record/associations.rb
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
fixtures in this branch
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
fixtures declaration in cascaded_eager_loading_test.rb
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
activerecord/lib/active_record/associations/has_many_association.rb
activerecord/lib/active_record/associations/through_association_scope.rb
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/associations.rb
activerecord/test/schema/schema.rb
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
concern has_many associations
|