| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use Arel to build subquery. Adapt tests to changed fixtures. | John Mileham | 2011-03-24 | 1 | -13/+12 |
| | | |||||
| * | Merge branch 'master' of github.com:rails/rails into count_behavior | John Mileham | 2011-03-24 | 4 | -3/+19 |
| |\ | |||||
| | * | add #first! and #last! to models & relations | Josh Susser | 2011-03-24 | 1 | -0/+10 |
| | | | |||||
| | * | Merge branch 'master' into fuuu | Aaron Patterson | 2011-03-22 | 1 | -0/+6 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Do not show optional (.:format) block for wildcard route [#6605 state:resolved] pushing id insertion and prefetch primary keys down to Relation#insert use prepared statements to fetch the last insert id escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved] schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved] Reapply extensions when using except and only SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test Improved resolver docs a bit [action_view] docs for FileSystemResolver [action_view] added custom patterns to template resolver | ||||
| | | * | Reapply extensions when using except and only | Iain Hecker | 2011-03-21 | 1 | -0/+6 |
| | | | | |||||
| | * | | 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-05 | 1 | -2/+2 |
| | |\| | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG | ||||
| | | * | use Arel::Table#alias rather than passing the :as parameter | Aaron Patterson | 2011-03-05 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 6 | -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 | ||||
| | * | | 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 |
| | | | | |||||
| * | | | Change behavior of count(:limit => x, :offset => y) to limit/offset before ↵ | John Mileham | 2011-03-03 | 1 | -14/+26 |
| | |/ |/| | | | | | counting. | ||||
| * | | Move JoinDependency and friends from ↵ | Jon Leighton | 2011-02-28 | 2 | -4/+4 |
| | | | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations | ||||
| * | | use an attribute rather than a SQL literal | Aaron Patterson | 2011-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | removing limits and offsets from COUNT queries unless both are specified. ↵ | Aaron Patterson | 2011-02-25 | 1 | -1/+13 |
| | | | | | | | | | [#6268 state:resolved] | ||||
| * | | merges docrails | Xavier Noria | 2011-02-18 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix Typos: remove several occurences of the the | Nicholas Rowe | 2011-02-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 1 | -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 lolqueries | Aaron Patterson | 2011-02-16 | 1 | -10/+1 |
| | | | | |||||
| * | | | use the arel table rather than generating strings | Aaron Patterson | 2011-02-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | no need for Array.wrap | Aaron Patterson | 2011-02-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | removed an unnecessary second query when passing an ActiveRecord::Relation ↵ | Steven Fenigstein | 2011-02-16 | 1 | -1/+4 |
| | | | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses. | ||||
| * | | | Remove Relation#& alias for Relation#merge | Ernie Miller | 2011-02-12 | 1 | -2/+0 |
| | | | | |||||
| * | | | limit() should sanitize limit values | Aaron Patterson | 2011-02-08 | 1 | -1/+1 |
| |/ / | | | | | | | This fixes CVE-2011-0448 | ||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-05 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | keep options titles consistent to "Options" | Gabriel Horner | 2011-02-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | The type_cast_calculated_value method will trust DB types before casting to ↵ | Ken Collins | 2011-02-03 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | a BigDecimal. [#6365 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-01-20 | 1 | -0/+14 |
| |\ \ | |||||
| | * | | document ActiveRecord's except and only | Jordi Romero | 2011-01-15 | 1 | -0/+14 |
| | | | | | | | | | | | | | Document methods that allow easily override arel queries | ||||
| * | | | Always return decimal average of integer fields | Raimonds Simanovskis | 2011-01-10 | 1 | -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 values | Aaron Patterson | 2011-01-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | stop creating intermediate AR objects, just construct AR objects from a list ↵ | Aaron Patterson | 2011-01-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | of hashes | ||||
| * | | | Explicitly select * from has_and_belongs_to_many association tables, ↵ | Raimonds Simanovskis | 2011-01-04 | 1 | -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 Leighton | 2011-01-03 | 4 | -14/+14 |
| | | | | | | | | | | | | | ActiveRecord::Base.primary_key does. | ||||
| * | | | Make Relation#create_with always merge rather than overwrite, not just when ↵ | Jon Leighton | 2011-01-03 | 2 | -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 Leighton | 2011-01-03 | 1 | -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-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | for bug #6036. | ||||
| * | | | Rename AssociationReflection#primary_key_name to foreign_key, since the ↵ | Jon Leighton | 2010-12-31 | 1 | -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 Leighton | 2010-12-31 | 1 | -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 connection | Aaron Patterson | 2010-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | Arel::Table#[] always returns an attribute, so no need for || | Aaron Patterson | 2010-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | to_sym stuff before passing it to arel | Aaron Patterson | 2010-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | 2 | -17/+8 |
| | | | |||||
| * | | 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 |
| |/ | |||||
| * | no more manager manipulation if there is no custom join ast | Aaron Patterson | 2010-12-10 | 1 | -6/+5 |
| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |