Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9078 from senny/6865_ar_count_with_uniq | Rafael Mendonça França | 2013-02-02 | 1 | -1/+2 |
| | | | | | | `#count` in conjunction with `#uniq` performs distinct count. Conflicts: activerecord/CHANGELOG.md | ||||
* | Fix pluck when columns/tables are reserved words. | Ian Lesperance | 2013-01-23 | 1 | -1/+1 |
| | | | | | | | | | Backport #7536 to fix #8968. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb | ||||
* | Revert "Merge pull request #7983 from georgebrock/bug7950-squashed" | Carlos Antonio da Silva | 2013-01-15 | 1 | -4/+3 |
| | | | | | | | | | | | This reverts commit 88a296dccc401da143d90cad54b693ff06bf2b58, reversing changes made to 666a7e34f553cef4c8878362eafc79c7e3f310c3. Conflicts: activerecord/CHANGELOG.md Reason: this has been resulting in some hard to track bugs and is introducing a possible breackage in a stable version. | ||||
* | Merge pull request #4942 from bogdan/pluck_joins | José Valim | 2012-12-03 | 1 | -1/+6 |
| | | | | | | | | AR::Relation#pluck: improve to work with joins Conflicts: activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb | ||||
* | Merge pull request #7983 from georgebrock/bug7950-squashed | Carlos Antonio da Silva | 2012-11-16 | 1 | -3/+4 |
|\ | | | | | | | | | | | | | | | Backport 4bc2ae0 to fix #7950 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb | ||||
| * | use bind values for join columns | Aaron Patterson | 2012-11-10 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | This is a backport of 4bc2ae0da1dd812aee759f6d13ad428354cd0e13. It fixes bug #7950. Conflicts: activerecord/lib/active_record/relation/calculations.rb activerecord/lib/active_record/relation/finder_methods.rb | ||||
* | | backport #8176, `#pluck` can be used on a relation with `select` clause. | Yves Senn | 2012-11-13 | 1 | -1/+3 |
|/ | | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb | ||||
* | Ensure Arel columns are typecasted properly when grouping with calculation | Carlos Antonio da Silva | 2012-06-25 | 1 | -3/+3 |
| | | | | | | | | Fix build issue with postgresql. Conflicts: activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb | ||||
* | Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculations | Rafael Mendonça França | 2012-06-24 | 1 | -6/+17 |
| | | | | | | Stop assuming strings for grouped calculations Conflicts: activerecord/lib/active_record/relation/calculations.rb | ||||
* | Make ActiveRecord::Relation#pluck work with serialized attributes | Jon Leighton | 2011-12-22 | 1 | -4/+4 |
| | |||||
* | ActiveRecord::Relation#pluck method | Bogdan Gusiev | 2011-11-30 | 1 | -0/+17 |
| | |||||
* | Make it the responsibility of the connection to hold onto an ARel visitor ↵ | Jon Leighton | 2011-08-08 | 1 | -2/+2 |
| | | | | for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now. | ||||
* | Fixed failing query when performing calculation with having based on select. | Dmitriy Kiriyenko | 2011-07-27 | 1 | -0/+1 |
| | |||||
* | Fixed AR::Relation#sum compatibility with Array#sum | Bogdan Gusiev | 2011-07-05 | 1 | -2/+6 |
| | | | | | In order make Relation behavior closer to Array Made Relation#sum to accept block and delegate it to Array#sum | ||||
* | Apply the default scope earlier when doing calculations. Fixes #1682. | Jon Leighton | 2011-06-23 | 1 | -5/+11 |
| | |||||
* | Ensure that calculations properly override the select value even if it's set ↵ | Jon Leighton | 2011-05-31 | 1 | -2/+2 |
| | | | | in the default scope. Fixes #1395. | ||||
* | Remove extra white spaces on ActiveRecord docs. | Sebastian Martinez | 2011-05-23 | 1 | -4/+4 |
| | |||||
* | Bug fixes: | Fadzril Muhamad & Joseph Palermo | 2011-05-12 | 1 | -5/+4 |
| | | | | | | - If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not. - When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count. Looks like it was broken here: https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265 | ||||
* | Ensure that ORDER BY clauses from default scopes are not included in ↵ | Jon Leighton | 2011-05-08 | 1 | -1/+1 |
| | | | | calculation queries. Fixes #406. | ||||
* | Use Arel to build subquery. Adapt tests to changed fixtures. | John Mileham | 2011-03-24 | 1 | -13/+12 |
| | |||||
* | Change behavior of count(:limit => x, :offset => y) to limit/offset before ↵ | John Mileham | 2011-03-03 | 1 | -14/+26 |
| | | | | counting. | ||||
* | removing limits and offsets from COUNT queries unless both are specified. ↵ | Aaron Patterson | 2011-02-25 | 1 | -1/+13 |
| | | | | [#6268 state:resolved] | ||||
* | 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> | ||||
* | 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. | ||||
* | ActiveRecord::Relation#primary_key should return a string, just like ↵ | Jon Leighton | 2011-01-03 | 1 | -1/+1 |
| | | | | ActiveRecord::Base.primary_key does. | ||||
* | 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 | ||||
* | just grep the AST for OuterJoin nodes rather than converting the tree to SQL | Aaron Patterson | 2010-11-30 | 1 | -1/+1 |
| | |||||
* | reduce method calls on arel | Aaron Patterson | 2010-11-30 | 1 | -1/+1 |
| | |||||
* | refactor to reduce method calls | Aaron Patterson | 2010-11-16 | 1 | -10/+19 |
| | |||||
* | Fix ActiveRecord calculations when grouped by multiple fields | Alexandru Catighera | 2010-11-16 | 1 | -14/+18 |
| | |||||
* | we should always cast the value based on the column | Aaron Patterson | 2010-10-11 | 1 | -1/+1 |
| | |||||
* | Honor distinct option when used with count operation after group clause ↵ | Marcelo Giorgi | 2010-10-11 | 1 | -4/+8 |
| | | | | [#5721 state:resolved] | ||||
* | [#5441 state:resolved] refactoring code to determine aggregate column | Aaron Patterson | 2010-09-30 | 1 | -11/+14 |
| | |||||
* | refactoring to remove crazy logic | Aaron Patterson | 2010-09-28 | 1 | -1/+5 |
| | |||||
* | fisting the postgresql tests | Aaron Patterson | 2010-09-28 | 1 | -1/+2 |
| | |||||
* | avoid calling to_sql when we can | Aaron Patterson | 2010-09-28 | 1 | -3/+3 |
| | |||||
* | removing an inject + merge in favor of Hash#[] | Aaron Patterson | 2010-09-28 | 1 | -1/+1 |
| | |||||
* | Goodbye inject, hello map. | Emilio Tagua | 2010-09-22 | 1 | -7/+5 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | return is not needed here | Neeraj Singh | 2010-09-09 | 1 | -2/+2 |
| | |||||
* | remove unnecessary call | Neeraj Singh | 2010-09-09 | 1 | -1/+0 |
| | | | | if operation is count then column_name will never be blank | ||||
* | attributes should be constructed with table objects | Aaron Patterson | 2010-09-07 | 1 | -1/+1 |
| | |||||
* | attributes should be associated with tables | Aaron Patterson | 2010-09-07 | 1 | -1/+1 |
| | |||||
* | Use new finders syntax in docs. | Emilio Tagua | 2010-09-01 | 1 | -2/+2 |
| | |||||
* | minor formatting fixes | Neeraj Singh | 2010-08-25 | 1 | -8/+6 |
| | |||||
* | refactoring to remove duplicate logic | Aaron Patterson | 2010-08-18 | 1 | -4/+3 |
| | |||||
* | call to present? is not necessary | Aaron Patterson | 2010-08-18 | 1 | -2/+1 |
| | |||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -26/+26 |
| | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | adds missing requires for Object#try | Xavier Noria | 2010-08-09 | 1 | -0/+1 |
| | |||||
* | ensuring that description does not exceed 100 columns | Neeraj Singh | 2010-08-02 | 1 | -27/+52 |
| | |||||
* | revises the rdoc of #average according to 5f3bd55, and realigns when clauses | Xavier Noria | 2010-05-12 | 1 | -5/+4 |
| |