Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'associations_2' | Emilio Tagua | 2009-10-05 | 1 | -2/+2 |
|\ | |||||
| * | Added eager loading support to Relation and ActiveRecord#all. | Emilio Tagua | 2009-10-05 | 1 | -2/+2 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-02 | 1 | -1/+3 |
|\ \ | |||||
| * | | Make has_one with :conditions hash scope build or creation of the associated ↵ | Luciano G Panaro | 2009-09-28 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | object with those conditions Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3088 state:committed] | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-14 | 1 | -3/+4 |
|\| | | |||||
| * | | Added some documentation about setting :autosave => false on an association. | Eloy Duran | 2009-09-12 | 1 | -3/+4 |
| | | | |||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 1 | -17/+36 |
|\| | | |||||
| * | | Changed ActiveRecord to use new callbacks and speed up observers by only ↵ | José Valim | 2009-09-08 | 1 | -17/+36 |
| | | | | | | | | | | | | | | | | | | notifying events that are actually being consumed. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 1 | -11/+2 |
|\| | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | | Revert "Assert primary key does not exist in habtm when the association is ↵ | Jeremy Kemper | 2009-09-02 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defined, instead of doing that everytime a record is inserted." Test failures on PostgreSQL. [#3128 state:open] This reverts commit da636809daca9c338200811d3590e446f57c8e81. | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-01 | 1 | -2/+11 |
|\| | | |/ |/| | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | Assert primary key does not exist in habtm when the association is defined, ↵ | José Valim | 2009-09-01 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | instead of doing that everytime a record is inserted. [#3128 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Remove useless conditionals/local var. | Emilio Tagua | 2009-08-19 | 1 | -5/+1 |
| | | |||||
* | | Make sure join association methods are called once. | Emilio Tagua | 2009-08-19 | 1 | -9/+10 |
| | | |||||
* | | Don't sanitize_sql where it doesn't make sense. | Emilio Tagua | 2009-08-19 | 1 | -2/+2 |
| | | |||||
* | | Remove old method and comment. | Emilio Tagua | 2009-08-19 | 1 | -14/+0 |
| | | |||||
* | | Remove useless InnerJoinDependency, inner joins are performed through | Emilio Tagua | 2009-08-19 | 1 | -21/+4 |
| | | | | | | | | Arel::InnerJoin. | ||||
* | | Remove whitespace. | Emilio Tagua | 2009-08-19 | 1 | -0/+1 |
| | | |||||
* | | Use immutable relation objects to generate queries. | Emilio Tagua | 2009-08-18 | 1 | -19/+18 |
| | | |||||
* | | Use finder options as relation method names to provide more familiar | Emilio Tagua | 2009-08-18 | 1 | -17/+17 |
| | | | | | | | | | | naming. Use bang methods convention in methods that alter the relation. | ||||
* | | Clean up relation joins when finding records with included associations. | Emilio Tagua | 2009-08-17 | 1 | -12/+12 |
| | | |||||
* | | Use ARel's joins when building a query for finding records with included | Emilio Tagua | 2009-08-14 | 1 | -48/+58 |
| | | | | | | | | associations. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 1 | -17/+49 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/calculations.rb activerecord/lib/active_record/connection_adapters/mysql_adapter.rb activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | ||||
| * | Enable has_many :through for going through a has_one association on the join ↵ | Gabe da Silveira | 2009-08-10 | 1 | -2/+29 |
| | | | | | | | | | | | | model [#2719 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Changed to use klass instead of constantizing in assign_ids generated method | Dmitry Ratnikov | 2009-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | [#260 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix for nested :include with namespaced models. | Rich Bradley | 2009-08-09 | 1 | -1/+1 |
| | | | | | | | | [#260 state:committed] | ||||
* | | Removed unused methods. | Emilio Tagua | 2009-08-07 | 1 | -70/+56 |
| | | |||||
* | | Removed useless OR. | Emilio Tagua | 2009-08-07 | 1 | -1/+1 |
| | | |||||
* | | More work on removing plain SQL from associations and use ARel instead. | Emilio Tagua | 2009-08-07 | 1 | -20/+19 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-31 | 1 | -5/+71 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | Merge docrails | Pratik Naik | 2009-07-25 | 1 | -5/+71 |
| | | |||||
* | | Introduced ActiveRecord::Relation, a layer between an ARel relation and an ↵ | Emilio Tagua | 2009-07-21 | 1 | -8/+9 |
| | | | | | | | | AR relation | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-16 | 1 | -3/+6 |
|\| | |||||
| * | Add primary_key option to belongs_to association | Szymon Nowak | 2009-07-15 | 1 | -3/+6 |
| | | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods. | Emilio Tagua | 2009-07-16 | 1 | -8/+8 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-14 | 1 | -1/+8 |
|\| | |||||
| * | Use map! instead of map for <association>_ids | Pratik Naik | 2009-07-13 | 1 | -2/+2 |
| | | |||||
| * | Optimize <association>_ids for hm:t with belongs_to source | Pratik Naik | 2009-07-13 | 1 | -1/+8 |
| | | |||||
* | | Arel now buils SQL queries for associations. Removed old code and | Emilio Tagua | 2009-06-23 | 1 | -47/+6 |
| | | | | | | | | updated Arel version to support this. | ||||
* | | Leave the quoting part to ARel | Emilio Tagua | 2009-06-12 | 1 | -7/+2 |
|\| | |||||
| * | HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation. | Adam Milligan | 2009-06-12 | 1 | -7/+2 |
| | | | | | | | | | | | | [#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Use ARel in SQL generation through associations | Emilio Tagua | 2009-06-10 | 1 | -11/+15 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-02 | 1 | -1/+1 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb | ||||
| * | Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵ | Joshua Peek | 2009-05-28 | 1 | -1/+1 |
| | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb activerecord/lib/active_record/migration.rb activerecord/test/cases/helper.rb | ||||
| * | Fixed limited eager loading associations with numbers in the name [#2668 ↵ | Benjamin Floering | 2009-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 1 | -0/+2 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-12 | 1 | -10/+26 |
|\| | |||||
| * | Use DependencyModule for included hooks in ActiveRecord | Bryan Helmkamp | 2009-05-11 | 1 | -4/+2 |
| | | |||||
| * | Fixed eager load error on find with include => [:table_name] and hash ↵ | Anthony Crumley | 2009-05-10 | 1 | -4/+16 |
| | | | | | | | | | | | | conditions like {:table_name => {:column => 'value'}} Signed-off-by: Michael Koziarski <michael@koziarski.com> |