Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow ActiveRecord::Relation merges to maintain context of joined associations | Jared Armstrong | 2012-05-04 | 3 | -5/+35 |
| | |||||
* | Fix issue with private kernel methods and collection associations. Closes #2508 | Carlos Antonio da Silva | 2012-05-02 | 1 | -2/+2 |
| | | | | | | | | 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. | ||||
* | Use arel nodes instead of raw sql | Marcelo Silveira | 2012-05-02 | 2 | -4/+7 |
| | |||||
* | Use Array#first instead of Array#[0] | Marcelo Silveira | 2012-05-02 | 1 | -5/+5 |
| | |||||
* | Introducing `take` as a replacement to the old behavior of `first` | Marcelo Silveira | 2012-05-02 | 2 | -1/+28 |
| | |||||
* | Document `last`, check for primary key on default order and use quoted table ↵ | Marcelo Silveira | 2012-05-02 | 1 | -2/+5 |
| | | | | and column names | ||||
* | Made `first` finder consistent among database engines by adding a | Marcelo Silveira | 2012-05-02 | 1 | -2/+18 |
| | | | | default order clause (fixes #5103) | ||||
* | Refactored remove_column | Edgars Beigarts | 2012-05-02 | 3 | -4/+2 |
| | |||||
* | Merge pull request #6089 from frodsan/delete_all_limit | Aaron Patterson | 2012-05-01 | 1 | -0/+2 |
|\ | | | | | 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/+2 |
| | | |||||
* | | Merge pull request #6092 from ↵ | Aaron Patterson | 2012-05-01 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | 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 | -1/+1 |
| |/ | |||||
* | | more edits [ci skip] | Vijay Dev | 2012-05-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-01 | 2 | -10/+11 |
|\ \ | |||||
| * | | add ActiveRecord::RecordInvalid to exceptions | Hrvoje Šimić | 2012-04-30 | 1 | -9/+10 |
| | | | | | | | | | | | | sort the exception names alphabetically | ||||
| * | | More using <tt>x</tt> instead of +x+ when the latter renders improperly. | Mark Rushakoff | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
* | | | return value of block is returned | Aaron Patterson | 2012-04-30 | 1 | -2/+5 |
| | | | |||||
* | | | only yield to finder block if something is found | Aaron Patterson | 2012-04-30 | 1 | -1/+1 |
| | | | |||||
* | | | 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/+10 |
| |/ |/| | |||||
* | | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 1 | -5/+3 |
|\ \ | | | | | | | Remove some unused variable assignments | ||||
| * | | Remove unused assignments | Mark Rushakoff | 2012-04-29 | 1 | -5/+3 |
| |/ | |||||
* | | 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 #5698 from dougcole/support_postgresql_partitioning | Aaron Patterson | 2012-04-27 | 3 | -9/+44 |
|\ | | | | | Support postgresql partitioning by making INSERT RETURNING optional | ||||
| * | refactor configuration of insert_returning | Doug Cole | 2012-04-07 | 1 | -14/+4 |
| | | |||||
| * | pick better names and add a little documentation | Doug Cole | 2012-04-01 | 1 | -8/+16 |
| | | |||||
| * | 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 | 2 | -6/+48 |
| | | |||||
* | | 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. | ||||
* | | allow AssociationProxy#scoped to take options so that API is the same as ↵ | Jon Leighton | 2012-04-27 | 1 | -2/+6 |
| | | | | | | | | Base#scoped | ||||
* | | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵ | Jon Leighton | 2012-04-27 | 1 | -1/+1 |
| | | | | | | | | things | ||||
* | | fix tests for SQLite3Adapter | Andrey Deryabin | 2012-04-27 | 1 | -1/+0 |
| | | |||||
* | | 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 |
| | | |||||
* | | merged sqlite and sqlite3 adapters | Andrey Deryabin | 2012-04-27 | 2 | -546/+538 |
| | | |||||
* | | 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 | 2 | -3/+3 |
|/ / | |||||
* | | Merge pull request #5973 from academia-edu/master | Aaron Patterson | 2012-04-25 | 1 | -2/+1 |
|\ \ | | | | | | | 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 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Merge remote-tracking branch 'kennyj/fix_5563' | Jon Leighton | 2012-04-25 | 4 | -4/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/belongs_to_associations_test.rb | ||||
| * | | | | Fix #5563. Should reflect the most recent change to either of association / id. | kennyj | 2012-04-13 | 1 | -1/+2 |
| | | | | |