Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 2 | -14/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/migration.rb | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-08-08 | 3 | -1/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb activerecord/test/cases/method_scoping_test.rb | |||||
| * | | | | | | | | | | | | | | | | | | Removed unused methods. | Emilio Tagua | 2009-08-07 | 1 | -70/+56 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Removed useless OR. | Emilio Tagua | 2009-08-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Don't scope order in calculations.' | 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 | 2 | -31/+39 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-06 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-08-05 | 9 | -188/+79 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Added collection iteration to AR::Relation. | Emilio Tagua | 2009-08-03 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Don't use local vars before testing its conditional. | Emilio Tagua | 2009-08-03 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-03 | 5 | -36/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-07-31 | 23 | -556/+757 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Added ActiveRecord::Relation tests. Allow Relation to accept conditional | Emilio Tagua | 2009-07-31 | 2 | -3/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashes and arrays like #find does. | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Performance: cache/reload arel relation when possible to speed up things. | Emilio Tagua | 2009-07-21 | 2 | -6/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Removed unused local variable. | Emilio Tagua | 2009-07-21 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Introduced ActiveRecord::Relation, a layer between an ARel relation and an ↵ | Emilio Tagua | 2009-07-21 | 4 | -45/+68 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AR relation | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-21 | 2 | -8/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-07-20 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Performance boost for AR#create | Emilio Tagua | 2009-07-20 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-16 | 4 | -9/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods. | Emilio Tagua | 2009-07-16 | 2 | -40/+59 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-14 | 4 | -115/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-07-06 | 3 | -141/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-07-01 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create is now powered by Arel. Removed methods that are no longer used. | Emilio Tagua | 2009-07-01 | 3 | -18/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small refactor to update_all. | Emilio Tagua | 2009-07-01 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 4 | -28/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 2 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 5 | -1/+59 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring: Calculations now use construct_finder_sql instead they own method. | Emilio Tagua | 2009-06-23 | 2 | -25/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-23 | 6 | -7/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unused methods. | Emilio Tagua | 2009-06-23 | 3 | -106/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arel now buils SQL queries for associations. Removed old code and | Emilio Tagua | 2009-06-23 | 3 | -67/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated Arel version to support this. | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed old commented code | Emilio Tagua | 2009-06-23 | 1 | -21/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forget about auto scope, it's always explicit. | Emilio Tagua | 2009-06-17 | 1 | -7/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-16 | 3 | -4/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Leave the quoting part to ARel | Emilio Tagua | 2009-06-12 | 5 | -172/+171 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-06-12 | 4 | -98/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-06-10 | 1 | -8/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'update_all' | Emilio Tagua | 2009-06-10 | 1 | -10/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial update_all migration | Emilio Tagua | 2009-06-10 | 1 | -10/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use array of orders instead of string concatenation | Emilio Tagua | 2009-06-10 | 1 | -7/+5 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Use ARel in SQL generation through associations" | Emilio Tagua | 2009-06-10 | 1 | -28/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7be3e3ba0547587313d87bccb788a8466a62628a. | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ARel in SQL generation through associations | Emilio Tagua | 2009-06-10 | 1 | -10/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ARel in SQL generation through associations | Emilio Tagua | 2009-06-10 | 2 | -15/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-09 | 4 | -29/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-06-02 | 23 | -975/+334 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set ActiveRecord as Arel engine on load. | Emilio Tagua | 2009-06-02 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to specify the engine now that it is in active_record.rb | Emilio Tagua | 2009-06-02 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactors to work with latest Arel implementation. | Emilio Tagua | 2009-06-02 | 7 | -20/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |