Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5494 from ↵ | Jon Leighton | 2012-05-05 | 1 | -1/+8 |
|\ | | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge ActiveRecord::Relation - maintain context of joined associations on merges | ||||
| * | Allow ActiveRecord::Relation merges to maintain context of joined associations | Jared Armstrong | 2012-05-04 | 1 | -1/+8 |
| | | |||||
* | | Duplicate column_defaults properly (closes #6115) | Piotr Sarnacki | 2012-05-04 | 2 | -1/+8 |
| | | |||||
* | | Merge pull request #3713 from kf8a/master | Aaron Patterson | 2012-05-04 | 1 | -0/+12 |
|\ \ | | | | | | | postgresql adapter should quote not a number and infinity correctly for float columns | ||||
| * | | postgresql adapter handles quoting of not a number (NaN) and Infinity | Sven Bohm | 2011-11-21 | 1 | -0/+12 |
| | | | |||||
* | | | extract deprecated dynamic methods | Jon Leighton | 2012-05-04 | 1 | -2/+2 |
| | | | |||||
* | | | extract code from AR::Base | Jon Leighton | 2012-05-04 | 1 | -2/+2 |
| | | | |||||
* | | | clean up implementation of dynamic methods. use method compilation etc. | Jon Leighton | 2012-05-04 | 2 | -109/+2 |
| |/ |/| | |||||
* | | Fix issue with private kernel methods and collection associations. Closes #2508 | Carlos Antonio da Silva | 2012-05-02 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | Change CollectionProxy#method_missing to use scoped.public_send, to avoid a problem described in issue #2508 when trying to use class methods with names like "open", that clash with private kernel methods. Also changed the dynamic matcher instantiator to send straight to scoped, to avoid another roundtrip to method_missing. | ||||
* | | Introducing `take` as a replacement to the old behavior of `first` | Marcelo Silveira | 2012-05-02 | 1 | -2/+24 |
| | | |||||
* | | Made `first` finder consistent among database engines by adding a | Marcelo Silveira | 2012-05-02 | 1 | -0/+6 |
| | | | | | | | | default order clause (fixes #5103) | ||||
* | | Refactored remove_column | Edgars Beigarts | 2012-05-02 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #6089 from frodsan/delete_all_limit | Aaron Patterson | 2012-05-01 | 1 | -0/+4 |
|\ \ | | | | | | | delete_all raise an error if a limit is provided - fixes #4979 | ||||
| * | | delete_all raise an error if a limit is provided - fixes #4979 | Francesco Rodriguez | 2012-04-30 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #6092 from ↵ | Aaron Patterson | 2012-05-01 | 1 | -0/+24 |
|\ \ \ | | | | | | | | | | | | | | | | | jsanders/issue_4001_error_typecasting_non_integer_castable Don't type cast values that don't respond to to_i to 1 | ||||
| * | | | Don't type cast values that don't respond to to_i to 1 | James Sanders & Jason Noble | 2012-04-30 | 1 | -0/+24 |
| |/ / | |||||
* | | | remove useless assertions | Aaron Patterson | 2012-04-30 | 1 | -10/+3 |
| | | | |||||
* | | | return value of block is returned | Aaron Patterson | 2012-04-30 | 1 | -1/+9 |
| | | | |||||
* | | | only yield to finder block if something is found | Aaron Patterson | 2012-04-30 | 1 | -0/+10 |
| | | | |||||
* | | | Fix PR #6091 | Andrew White | 2012-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | 1. ActiveRecord::Base is not ActiveRecord::Relation 2. The order of records from an SQL query is uncertain without an ORDER clause 3. Run your own tests when submitting a pull request | ||||
* | | | Add ActiveRecord::Base#ids | twinturbo | 2012-04-30 | 1 | -0/+4 |
|/ / | |||||
* | | Build fix for observed_classes | Arun Agrawal | 2012-04-30 | 1 | -1/+1 |
| | | | | | | | | | | introduced here bad44e4f8f690039bd0db92ac25f10af536c6e71 | ||||
* | | Remove unused assignments from activerecord tests | Mark Rushakoff | 2012-04-29 | 4 | -6/+2 |
| | | |||||
* | | Merge pull request #6028 from sikachu/master-fix_plpgsql | Aaron Patterson | 2012-04-28 | 1 | -21/+29 |
|\ \ | | | | | | | Create plpgsql language if not available | ||||
| * | | Create plpgsql language if not available | Prem Sichanugrist | 2012-04-27 | 1 | -21/+29 |
| | | | | | | | | | | | | | | | This should fix the problem in Travis CI server. (http://travis-ci.org/#!/rails/rails/jobs/1194988) | ||||
* | | | removed deprecation warnings | Andrey Deryabin | 2012-04-28 | 2 | -3/+3 |
|/ / | |||||
* | | Merge pull request #5698 from dougcole/support_postgresql_partitioning | Aaron Patterson | 2012-04-27 | 2 | -2/+58 |
|\ \ | | | | | | | Support postgresql partitioning by making INSERT RETURNING optional | ||||
| * | | refactor configuration of insert_returning | Doug Cole | 2012-04-07 | 1 | -19/+15 |
| | | | |||||
| * | | pick better names and add a little documentation | Doug Cole | 2012-04-01 | 1 | -8/+8 |
| | | | |||||
| * | | improve test coverage | Doug Cole | 2012-03-31 | 1 | -0/+26 |
| | | | |||||
| * | | add use_returning as a postgresql connection config | Doug Cole | 2012-03-31 | 2 | -2/+36 |
| | | | |||||
* | | | remove deprecated calls | Jon Leighton | 2012-04-27 | 12 | -94/+93 |
| | | | |||||
* | | | more deprecations manually fixed | Jon Leighton | 2012-04-27 | 3 | -58/+53 |
| | | | |||||
* | | | find and replace deprecated keys | Jon Leighton | 2012-04-27 | 21 | -220/+220 |
| | | | |||||
* | | | allow AssociationProxy#scoped to take options so that API is the same as ↵ | Jon Leighton | 2012-04-27 | 1 | -0/+4 |
| | | | | | | | | | | | | Base#scoped | ||||
* | | | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵ | Jon Leighton | 2012-04-27 | 29 | -414/+332 |
| | | | | | | | | | | | | things | ||||
* | | | remove unnecessary test code | Jon Leighton | 2012-04-27 | 2 | -9/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:rails/rails | Jon Leighton | 2012-04-27 | 4 | -4/+4 |
|\ \ \ | |||||
| * | | | fix tests for SQLite3Adapter | Andrey Deryabin | 2012-04-27 | 3 | -3/+3 |
| | | | | |||||
| * | | | fix tests for sqlite3 | Andrey Deryabin | 2012-04-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | don't need this test | Jon Leighton | 2012-04-26 | 1 | -5/+0 |
|/ / / | |||||
* | | | remove calls to find(:first), find(:last) and find(:all) | Jon Leighton | 2012-04-26 | 27 | -119/+114 |
| | | | |||||
* | | | remove deprecate #all usage | Jon Leighton | 2012-04-26 | 4 | -7/+3 |
| | | | |||||
* | | | remove deprecated #first calls | Jon Leighton | 2012-04-26 | 3 | -28/+3 |
| | | | |||||
* | | | remove deprecate #calculate calls | Jon Leighton | 2012-04-26 | 11 | -146/+72 |
| | | | |||||
* | | | remove deprecated #find_in_batches calls | Jon Leighton | 2012-04-26 | 2 | -15/+3 |
| | | | |||||
* | | | remove deprecate #update_all usage | Jon Leighton | 2012-04-26 | 2 | -9/+3 |
| | | | |||||
* | | | fix #scoped deprecations | Jon Leighton | 2012-04-26 | 4 | -15/+16 |
| | | | |||||
* | | | remove deprecated scope stuff | Jon Leighton | 2012-04-26 | 5 | -54/+2 |
| | | | |||||
* | | | default_scope with a hash is deprecated | Jon Leighton | 2012-04-26 | 1 | -10/+0 |
| | | |