Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve some TODO comments which I decided did not need anything done | Jon Leighton | 2011-03-12 | 1 | -1/+0 |
| | |||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 1 | -37/+41 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Leighton | 2011-02-28 | 1 | -2/+2 |
| | | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations | ||||
| * | use an attribute rather than a SQL literal | Aaron Patterson | 2011-02-26 | 1 | -1/+1 |
| | | |||||
| * | explicitly allowing lolqueries | Aaron Patterson | 2011-02-16 | 1 | -10/+1 |
| | | |||||
| * | limit() should sanitize limit values | Aaron Patterson | 2011-02-08 | 1 | -1/+1 |
| | | | | | | | | This fixes CVE-2011-0448 | ||||
| * | ActiveRecord::Relation#primary_key should return a string, just like ↵ | Jon Leighton | 2011-01-03 | 1 | -1/+1 |
| | | | | | | | | ActiveRecord::Base.primary_key does. | ||||
| * | Make Relation#create_with always merge rather than overwrite, not just when ↵ | Jon Leighton | 2011-01-03 | 1 | -1/+1 |
| | | | | | | | | merging two relations. If you wish to overwrite, you can do relation.create_with(nil), or for a specific attribute, relation.create_with(:attr => nil). | ||||
| * | ActiveRecord::Base.joins should allow single nil argument [#6181 state:resolved] | Piotr Sarnacki | 2010-12-16 | 1 | -1/+1 |
| | | |||||
| * | make sure that join nodes are uniq | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | | |||||
| * | supporting arel AST nodes when building join statements | Aaron Patterson | 2010-12-16 | 1 | -3/+15 |
| | | |||||
| * | bucketing based on join type | Aaron Patterson | 2010-12-16 | 1 | -8/+17 |
| | | |||||
| * | taking advantage of the JoinSource node in the SQL AST | Aaron Patterson | 2010-12-16 | 1 | -16/+7 |
| | | |||||
| * | remove lasgn since AST is mutated | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | | |||||
| * | just mutate the ast, fewer lasgns | Aaron Patterson | 2010-12-16 | 1 | -3/+2 |
| | | |||||
* | | remove lasgn since AST is mutated | Aaron Patterson | 2010-12-10 | 1 | -1/+1 |
| | | |||||
* | | just mutate the ast, fewer lasgns | Aaron Patterson | 2010-12-10 | 1 | -3/+2 |
|/ | |||||
* | no more manager manipulation if there is no custom join ast | Aaron Patterson | 2010-12-10 | 1 | -6/+5 |
| | |||||
* | froms should never equal 0 | Aaron Patterson | 2010-12-10 | 1 | -2/+0 |
| | |||||
* | manager will always be a manager | Aaron Patterson | 2010-12-10 | 1 | -10/+6 |
| | |||||
* | eliminate lasgns | Aaron Patterson | 2010-12-10 | 1 | -10/+10 |
| | |||||
* | dealing with an AST manager, not a relation, so fix the variable names | Aaron Patterson | 2010-12-10 | 1 | -12/+12 |
| | |||||
* | adding a fixme comment | Aaron Patterson | 2010-12-08 | 1 | -0/+1 |
| | |||||
* | renaming variables, making the join_ast method private | Aaron Patterson | 2010-12-08 | 1 | -51/+27 |
| | |||||
* | further reducing dependence on custom_joins | Aaron Patterson | 2010-12-08 | 1 | -0/+2 |
| | |||||
* | reducing use of custom joins | Aaron Patterson | 2010-12-08 | 1 | -1/+6 |
| | |||||
* | passing the ast to a table when the relation is a table | Aaron Patterson | 2010-12-07 | 1 | -3/+20 |
| | |||||
* | JoinDependency is always created with an AST now | Aaron Patterson | 2010-12-07 | 1 | -1/+15 |
| | |||||
* | cleaning up custom_join_sql method | Aaron Patterson | 2010-12-07 | 1 | -4/+6 |
| | |||||
* | fix warnings, stop using global variables | Aaron Patterson | 2010-11-30 | 1 | -4/+2 |
| | |||||
* | stop using splat args when we do not need them | Aaron Patterson | 2010-11-30 | 1 | -2/+2 |
| | |||||
* | reduce method calls on arel | Aaron Patterson | 2010-11-30 | 1 | -1/+1 |
| | |||||
* | skip cloning if arguments are blank | Aaron Patterson | 2010-11-22 | 1 | -8/+22 |
| | |||||
* | group can be done by left side only | Aaron Patterson | 2010-11-17 | 1 | -6/+3 |
| | |||||
* | collapsing same table / column WHERE clauses to be OR [#4598 state:resolved] | Aaron Patterson | 2010-11-17 | 1 | -4/+25 |
| | |||||
* | use shorter form for sql literals | Aaron Patterson | 2010-11-17 | 1 | -1/+1 |
| | |||||
* | adding bind_values to relations | Aaron Patterson | 2010-10-26 | 1 | -1/+8 |
| | |||||
* | use shortened version to generate a sql literal | Aaron Patterson | 2010-10-19 | 1 | -1/+1 |
| | |||||
* | avoid cloning if we do not need to clone | Aaron Patterson | 2010-10-19 | 1 | -0/+2 |
| | |||||
* | avoid creating a proc object when possible | Aaron Patterson | 2010-10-19 | 1 | -2/+2 |
| | |||||
* | Refactor JoinDependency and friends so that a JoinAssociation can produce an ↵ | Jon Leighton | 2010-10-13 | 1 | -12/+1 |
| | | | | arbitrary number of joins, which will be needed in order to support nested through associations. | ||||
* | reorder removed in favor of except(:order).order | Santiago Pastorino | 2010-10-11 | 1 | -10/+1 |
| | |||||
* | avoid creating objects when we can | Aaron Patterson | 2010-10-03 | 1 | -1/+1 |
| | |||||
* | build_where should be private | Aaron Patterson | 2010-09-30 | 1 | -2/+2 |
| | |||||
* | removing more useless code! yay! | Aaron Patterson | 2010-09-28 | 1 | -6/+2 |
| | |||||
* | SqlLiteral is a string, so we can dry up these conditionals | Aaron Patterson | 2010-09-28 | 1 | -4/+3 |
| | |||||
* | shorten up or sql literal creation statements | Aaron Patterson | 2010-09-28 | 1 | -4/+2 |
| | |||||
* | we only care about arrays and strings | Aaron Patterson | 2010-09-28 | 1 | -1/+1 |
| | |||||
* | dry up calls to arel.join() | Aaron Patterson | 2010-09-28 | 1 | -5/+4 |
| | |||||
* | removing unused lasgns | Aaron Patterson | 2010-09-28 | 1 | -4/+4 |
| |