Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| * | | | | @stale_state should be nil when a model isn't saved. | kennyj | 2012-04-13 | 3 | -3/+4 |
| | | | | | |||||
* | | | | | extract #with_scope and #with_exclusive_scope to ↵ | Jon Leighton | 2012-04-25 | 2 | -122/+4 |
| | | | | | | | | | | | | | | | | | | | | active_record_deprecated_finders | ||||
* | | | | | extract deprecated code | Jon Leighton | 2012-04-25 | 1 | -4/+2 |
| | | | | | |||||
* | | | | | Extract deprecated code | Jon Leighton | 2012-04-25 | 1 | -9/+8 |
| | | | | | |||||
* | | | | | fix interpolation for hash merging | Jon Leighton | 2012-04-25 | 2 | -20/+26 |
| | | | | | |||||
* | | | | | allow merging a single where value | Jon Leighton | 2012-04-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | extract to active_record_deprecated_finders | Jon Leighton | 2012-04-25 | 1 | -6/+5 |
| | | | | | |||||
* | | | | | giving a hash to default scope should not be deprecated (well, not for this ↵ | Jon Leighton | 2012-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | reason) | ||||
* | | | | | Merge pull request #5976 from aderyabin/fix1 | Jeremy Kemper | 2012-04-25 | 1 | -5/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Duplicate quote_table_name method | ||||
| * | | | | | already defined in quoting | Andrey Deryabin | 2012-04-25 | 1 | -5/+0 |
| | |_|/ / | |/| | | | |||||
* / | | | | cleanliness in method parameters | Andrey Deryabin | 2012-04-25 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #5887 from mcrowe/document-relation-merge | Vijay Dev | 2012-04-23 | 1 | -0/+14 |
|\ \ \ \ | | | | | | | | | | | Add documentation to the SpawnMethods#merge method. | ||||
| * | | | | Add documentation to the SpawnMethods#merge method. | Mitch Crowe | 2012-04-17 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | be sure to currectly fetch PK name from MySQL even if the PK has some custom ↵ | Akira Matsuda | 2012-04-19 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | option | ||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-18 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Revert "Added documentation to explain what happens if you don't set any ↵ | Rodrigo Flores | 2012-04-12 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values for the dependent option on has_many" This reverts commit 820a677d8622a540188704941a31871ed4d61461. | ||||
| * | | | | Added documentation to explain what happens if you don't set any values for ↵ | Rodrigo Flores | 2012-04-12 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | the dependent option on has_many | ||||
| * | | | | Fix typo on the add_index. | kennyj | 2012-04-13 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | opening a connection will block if the pool is full | Aaron Patterson | 2012-04-15 | 1 | -20/+39 |
| | | | | |||||
* | | | | Automatically create indexes for references/belongs_to statements in migrations. | Joshua Wood | 2012-04-14 | 3 | -5/+23 |
| | | | |