aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Minor refactorings on `Relation#build_joins`Sean Griffin2015-01-271-26/+13
| | | | Attempting to grok this code by refactoring it as I go through it.
* `WhereClause#predicates` does not need to be publicSean Griffin2015-01-2711-126/+48
| | | | | | | | | | | The only place it was accessed was in tests. Many of them have another way that they can test their behavior, that doesn't involve reaching into internals as far as they did. `AssociationScopeTest` is testing a situation where the where clause would have one bind param per predicate, so it can just ignore the predicates entirely. The where chain test was primarly duplicating the logic tested on `WhereClause` directly, so I instead just make sure it calls the appropriate method which is fully tested in isolation.
* Use the `WhereClause` ast building logic for havingSean Griffin2015-01-271-4/+1
|
* Move where grouping into `WhereClause`Sean Griffin2015-01-273-11/+59
|
* Unify access to bind values on RelationSean Griffin2015-01-276-21/+13
| | | | | | | | | | | | | | | | | | | The bind values can come from four places. `having`, `where`, `joins`, and `from` when selecting from a subquery that contains binds. These need to be kept in a specific order, since the clauses will always appear in that order. Up until recently, they were not. Additionally, `joins` actually did keep its bind values in a separate location (presumably because it's the only case that people noticed was broken). However, this meant that anything accessing just `bind_values` was broken (which most places were). This is no longer possible, there is only a single way to access the bind values, and it includes joins in the proper location. The setter was removed yesterday, so breaking `+=` cases is not possible. I'm still not happy that `joins` is putting it's bind values on the Arel AST, and I'm planning on refactoring it further, but this removes a ton of bug cases.
* Merge pull request #18701 from andreynering/fix-typo-guide-nameRafael Mendonça França2015-01-271-1/+1
|\ | | | | Fix typo on guide name
| * Fix typo on guide name [ci skip]Andrey Nering2015-01-271-1/+1
| |
* | Restore useful documentation removed atRafael Mendonça França2015-01-271-0/+6
|/ | | | | | 3729103e17e00494c8eae76e8a4ee1ac990d3450 [ci skip]
* Merge pull request #18622 from take/patch-1Abdelkader Boudih2015-01-271-20/+0
|\ | | | | Update ActiveRecord::ModelSchema#table_name= 's doc
| * Update model_schema.rb [ci skip]Takehiro Adachi2015-01-271-20/+0
| | | | | | | | | | | | | | Overriding these methods may cause unexpected results since "table_name=" does more then just setting the "@table_name". ref: https://github.com/rails/rails/pull/18622#issuecomment-70874358
* | Move the `from` bind logic to a `FromClause` classSean Griffin2015-01-265-22/+53
| | | | | | | | | | | | | | Contrary to my previous commit message, it wasn't overkill, and led to much cleaner code. [Sean Griffin & anthonynavarre]
* | Remove `Relation#bind_values=`Sean Griffin2015-01-264-12/+10
| | | | | | | | | | | | | | | | | | | | The last place that was assigning it was when `from` is called with a relation to use as a subquery. The implementation was actually completely broken, and would break if you called `from` more than once, or if you called it on a relation, which also had its own join clause, as the bind values would get completely scrambled. The simplest solution was to just move it into its own array, since creating a `FromClause` class for this would be overkill.
* | Remove unused `bind` and `bind!` methods from `Relation`Sean Griffin2015-01-262-18/+0
| |
* | Remove `Relation#build_where`Sean Griffin2015-01-261-6/+0
| | | | | | | | All of its uses have been moved to better places
* | Go through normal `where` logic in `AssociationScope`Sean Griffin2015-01-263-53/+33
| | | | | | | | | | | | | | | | | | | | | | | | This removes the need to duplicate much of the logic in `WhereClause` and `PredicateBuilder`, simplifies the code, removes the need for the connection adapter to be continuously passed around, and removes one place that cares about the internal representation of `bind_values` Part of the larger refactoring to change how binds are represented internally [Sean Griffin & anthonynavarre]
* | Ensure the type caster object given to Arel is always marshallableSean Griffin2015-01-261-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | The Relation will ultimately end up holding a reference to the arel table object, and its associated type caster. If this is a `TypeCaster::Connection`, that means it'll hold a reference to the connection adapter, which cannot be marshalled. We can work around this by just holding onto the class object instead. It's ugly, but I'm hoping to remove the need for the connection adapter type caster in the future anyway. [Sean Griffin & anthonynavarre]
* | Generate a query that makes sense when testing having clausesSean Griffin2015-01-261-3/+4
| | | | | | | | | | | | PG expects us to not give it nonsenes [Sean Griffin & anthonynavarre]
* | Change `having_values` to use the `WhereClause` classSean Griffin2015-01-265-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed an issue where `having` can only be called after the last call to `where`, because it messes with the same `bind_values` array. With this change, the two can be called as many times as needed, in any order, and the final query will be correct. However, once something assigns `bind_values`, that stops. This is because we have to move all of the bind values from the having clause over to the where clause since we can't differentiate the two, and assignment was likely in the form of: `relation.bind_values += other.bind_values` This will go away once we remove all places that are assigning `bind_values`, which is next on the list. While this fixes a bug that was present in at least 4.2 (more likely present going back as far as 3.0, becoming more likely in 4.1 and later as we switched to prepared statements in more cases), I don't think this can be easily backported. The internal changes to `Relation` are non-trivial, anything that involves modifying the `bind_values` array would need to change, and I'm not confident that we have sufficient test coverage of all of those locations (when `having` was called with a hash that could generate bind values). [Sean Griffin & anthonynavarre]
* | Improve consistency of counter caches updating in memorySean Griffin2015-01-265-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we made sure that the counter gets updated in memory, we only did it on the has many side. The has many side only does the update if the belongs to cannot. The belongs to side was updated to update the counter cache (if it is able). This means that we need to check if the belongs_to is able to update in memory on the has_many side. We also found an inconsistency where the reflection names were used to grab the association which should update the counter cache. Since reflection names are now strings, this means it was using a different instance than the one which would have the inverse instance set. Fixes #18689 [Sean Griffin & anthonynavarre]
* | Test association was eager loaded, rather than reaching into internalsSean Griffin2015-01-262-4/+4
| |
* | Move flattening records added to an association farther outSean Griffin2015-01-262-1/+11
| | | | | | | | | | | | | | | | | | There are many ways that things end up getting passed to `concat`. Not all of those entry points called `flatten` on their input. It seems that just about every method that is meant to take a single record, or that splats its input, is meant to also take an array. `concat` is the earliest point that is common to all of the methods which add records to the association. Partially fixes #18689
* | Move method to private sectionCarlos Antonio da Silva2015-01-261-7/+7
| | | | | | | | It's under private in Active Model as well.
* | Remove `where_values` and `where_values=`Sean Griffin2015-01-251-8/+0
| | | | | | | | | | We've now removed all uses of them across the board. All logic lives on `WhereClause`.
* | Correct the implementation for `unscope(:where)`Sean Griffin2015-01-251-5/+8
| | | | | | | | | | | | The code assumes that non-single-value methods mean multi value methods. That is not the case. We need to change the accessor name, and only assign an array for multi value methods
* | Move `where_values_hash` over to `WhereClause`Sean Griffin2015-01-252-16/+23
| |
* | Remove all references to `where_values` in testsSean Griffin2015-01-2510-62/+62
| |
* | Move `where_unscoping` logic over to `WhereClause`Sean Griffin2015-01-253-17/+39
| |
* | Remove most references to `where_values` in `QueryMethods`Sean Griffin2015-01-251-2/+2
| | | | | | | | | | We're still using it in `where_unscoping`, which will require moving additional logic.
* | `Relation#Merger` can merge all clause methodsSean Griffin2015-01-251-3/+11
| | | | | | | | This will make it easy to add `having_clause` and `join_clause` later.
* | Rename `WhereClause#parts` to `WhereClause#predicates`Sean Griffin2015-01-252-16/+16
| |
* | Move `where.not` logic into `WhereClause`Sean Griffin2015-01-253-15/+51
| |
* | Move the construction of `WhereClause` objects out of `Relation`Sean Griffin2015-01-252-14/+42
| | | | | | | | | | Yes, I know, I called it a factory so I'm basically the worst person ever who loves Java and worships the Gang of Four.
* | Remove all references to `where_values` in association codeSean Griffin2015-01-256-12/+14
| |
* | Remove references to `:bind` in `except`Sean Griffin2015-01-252-4/+1
| | | | | | | | Bind values are no longer a thing, so this is unnecessary.
* | Move where merging logic over to `WhereClause`Sean Griffin2015-01-253-40/+79
| | | | | | | | | | | | This object being a black box, it knows the details of how to merge itself with another where clause. This removes all references to where values or bind values in `Relation::Merger`
* | Introduce `Relation::WhereClause`Sean Griffin2015-01-255-11/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way that bind values are currently stored on Relation is a mess. They can come from `having`, `where`, or `join`. I'm almost certain that `having` is actually broken, and calling `where` followed by `having` followed by `where` will completely scramble the binds. Joins don't actually add the bind parameters to the relation itself, but instead add it onto an accessor on the arel AST which is undocumented, and unused in Arel itself. This means that the bind values must always be accessed as `relation.arel.bind_values + relation.bind_values`. Anything that doesn't is likely broken (and tons of bugs have come up for exactly that reason) The result is that everything dealing with `Relation` instances has to know far too much about the internals. The binds are split, combined, and re-stored in non-obvious ways that makes it difficult to change anything about the internal representation of `bind_values`, and is extremely prone to bugs. So the goal is to move a lot of logic off of `Relation`, and into separate objects. This is not the same as what is currently done with `JoinDependency`, as `Relation` knows far too much about its internals, and vice versa. Instead these objects need to be black boxes that can have their implementations swapped easily. The end result will be two classes, `WhereClause` and `JoinClause` (`having` will just re-use `WhereClause`), and there will be a single method to access the bind values of a `Relation` which will be implemented as ``` join_clause.binds + where_clause.binds + having_clause.binds ``` This is the first step towards that refactoring, with the internal representation of where changed, and an intermediate representation of `where_values` and `bind_values` to let the refactoring take small steps. These will be removed shortly.
* | Don't access the where values hash directly in through associationsSean Griffin2015-01-251-1/+1
| | | | | | | | See 4d7a62293e148604045a5f78a9d4312e79e90d13 for the reasoning
* | Don't rely as much on the structure of the values hash in associationsSean Griffin2015-01-252-2/+2
| | | | | | | | | | | | | | | | | | The structure of `values[:where]` is going to change, with an intermediate definition of `where_values` to aid the refactoring. Accessing `values[:where]` directly messes with that, signficantly. The array wrapping is no longer necessary, since `where_values` will always return an array.
* | Merge pull request #18683 from cllns/fix-typo-in-migration-generator-commentZachary Scott2015-01-251-2/+2
|\ \ | | | | | | Fix typos in migration generator comment
| * | Fix typo 'has' => 'have'Sean Collins2015-01-251-1/+1
| | |
| * | Fix typo 'another frameworks' => 'other frameworks'Sean Collins2015-01-251-1/+1
|/ /
* | Merge pull request #18681 from rymai/patch-1Robin Dupret2015-01-251-1/+1
|\ \ | | | | | | Fix a typo "devleopment" => "development"
| * | Fix a typo "devleopment" => "development"Rémy Coutable2015-01-251-1/+1
|/ / | | | | [ci skip]
* | Merge pull request #18680 from y-yagi/tmp_sessionsYves Senn2015-01-251-1/+1
|\ \ | | | | | | fix task description for tmp:create
| * | fix task description for tmp:createyuuji.yaginuma2015-01-251-1/+1
|/ /
* | remove trailing whitespace. [ci skip]Yves Senn2015-01-251-1/+1
| |
* | Merge pull request #18678 from bryanbibat/windows_binstubsYves Senn2015-01-251-0/+3
|\ \ | | | | | | Add tip for running binstubs on Windows [ci skip]
| * | Add tip for running binstubs on Windows [ci skip]Bryan Bibat2015-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | The default command prompt under Windows doesn't run binstubs correctly while PowerShell needs to find the location of the Ruby interpreter for it to work properly. Passing the binstubs manually to the interpreter solves this problem.
* | | Merge pull request #18677 from yachibit/docs_for_datetime_selectAbdelkader Boudih2015-01-251-0/+2
|\ \ \ | |/ / |/| | Add missing options to `datetime_select` [ci skip]
| * | Add missing options to `datetime_select` [ci skip]yachibit2015-01-251-0/+2
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 04:13:22 +0000