Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | Additional fix for CVE-2012-2661 | Ernie Miller | 2012-06-11 | 1 | -3/+3 |
| | | | | | | | | While the patched PredicateBuilder in 3.1.5 prevents a user from specifying a table name using the `table.column` format, it doesn't protect against the nesting of hashes changing the table context in the next call to build_from_hash. This fix covers this case as well. | ||||
* | Merge pull request #6698 from yahonda/address_ora_911_master | Rafael Mendonça França | 2012-06-11 | 1 | -1/+1 |
| | | | | Address ORA-00911 errors because of the heading underscore. | ||||
* | Merge pull request #6521 from Empact/throw-result | Rafael Mendonça França | 2012-06-10 | 1 | -0/+2 |
| | | | | | | Fix that #exists? can blow up with ThrowResult exception Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | ||||
* | Minimal change to query generation of exists? that makes SQLServer and ↵ | iaddict | 2012-06-10 | 1 | -1/+1 |
| | | | | | | | others happy that do not work without a column alias. Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | ||||
* | Merge pull request #6695 from kennyj/fix_6635 | Rafael Mendonça França | 2012-06-10 | 1 | -5/+5 |
| | | | | Fix #6635. We should call Scoping methods, before calling Array methods. | ||||
* | predicate builder should not recurse for determining where columns. | Aaron Patterson | 2012-05-30 | 1 | -3/+3 |
| | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661 | ||||
* | Return false for exists? with new records - fixes #6199. | Andrew White | 2012-05-10 | 1 | -2/+1 |
| | | | | (cherry picked from commit fa21b73ebb8339ad388f149c817c433b6254d490) | ||||
* | fix activerecord query_method regression with offset into Fixnum | Denis Jean | 2012-03-13 | 1 | -1/+1 |
| | | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API | ||||
* | Add dynamic find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 1 | -1/+1 |
| | | | | | | | | | (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/dynamic_finder_match.rb | ||||
* | prepared statements can be disabled | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | |||||
* | select doesn't take multiple arguments - fixes #4539 [ci skip] | Vijay Dev | 2012-01-19 | 1 | -2/+2 |
| | | | | | Didn't cherry pick the master commit because this one already had some of the fixes made in master. | ||||
* | add documentation explaining reorder behavior | Matt Jones | 2012-01-11 | 1 | -0/+10 |
| | |||||
* | Merge pull request #4282 from edgecase/order_after_reorder | Aaron Patterson | 2012-01-04 | 3 | -7/+17 |
| | | | | correctly handle order calls after a reorder | ||||
* | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids | Aaron Patterson | 2011-12-28 | 1 | -1/+1 |
| | | | | allow reorder to affect eager loading correctly | ||||
* | Remove empty line. | Marcos Tapajós | 2011-12-28 | 1 | -1/+0 |
| | |||||
* | Closes #4208 | Marcos Tapajós | 2011-12-27 | 1 | -2/+3 |
| | |||||
* | Make ActiveRecord::Relation#pluck work with serialized attributes | Jon Leighton | 2011-12-22 | 1 | -4/+4 |
| | |||||
* | Do not raise an exception if an invalid route was generated automatically. | José Valim | 2011-12-16 | 1 | -1/+1 |
| | |||||
* | Set up delegations also for to_a and arel branches. | José Valim | 2011-12-15 | 1 | -2/+9 |
| | |||||
* | Move delegation reponsibilities of Relation to a module. Also precompile ↵ | José Valim | 2011-12-15 | 1 | -0/+42 |
| | | | | method missing calls for rofscale. | ||||
* | ActiveRecord::Relation#pluck method | Bogdan Gusiev | 2011-11-30 | 1 | -0/+17 |
| | |||||
* | pushing caching and visitors down to the connection | Aaron Patterson | 2011-11-19 | 1 | -1/+1 |
| | |||||
* | Fixes issue #3483, regarding using a mixture of ranges and discrete values ↵ | Ryan Naughton | 2011-11-14 | 1 | -6/+8 |
| | | | | in find conditions. Paired with Joey Schoblaska. | ||||
* | exclude ORDER BY clause when querying Relation#exists? | Akira Matsuda | 2011-11-09 | 1 | -1/+1 |
| | |||||
* | Add ActiveRecord::Relation#uniq for toggling DISTINCT in the SQL query | Jon Leighton | 2011-11-05 | 1 | -6/+24 |
| | |||||
* | copy edits 908f2616 | Vijay Dev | 2011-09-20 | 1 | -4/+4 |
| | |||||
* | Document ActiveRecord::QueryMethods#select | Ryan Bigg | 2011-09-17 | 1 | -0/+29 |
| | |||||
* | minor edit | Vijay Dev | 2011-09-14 | 1 | -1/+1 |
| | |||||
* | Add documentation for the extending method in ActiveRecord:QueryMethods | Ryan Bigg | 2011-09-14 | 1 | -0/+36 |
| | |||||
* | Merge pull request #2485 from akaspick/exists_fix | Jon Leighton | 2011-09-07 | 1 | -1/+3 |
|\ | | | | | fix exists? to return false if passed nil (which may come from a missing | ||||
| * | fix exists? to return false if passed nil (which may come from a missing URL ↵ | Andrew Kaspick | 2011-08-10 | 1 | -1/+3 |
| | | | | | | | | param) | ||||
* | | Use LIMIT sql word in last when it's possible | Damien Mathieu | 2011-09-05 | 1 | -1/+5 |
| | | |||||
* | | use LIMIT SQL word in first - Closes #2783 | Damien Mathieu | 2011-09-05 | 1 | -1/+1 |
| | | |||||
* | | We need to recorder here. Need to drop the order from default scope. | Arun Agrawal | 2011-09-05 | 1 | -1/+1 |
| | | | | | | Fixes #2832 | ||||
* | | Revert "Fixes bug in ActiveRecord::QueryMethods, #1697" | Jon Leighton | 2011-09-04 | 1 | -2/+4 |
| | | | | | | | | | | | | This reverts commit 0df27c98d982ec87d2fb48cfda82694eb267993e. Reverted due to failing test, see #2845. | ||||
* | | Fixes bug in ActiveRecord::QueryMethods, #1697 | Joshua Wehner | 2011-08-31 | 1 | -4/+2 |
| | | | | | | Replace split on comma with a regexp that will reverse all ASC/DESC specifically | ||||
* | | The join_nodes must be passed to the JoinDependency initializer and ↵ | Jon Leighton | 2011-08-29 | 1 | -7/+2 |
| | | | | | | | | therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556. | ||||
* | | Fix PredicateBuilder clobbering select_values in subquery. | Ernie Miller | 2011-08-20 | 1 | -1/+1 |
| | | |||||
* | | Fix assumption of primary key name in PredicateBuilder subquery. | Ernie Miller | 2011-08-20 | 1 | -1/+1 |
|/ | |||||
* | Make it the responsibility of the connection to hold onto an ARel visitor ↵ | Jon Leighton | 2011-08-08 | 2 | -5/+5 |
| | | | | 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. | ||||
* | Revert "Merge pull request #2309 from smasry/master" | Jon Leighton | 2011-07-28 | 1 | -1/+1 |
| | | | | | | | This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d. Reason: the change broke the build. | ||||
* | Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697 | Samer Masry | 2011-07-27 | 1 | -1/+1 |
| | |||||
* | Fixed failing query when performing calculation with having based on select. | Dmitriy Kiriyenko | 2011-07-27 | 1 | -0/+1 |
| | |||||
* | Revert "allow select to have multiple arguments" | Piotr Sarnacki | 2011-07-26 | 1 | -6/+3 |
| | | | | | | | This reverts commit 04cc446d178653d362510e79a22db5300d463161. I reverted it because apparently we want to use: select([:a, :b]) instead of select(:a, :b), but there was no tests for that form. | ||||
* | allow select to have multiple arguments | Sławosz Sławiński | 2011-07-26 | 1 | -3/+6 |
| | |||||
* | Ordering with extra spaces was raising a SQL exception | Franck Verrot | 2011-07-24 | 1 | -0/+1 |
| | |||||
* | avoid Symbol#to_proc | Vijay Dev | 2011-07-20 | 1 | -1/+1 |
| | |||||
* | ActiveRecord: Fix eager loading so that giving a blank order clause ↵ | Elliot Winkler | 2011-07-18 | 1 | -1/+1 |
| | | | | generates valid SQL |