Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 5 | -11/+5 |
|\ | | | | | Remove some unused variable assignments | ||||
| * | Remove unused assignments | Mark Rushakoff | 2012-04-29 | 1 | -5/+3 |
| | | |||||
| * | Remove unused assignments from activerecord tests | Mark Rushakoff | 2012-04-29 | 4 | -6/+2 |
| | | |||||
* | | Removed extraneous .present? check for AR::Base#reload | Jeremy Friesen | 2012-04-29 | 1 | -1/+1 |
| | | |||||
* | | Removed deprecation warning for #find as a result of AR::Base#reload | Jeremy Friesen | 2012-04-29 | 1 | -1/+7 |
|/ | | | | | Cleaned up "DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it." | ||||
* | 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 | 5 | -11/+102 |
|\ | | | | | Support postgresql partitioning by making INSERT RETURNING optional | ||||
| * | refactor configuration of insert_returning | Doug Cole | 2012-04-07 | 2 | -33/+19 |
| | | |||||
| * | pick better names and add a little documentation | Doug Cole | 2012-04-01 | 2 | -16/+24 |
| | | |||||
| * | improve test coverage | Doug Cole | 2012-03-31 | 1 | -0/+26 |
| | | |||||
| * | refactor | Doug Cole | 2012-03-31 | 1 | -13/+8 |
| | | |||||
| * | update mysql for new exec_insert signature | Doug Cole | 2012-03-31 | 1 | -1/+1 |
| | | |||||
| * | add use_returning as a postgresql connection config | Doug Cole | 2012-03-31 | 4 | -8/+84 |
| | | |||||
* | | remove deprecated calls | Jon Leighton | 2012-04-27 | 12 | -94/+93 |
| | | |||||
* | | Revert "Merge pull request #5995 from kennyj/fix_5847-3" | José Valim | 2012-04-27 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | Active Record should be lazy loaded and this pull request forced Active Record to always be loaded after initialization. This reverts commit 8cd14c0bc9f9429f03d1181912355d2f48b98157, reversing changes made to 2f0c8c52e66f1a2a3d1c00efc207f227124e96c2. | ||||
* | | 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 | 2 | -2/+10 |
| | | | | | | | | Base#scoped | ||||
* | | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵ | Jon Leighton | 2012-04-27 | 30 | -415/+333 |
| | | | | | | | | 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 | 7 | -552/+543 |
|\ \ | |||||
| * | | fix tests for SQLite3Adapter | Andrey Deryabin | 2012-04-27 | 4 | -4/+3 |
| | | | |||||
| * | | renamed class SQLiteColumn to SQLite3Column | Andrey Deryabin | 2012-04-27 | 1 | -3/+3 |
| | | | |||||
| * | | removed tail of old sqlite versions | Andrey Deryabin | 2012-04-27 | 1 | -9/+9 |
| | | | |||||
| * | | fix SQLite3Adapter doc | Andrey Deryabin | 2012-04-27 | 1 | -2/+2 |
| | | | |||||
| * | | Upgrade sqlite3 version to 1.3.6 | Andrey Deryabin | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | fix tests for sqlite3 | Andrey Deryabin | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | merged sqlite and sqlite3 adapters | Andrey Deryabin | 2012-04-27 | 2 | -546/+538 |
| | | | |||||
* | | | 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 |
| | | |||||
* | | EXPLAIN only for sqlite3 | Andrey Deryabin | 2012-04-26 | 2 | -24/+25 |
| | | |||||
* | | Merge pull request #5995 from kennyj/fix_5847-3 | Jon Leighton | 2012-04-26 | 1 | -0/+5 |
|\ \ | | | | | | | Fix #5847 and #4045. Load AR::Base before loading an application model. | ||||
| * | | Fix #5847 and #4045. Load AR::Base before loading an application model. | kennyj | 2012-04-26 | 1 | -0/+5 |
| | | | |||||
* | | | remove deprecate #update_all usage | Jon Leighton | 2012-04-26 | 4 | -12/+6 |
| | | | |||||
* | | | 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 |
|/ / | |||||
* | | remove unused method | Jon Leighton | 2012-04-25 | 1 | -6/+0 |
| | | |||||
* | | remove tests for #with_scope (it's now deprecated) | Jon Leighton | 2012-04-25 | 13 | -767/+6 |
| | | |||||
* | | Merge pull request #5973 from academia-edu/master | Aaron Patterson | 2012-04-25 | 2 | -3/+10 |
|\ \ | | | | | | | Always quote hstore keys and values | ||||
| * | | Restore .to_s to escape_hstore | Ryan Fitzgerald | 2012-04-24 | 1 | -1/+1 |
| | | | |||||
| * | | Always quote hstore keys and values | Ryan Fitzgerald | 2012-04-24 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | escape_hstore uses quotation marks around keys and values only if it seems necessary. However, it currently breaks in the presence of some non-ASCII characters. Instead of trying to guess exactly which characters are safe, it seems better to always use quotes. | ||||
* | | | Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy' | Jon Leighton | 2012-04-25 | 1 | -0/+13 |
|\ \ \ | |||||
| * | | | Define array methods in ActiveRecord::Associations::CollectionProxy | Jorge Bejar | 2012-04-18 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | if they are not defined or delegated. In this way, we have a performance boost invoking some array methods which are not defined in CollectionAssociation. |