Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into adequaterecord | Aaron Patterson | 2014-04-07 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (122 commits) Rails.application should be set inside before_configuration hook remove check for present? from delete_all Remove useless begin..end Build the reverse_order on its proper method. Use connection-specific bytea escaping Ignore order when doing count. make enums distinct per class Remove unused `subclass_controller_with_flash_type_bar` var from flash test. fix CollectionProxy delete_all documentation Added OS X specific commands to installation guide [ci skip] Recommended using homebrew for installing MySQL and PostgreSQL Fix setup of adding _flash_types test. Use SVG version of travis build status badge [skip ci] W3C CSP document moved to gihub.io URL [ci skip] sprockets-rails was released Fix the test defining the models in the right place Add CHANGELOG entry for #11650 [ci skip] Declare the assets dependency Use sass-rails 4.0.3 Make possible to use sprockets-rails 2.1 add missing parentheses to validates_with documentation [skip ci] ... | ||||
| * | Pass a base relation to build_default_scope when joining | Matt Jones | 2014-02-21 | 1 | -1/+1 |
| | | | | | | | | | | This allows the default scope to be built using the current table alias. Resolves #12770 | ||||
* | | Merge branch 'master' into adequaterecord | Aaron Patterson | 2014-02-17 | 1 | -2/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (311 commits) Add a missing changelog entry for #13981 and #14035 Revert "Fixed plugin_generator test" implements new option :month_format_string for date select helpers [Closes #13618] add factory methods for empty alias trackers guarantee a list in the alias tracker so we can remove a conditional stop exposing table_joins make most parameters to the AliasTracker required make a singleton for AssociationScope pass the association and connection to the scope method pass the tracker down the stack and construct it in the scope method clean up add_constraints signature remove the reflection delegate remove klass delegator remove railties changes. fixes #14054 remove chain delegate remove scope_chain delegate Add verb to sanitization note fix path shown in mailer's templates updated Travis build status image url fix guide active_support_core_extensions. add Note to String#indent [ci skip] ... Conflicts: activerecord/lib/active_record/associations/join_dependency.rb activerecord/test/cases/associations/association_scope_test.rb | ||||
| * | Dont use Enumarator on join_association | Arthur Neves | 2014-02-13 | 1 | -2/+4 |
| | | |||||
* | | expliticly make STI column a bind value | Aaron Patterson | 2014-01-14 | 1 | -4/+9 |
| | | |||||
* | | Merge branch 'master' into set_binds | Aaron Patterson | 2014-01-14 | 1 | -6/+4 |
|\| | | | | | | | | | | | * master: directly create the ARel AST Updated comment to mention the enum mapping class method [ci skip] | ||||
| * | directly create the ARel AST | Aaron Patterson | 2014-01-14 | 1 | -6/+4 |
| | | | | | | | | rather than allocating a new Relation, just make the AST directly | ||||
* | | adding bind values to the manager object | Aaron Patterson | 2014-01-13 | 1 | -5/+2 |
| | | |||||
* | | bubble bind parameters up when building join dependencies | Aaron Patterson | 2014-01-13 | 1 | -3/+10 |
|/ | |||||
* | Change syntax format for example returned values | Prem Sichanugrist | 2013-11-11 | 1 | -5/+5 |
| | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip] | ||||
* | build the association graph functionally | Aaron Patterson | 2013-10-21 | 2 | -4/+4 |
| | | | | This lets us avoid the constant calls to Array#<< | ||||
* | join_type isn't used on the node anymore | Aaron Patterson | 2013-10-21 | 1 | -5/+1 |
| | |||||
* | disconnect join_constraints from the instance | Aaron Patterson | 2013-10-20 | 1 | -2/+2 |
| | |||||
* | pass in scope chain so reflection is not needed | Aaron Patterson | 2013-10-20 | 1 | -2/+2 |
| | |||||
* | pass the foreign table and class to the join_constraints method | Aaron Patterson | 2013-10-20 | 1 | -4/+1 |
| | |||||
* | pass the join type to the join_constraints method | Aaron Patterson | 2013-10-20 | 1 | -1/+1 |
| | |||||
* | stop reversing tables until we absolutely must | Aaron Patterson | 2013-10-15 | 1 | -2/+2 |
| | |||||
* | pass the chain the join_constraints | Aaron Patterson | 2013-10-15 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-15 | 2 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | * master: use the cached arel table Fix typo in the changelog entry Don't remove the select values to add they back again Pluck on NullRelation accepts a list of columns Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | ||||
| * | use the cached arel table | Aaron Patterson | 2013-10-15 | 2 | -2/+2 |
| | | |||||
* | | move column_names_with_alias on to the alias cache object | Aaron Patterson | 2013-10-14 | 3 | -29/+4 |
| | | |||||
* | | keep a cache on the alias object | Aaron Patterson | 2013-10-14 | 1 | -5/+0 |
| | | |||||
* | | move alias building to the table node | Aaron Patterson | 2013-10-14 | 1 | -4/+0 |
| | | |||||
* | | remove delegation to `chain` | Aaron Patterson | 2013-10-14 | 1 | -3/+1 |
| | | |||||
* | | rm JoinHelper from JoinAssociation | Aaron Patterson | 2013-10-14 | 1 | -3/+1 |
| | | |||||
* | | unhook `join_constraints` from the @tables ivar | Aaron Patterson | 2013-10-13 | 1 | -2/+2 |
| | | |||||
* | | remove delegate methods that are not used | Aaron Patterson | 2013-10-13 | 1 | -1/+1 |
| | | |||||
* | | push the node->AR cache up one level | Aaron Patterson | 2013-10-13 | 1 | -6/+1 |
| | | |||||
* | | pull parent and alias tacker from the nodes. | Aaron Patterson | 2013-10-11 | 3 | -19/+5 |
| | | | | | | | | For now, we'll set the tables on the nodes manually. | ||||
* | | decouple the `join_constraints` method from the parent pointer | Aaron Patterson | 2013-10-11 | 1 | -1/+1 |
|/ | |||||
* | no reason to do this column addition and subtraction business | Aaron Patterson | 2013-10-11 | 1 | -1/+1 |
| | |||||
* | refactor a little so we can remove some methods | Aaron Patterson | 2013-10-10 | 1 | -3/+0 |
| | |||||
* | delete unused code | Aaron Patterson | 2013-10-10 | 1 | -10/+0 |
| | | | | | Now that we merge trees from the top down, we don't need to search through the whole tree for particular nodes, just walk it and merge. | ||||
* | simplify each method. | Aaron Patterson | 2013-10-10 | 1 | -8/+2 |
| | | | | Stop writing terrible code Aaron. This is Ruby, not Scheme | ||||
* | stop creating a bunch of relation objects when we can slap all the joins on ↵ | Aaron Patterson | 2013-10-09 | 1 | -5/+0 |
| | | | | at once | ||||
* | add some convenient methods for avoiding array allocations | Aaron Patterson | 2013-10-09 | 1 | -0/+3 |
| | |||||
* | speed up match? | Aaron Patterson | 2013-10-09 | 1 | -0/+1 |
| | |||||
* | make node search more efficient | Aaron Patterson | 2013-10-09 | 3 | -0/+23 |
| | | | | | | Rather than search every node in the tree, comparing that node and all of its parents every time, start at the root from both sides and work our way down the tree | ||||
* | remove == so we can see where walking up parents occurs | Aaron Patterson | 2013-10-09 | 3 | -15/+0 |
| | |||||
* | push parent up to the superclass | Aaron Patterson | 2013-10-09 | 3 | -7/+11 |
| | | | | We always want a linked list back to the root node. | ||||
* | convert JoinBase to a tree and remove the Node class | Aaron Patterson | 2013-10-09 | 1 | -1/+19 |
| | |||||
* | don't access the reflections hash | Aaron Patterson | 2013-10-08 | 1 | -1/+1 |
| | | | | The reflections hash is supposed to be private, so let's use the API. | ||||
* | hide join_parts internals from other classes | Aaron Patterson | 2013-10-08 | 1 | -11/+0 |
| | |||||
* | decouple JoinAssociation from JoinDependency | Aaron Patterson | 2013-10-08 | 1 | -9/+4 |
| | |||||
* | Set the join type on construction | Aaron Patterson | 2013-10-03 | 1 | -2/+2 |
| | | | | | We always set the join type immediately after construction, just make it part of the constructor and we can skip that step | ||||
* | simplify the JoinAssociation constructor, check validity *before* | Aaron Patterson | 2013-10-03 | 1 | -6/+0 |
| | |||||
* | parent is always passed in, so make it non-optional | Aaron Patterson | 2013-10-03 | 1 | -1/+1 |
| | |||||
* | require the files we need so the classes are stand-alone | Aaron Patterson | 2013-10-03 | 2 | -0/+4 |
| | |||||
* | remove HABTM special cases from associations classes | Aaron Patterson | 2013-10-02 | 1 | -11/+0 |
| | |||||
* | Whitespaces | Rafael Mendonça França | 2013-09-11 | 1 | -1/+2 |
| |