aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-051-2/+2
|\ | | | | | | | | Conflicts: activerecord/CHANGELOG
| * use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-051-2/+2
| |
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-046-74/+104
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Leighton2011-02-282-4/+4
| | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations
| * use an attribute rather than a SQL literalAaron Patterson2011-02-261-1/+1
| |
| * removing limits and offsets from COUNT queries unless both are specified. ↵Aaron Patterson2011-02-251-1/+13
| | | | | | | | [#6268 state:resolved]
| * merges docrailsXavier Noria2011-02-181-1/+1
| |\
| | * Fix Typos: remove several occurences of the theNicholas Rowe2011-02-171-1/+1
| | |
| * | Split AssociationProxy into an Association class (and subclasses) which ↵Jon Leighton2011-02-181-1/+1
| | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more.
| * | explicitly allowing lolqueriesAaron Patterson2011-02-161-10/+1
| | |
| * | use the arel table rather than generating stringsAaron Patterson2011-02-161-1/+1
| | |
| * | no need for Array.wrapAaron Patterson2011-02-161-1/+1
| | |
| * | removed an unnecessary second query when passing an ActiveRecord::Relation ↵Steven Fenigstein2011-02-161-1/+4
| | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses.
| * | Remove Relation#& alias for Relation#mergeErnie Miller2011-02-121-2/+0
| | |
| * | limit() should sanitize limit valuesAaron Patterson2011-02-081-1/+1
| |/ | | | | | | This fixes CVE-2011-0448
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-051-1/+1
| |\
| | * keep options titles consistent to "Options"Gabriel Horner2011-02-031-1/+1
| | |
| * | The type_cast_calculated_value method will trust DB types before casting to ↵Ken Collins2011-02-031-1/+1
| |/ | | | | | | | | | | | | | | a BigDecimal. [#6365 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-01-201-0/+14
| |\
| | * document ActiveRecord's except and onlyJordi Romero2011-01-151-0/+14
| | | | | | | | | | | | Document methods that allow easily override arel queries
| * | Always return decimal average of integer fieldsRaimonds Simanovskis2011-01-101-9/+5
| | | | | | | | | | | | In previous version if database adapter (e.g. SQLite and Oracle) returned non-String calculated values then type_cast_using_column converted decimal average value of intefer field to integer value. Now operation parameter is always checked to decide which conversion of calculated value should be done.
| * | use select_all because not all database adapters support bind valuesAaron Patterson2011-01-081-1/+1
| | |
| * | stop creating intermediate AR objects, just construct AR objects from a list ↵Aaron Patterson2011-01-071-1/+2
| | | | | | | | | | | | of hashes
| * | Explicitly select * from has_and_belongs_to_many association tables, ↵Raimonds Simanovskis2011-01-041-1/+1
| | | | | | | | | | | | | | | simplify exists? query Previous version (after commit 3103296a61709e808aa89c3d37cf22bcdbc5a675) was generating wrong SQL for Oracle when calling exists? method on HABTM association.
| * | ActiveRecord::Relation#primary_key should return a string, just like ↵Jon Leighton2011-01-034-14/+14
| | | | | | | | | | | | ActiveRecord::Base.primary_key does.
| * | Make Relation#create_with always merge rather than overwrite, not just when ↵Jon Leighton2011-01-032-4/+2
| | | | | | | | | | | | 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).
| * | Let AssociationCollection#find use #scoped to do its finding. Note that I am ↵Jon Leighton2011-01-031-1/+1
| | | | | | | | | | | | removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences.
| * | User id instead of quoted_id to prevent double quoting. Fixes failing test ↵Robert Pankowecki (Gavdi)2011-01-041-1/+1
| | | | | | | | | | | | for bug #6036.
| * | Rename AssociationReflection#primary_key_name to foreign_key, since the ↵Jon Leighton2010-12-311-1/+1
| | | | | | | | | | | | options key which it relates to is :foreign_key
| * | Specify the STI type condition using SQL IN rather than a whole load of ORs. ↵Jon Leighton2010-12-311-1/+5
| |/ | | | | | | Required a fix to ActiveRecord::Relation#merge for properly merging create_with_value. This also fixes a situation where the type condition was appearing twice in the resultant SQL query.
| * arel can escape the id, so avoid using the database connectionAaron Patterson2010-12-221-1/+1
| |
| * Arel::Table#[] always returns an attribute, so no need for ||Aaron Patterson2010-12-221-1/+1
| |
| * to_sym stuff before passing it to arelAaron Patterson2010-12-221-1/+1
| |
| * ActiveRecord::Base.joins should allow single nil argument [#6181 state:resolved]Piotr Sarnacki2010-12-161-1/+1
| |
| * make sure that join nodes are uniqAaron Patterson2010-12-161-1/+1
| |
| * supporting arel AST nodes when building join statementsAaron Patterson2010-12-161-3/+15
| |
| * bucketing based on join typeAaron Patterson2010-12-161-8/+17
| |
| * taking advantage of the JoinSource node in the SQL ASTAaron Patterson2010-12-162-17/+8
| |
| * remove lasgn since AST is mutatedAaron Patterson2010-12-161-1/+1
| |
| * just mutate the ast, fewer lasgnsAaron Patterson2010-12-161-3/+2
| |
* | remove lasgn since AST is mutatedAaron Patterson2010-12-101-1/+1
| |
* | just mutate the ast, fewer lasgnsAaron Patterson2010-12-101-3/+2
|/
* no more manager manipulation if there is no custom join astAaron Patterson2010-12-101-6/+5
|
* froms should never equal 0Aaron Patterson2010-12-101-2/+0
|
* manager will always be a managerAaron Patterson2010-12-101-10/+6
|
* eliminate lasgnsAaron Patterson2010-12-101-10/+10
|
* dealing with an AST manager, not a relation, so fix the variable namesAaron Patterson2010-12-101-12/+12
|
* adding a fixme commentAaron Patterson2010-12-081-0/+1
|
* renaming variables, making the join_ast method privateAaron Patterson2010-12-081-51/+27
|
* further reducing dependence on custom_joinsAaron Patterson2010-12-081-0/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 01:33:34 +0000