Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 101 | -1239/+2115 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-09-01 | 164 | -6353/+1140 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | |||||
| * | | | | | | | | | | | | | | | | | Revert "Revert "Add readonly support for relations."" | Emilio Tagua | 2009-08-27 | 3 | -2/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2c0725d79e29b02e30e7a4827851acc4a766730. | |||||
| * | | | | | | | | | | | | | | | | | Revert "Add readonly support for relations." | Emilio Tagua | 2009-08-27 | 3 | -23/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7cce95b25ace33e04526d4490e487a080c1f9b96. | |||||
| * | | | | | | | | | | | | | | | | | Add readonly support for relations. | Emilio Tagua | 2009-08-27 | 3 | -2/+23 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | No need to reload the relation table with a method param, just nil it. | Emilio Tagua | 2009-08-27 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Performance: Don't reload ARel relation on update. | Emilio Tagua | 2009-08-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Performance: Don't reload the ARel relation on create, do it on | Emilio Tagua | 2009-08-27 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset_column_information. | |||||
| * | | | | | | | | | | | | | | | | | Performance: Don't reload the arel_table when destroying. | Emilio Tagua | 2009-08-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-27 | 46 | -274/+593 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Remove useless var local definition. | Emilio Tagua | 2009-08-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | No need to create a new relation if the argument is blank. | Emilio Tagua | 2009-08-25 | 2 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-25 | 9 | -90/+164 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Revert "Add bench script for ActiveRecord. Ignore log file and temporary cache" | Emilio Tagua | 2009-08-21 | 2 | -231/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0c6aed0a09e3a4f8cdf2b277f3144f715c0e30fb. | |||||
| * | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-21 | 4 | -0/+223 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Add bench script for ActiveRecord. Ignore log file and temporary cache | Emilio Tagua | 2009-08-20 | 2 | -0/+231 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql files. | |||||
| * | | | | | | | | | | | | | | | | | | | | 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 | 2 | -13/+14 | |
| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | 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 | 2 | -22/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arel::InnerJoin. | |||||
| * | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-19 | 14 | -109/+376 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Remove whitespace. | Emilio Tagua | 2009-08-19 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Remove unused quoted_record_ids, now ARel does this using ARel::In. | Emilio Tagua | 2009-08-18 | 1 | -9/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | has_many nullify associations keys using ARel. | Emilio Tagua | 2009-08-18 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Remove now unused quote_table_name, ARel does that quoting now. | Emilio Tagua | 2009-08-18 | 1 | -7/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | habtm insertion with ARel integration. | Emilio Tagua | 2009-08-18 | 1 | -8/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | habtm delete method integrated with ARel. | Emilio Tagua | 2009-08-18 | 1 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Call to_sql method on ActiveRecord::Relation instance not it's relation | Emilio Tagua | 2009-08-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute.' | |||||
| * | | | | | | | | | | | | | | | | | | | | | Override respond_to? in ActiveRecord::Relation to go with | Emilio Tagua | 2009-08-18 | 2 | -0/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method_missing. | |||||
| * | | | | | | | | | | | | | | | | | | | | | Cache arel_table when possible, use class method arel_table instead | Emilio Tagua | 2009-08-18 | 2 | -12/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instance method. | |||||
| * | | | | | | | | | | | | | | | | | | | | | Cache #arel_able when possible. | Emilio Tagua | 2009-08-18 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Inline initializer setup. | Emilio Tagua | 2009-08-18 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Use immutable relation objects to generate queries. | Emilio Tagua | 2009-08-18 | 6 | -92/+87 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Use explicit method definition instead of metaprogramming. | Emilio Tagua | 2009-08-18 | 1 | -11/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Relation#joins! should know what to join instead of delegating to | Emilio Tagua | 2009-08-18 | 1 | -7/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | construct_join. | |||||
| * | | | | | | | | | | | | | | | | | | | | | Fix typo in test classname. | Emilio Tagua | 2009-08-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Use finder options as relation method names to provide more familiar | Emilio Tagua | 2009-08-18 | 7 | -68/+81 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-17 | 23 | -246/+158 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-08-17 | 41 | -1143/+619 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/calculations.rb | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | Remove group when building the relation, it will be added later if | Emilio Tagua | 2009-08-16 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options[:group] is given. | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | Don't use regular rinder on calculations since scoping order blows | Emilio Tagua | 2009-08-14 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostreSQL. | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-14 | 49 | -603/+506 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Use ARel's joins when building a query for finding records with included | Emilio Tagua | 2009-08-14 | 5 | -79/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations. | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-11 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 2 | -5/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 11 | -186/+247 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 146 | -395/+2326 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 12 | -30/+100 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/migration.rb |