Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | pass the association and connection to the scope method | Aaron Patterson | 2014-02-14 | 1 | -8/+2 | |
| | | ||||||
| * | pass the tracker down the stack and construct it in the scope method | Aaron Patterson | 2014-02-14 | 1 | -18/+18 | |
| | | ||||||
| * | clean up add_constraints signature | Aaron Patterson | 2014-02-14 | 1 | -8/+9 | |
| | | ||||||
| * | remove the reflection delegate | Aaron Patterson | 2014-02-14 | 1 | -15/+14 | |
| | | ||||||
| * | remove klass delegator | Aaron Patterson | 2014-02-14 | 1 | -10/+11 | |
| | | ||||||
| * | remove chain delegate | Aaron Patterson | 2014-02-14 | 1 | -5/+6 | |
| | | ||||||
| * | remove scope_chain delegate | Aaron Patterson | 2014-02-14 | 1 | -3/+3 | |
| | | ||||||
| * | remove more delegate methods | Aaron Patterson | 2014-02-13 | 1 | -7/+9 | |
| | | ||||||
| * | :scissors: whitespace | Aaron Patterson | 2014-02-13 | 1 | -1/+0 | |
| | | ||||||
| * | rm delegate methods that are not actually used | Aaron Patterson | 2014-02-13 | 1 | -2/+2 | |
| | | ||||||
| * | JoinHelper is never reused, so there is no need to separate | Aaron Patterson | 2014-02-13 | 1 | -5/+25 | |
| | | ||||||
| * | this class depends on JoinHelper, so we should require it | Aaron Patterson | 2014-01-31 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'master' into set_binds | Aaron Patterson | 2014-01-11 | 1 | -18/+12 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (2794 commits) doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Restore DATABASE_URL even if it's nil in connection_handler test [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users Ensure Active Record connection consistency Revert "ask the fixture set for the sql statements" Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 Adding Hash#compact and Hash#compact! methods MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. clear cache on body close so that cache remains during rendering add a more restricted codepath for templates fixes #13390 refactor generator tests to use block form of Tempfile Fix typo [ci skip] Move finish_template as the last public method in the generator Minor typos fix [ci skip] make `change_column_null` reversible. Closes #13576. create/drop test and development databases only if RAILS_ENV is nil Revert "Speedup String#to" typo fix in test name. [ci skip]. `core_ext/string/access.rb` test what we are documenting. Fix typo in image_tag documentation ... Conflicts: activerecord/lib/active_record/associations/join_dependency/join_association.rb activerecord/lib/active_record/relation/query_methods.rb | |||||
| * | Skip `include_values` from through associations chains for building target scope | Paul Nikitochkin | 2013-10-27 | 1 | -2/+6 | |
| | | | | | | | | Fixes: #12242, #9517, #10240 | |||||
| * | remove HABTM special cases from associations classes | Aaron Patterson | 2013-10-02 | 1 | -12/+0 | |
| | | ||||||
| * | use bind values for model types | Aaron Patterson | 2013-07-31 | 1 | -2/+3 | |
| | | ||||||
| * | only calculate the klass once | Aaron Patterson | 2013-07-29 | 1 | -1/+2 | |
| | | ||||||
| * | use the superclass implementation | Aaron Patterson | 2013-07-18 | 1 | -1/+1 | |
| | | ||||||
| * | bind values should not be merged between scopes | Aaron Patterson | 2013-06-11 | 1 | -1/+1 | |
| | | ||||||
* | | push binds through relation objects | Aaron Patterson | 2013-05-20 | 1 | -0/+1 | |
|/ | ||||||
* | use | to have more intent revealing code | Neeraj Singh | 2013-04-04 | 1 | -1/+1 | |
| | | | | thanks to @egilburg for suggestion | |||||
* | has_many through obeys order on through association | Neeraj Singh | 2013-04-04 | 1 | -0/+1 | |
| | | | | fixes #10016 | |||||
* | hide more data in the schema cache | Aaron Patterson | 2013-03-14 | 1 | -1/+1 | |
| | ||||||
* | Prevent Relation#merge from collapsing wheres on the RHS | Jon Leighton | 2013-01-27 | 1 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | This caused a bug with the new associations implementation, because now association conditions are represented as Arel nodes internally right up to when the whole thing gets turned to SQL. In Rails 3.2, association conditions get turned to raw SQL early on, which prevents Relation#merge from interfering. The current implementation was buggy when a default_scope existed on the target model, since we would basically end up doing: default_scope.merge(association_scope) If default_scope contained a where(foo: 'a') and association_scope contained a where(foo: 'b').where(foo: 'c') then the merger would see that the same column is representated on both sides of the merge and collapse the wheres to all but the last: where(foo: 'c') Now, the RHS of the merge is left alone. Fixes #8990 | |||||
* | Undeprecate the :extend option | Jon Leighton | 2013-01-18 | 1 | -0/+1 | |
| | | | | | | | Suggested by @dhh. It doesn't affect the generated SQL, so seems reasonable to continue to allow it as an association option. | |||||
* | Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql." | Jon Leighton | 2012-08-01 | 1 | -1/+1 | |
| | | | | | | | | | This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370. Conflicts: activerecord/CHANGELOG.md It will be deprecated only in 4.0, and removed properly in 4.1. | |||||
* | Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql. | Jon Leighton | 2012-07-20 | 1 | -1/+1 | |
| | ||||||
* | fix association :extend option | Jon Leighton | 2012-07-13 | 1 | -6/+2 | |
| | ||||||
* | Represent association scope options as AR::Relations insternally. | Jon Leighton | 2012-07-13 | 1 | -40/+15 | |
| | ||||||
* | predicate builder should not recurse for determining where columns. | Aaron Patterson | 2012-05-30 | 1 | -2/+17 | |
| | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661 | |||||
* | remove apply_finder_options call from AssociationScope | Jon Leighton | 2012-04-13 | 1 | -7/+8 | |
| | ||||||
* | Revert "only mutate the scope object in the `bind` method" | Aaron Patterson | 2012-02-27 | 1 | -1/+1 | |
| | | | | This reverts commit 1b9e19cd22f2b5d5e7b82e042f92340822c0f966. | |||||
* | only mutate the scope object in the `bind` method | Aaron Patterson | 2012-02-27 | 1 | -1/+1 | |
| | ||||||
* | bind value creation refactoring | Aaron Patterson | 2012-02-27 | 1 | -4/+10 | |
| | ||||||
* | removing dead code | Aaron Patterson | 2012-02-27 | 1 | -3/+2 | |
| | ||||||
* | use bind values for join columns | Aaron Patterson | 2012-02-27 | 1 | -1/+16 | |
| | ||||||
* | fix associations when using per class databases | Lars Kanis | 2012-02-10 | 1 | -1/+1 | |
| | | | | | | would get ConnectionNotEstablished error because it always tried to use ActiveRecord::Base's connection, even though it should be using the connection of the model whose context we're operating in | |||||
* | Deprecate inferred JOINs with includes + SQL snippets. | Jon Leighton | 2012-01-16 | 1 | -1/+1 | |
| | | | | | | See the CHANGELOG for details. Fixes #950. | |||||
* | Avoid sanitize_sql when we can use Relation#where instead | Jon Leighton | 2012-01-16 | 1 | -2/+5 | |
| | ||||||
* | Revert "Deprecate implicit eager loading. Closes #950." | Jon Leighton | 2012-01-16 | 1 | -1/+1 | |
| | | | | This reverts commit c99d507fccca2e9e4d12e49b4387e007c5481ae9. | |||||
* | Remove Array.wrap calls in ActiveRecord | Rafael Mendonça França | 2012-01-06 | 1 | -1/+1 | |
| | ||||||
* | Deprecate implicit eager loading. Closes #950. | Jon Leighton | 2011-12-29 | 1 | -1/+1 | |
| | ||||||
* | Use uniq instead of manually putting a DISTINCT in the query | Jon Leighton | 2011-11-05 | 1 | -14/+2 | |
| | ||||||
* | Merge pull request #3030 from htanata/fix_habtm_select_query_method | Jon Leighton | 2011-09-26 | 1 | -4/+0 | |
| | | | | Fix: habtm doesn't respect select query method | |||||
* | Fix belongs_to polymorphic with custom primary key on target. | Jon Leighton | 2011-09-26 | 1 | -1/+6 | |
| | | | | Closes #3104. | |||||
* | use association_primary_key in AssociationScope#add_constraints | Marian Rudzynski | 2011-05-26 | 1 | -1/+1 | |
| | ||||||
* | Fix problem with loading polymorphic associations which have been defined in ↵ | Jon Leighton | 2011-05-22 | 1 | -5/+15 | |
| | | | | an abstract superclass. Fixes #552. | |||||
* | Fix tests under postgres - we should always put conditions in the WHERE part ↵ | Jon Leighton | 2011-03-12 | 1 | -5/+8 | |
| | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it. | |||||
* | Abstract some common code from AssociationScope and ↵ | Jon Leighton | 2011-03-11 | 1 | -44/+12 | |
| | | | | JoinDependency::JoinAssociation into a JoinHelper module | |||||
* | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 1 | -6/+6 | |
| | | | | Reflection#chain and Reflection#options as they now no longer relate solely to through associations. |