aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* return value of block is returnedAaron Patterson2012-04-301-2/+5
|
* only yield to finder block if something is foundAaron Patterson2012-04-301-1/+1
|
* Fix PR #6091Andrew White2012-04-301-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#idstwinturbo2012-04-301-0/+10
|
* Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-5/+3
|\ | | | | Remove some unused variable assignments
| * Remove unused assignmentsMark Rushakoff2012-04-291-5/+3
| |
* | Removed extraneous .present? check for AR::Base#reloadJeremy Friesen2012-04-291-1/+1
| |
* | Removed deprecation warning for #find as a result of AR::Base#reloadJeremy Friesen2012-04-291-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_partitioningAaron Patterson2012-04-273-9/+44
|\ | | | | Support postgresql partitioning by making INSERT RETURNING optional
| * refactor configuration of insert_returningDoug Cole2012-04-071-14/+4
| |
| * pick better names and add a little documentationDoug Cole2012-04-011-8/+16
| |
| * refactorDoug Cole2012-03-311-13/+8
| |
| * update mysql for new exec_insert signatureDoug Cole2012-03-311-1/+1
| |
| * add use_returning as a postgresql connection configDoug Cole2012-03-312-6/+48
| |
* | Revert "Merge pull request #5995 from kennyj/fix_5847-3"José Valim2012-04-271-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 Leighton2012-04-271-2/+6
| | | | | | | | Base#scoped
* | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵Jon Leighton2012-04-271-1/+1
| | | | | | | | things
* | fix tests for SQLite3AdapterAndrey Deryabin2012-04-271-1/+0
| |
* | renamed class SQLiteColumn to SQLite3ColumnAndrey Deryabin2012-04-271-3/+3
| |
* | removed tail of old sqlite versionsAndrey Deryabin2012-04-271-9/+9
| |
* | fix SQLite3Adapter docAndrey Deryabin2012-04-271-2/+2
| |
* | Upgrade sqlite3 version to 1.3.6Andrey Deryabin2012-04-271-1/+1
| |
* | merged sqlite and sqlite3 adaptersAndrey Deryabin2012-04-272-546/+538
| |
* | EXPLAIN only for sqlite3Andrey Deryabin2012-04-262-24/+25
| |
* | Merge pull request #5995 from kennyj/fix_5847-3Jon Leighton2012-04-261-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.kennyj2012-04-261-0/+5
| | |
* | | remove deprecate #update_all usageJon Leighton2012-04-262-3/+3
|/ /
* | Merge pull request #5973 from academia-edu/masterAaron Patterson2012-04-251-2/+1
|\ \ | | | | | | Always quote hstore keys and values
| * | Restore .to_s to escape_hstoreRyan Fitzgerald2012-04-241-1/+1
| | |
| * | Always quote hstore keys and valuesRyan Fitzgerald2012-04-241-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 Leighton2012-04-251-0/+13
|\ \ \
| * | | Define array methods in ActiveRecord::Associations::CollectionProxyJorge Bejar2012-04-181-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 Leighton2012-04-254-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.kennyj2012-04-131-1/+2
| | | | |
| * | | | @stale_state should be nil when a model isn't saved.kennyj2012-04-133-3/+4
| | | | |
* | | | | extract #with_scope and #with_exclusive_scope to ↵Jon Leighton2012-04-252-122/+4
| | | | | | | | | | | | | | | | | | | | active_record_deprecated_finders
* | | | | extract deprecated codeJon Leighton2012-04-251-4/+2
| | | | |
* | | | | Extract deprecated codeJon Leighton2012-04-251-9/+8
| | | | |
* | | | | fix interpolation for hash mergingJon Leighton2012-04-252-20/+26
| | | | |
* | | | | allow merging a single where valueJon Leighton2012-04-251-1/+1
| | | | |
* | | | | extract to active_record_deprecated_findersJon Leighton2012-04-251-6/+5
| | | | |
* | | | | giving a hash to default scope should not be deprecated (well, not for this ↵Jon Leighton2012-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | reason)
* | | | | Merge pull request #5976 from aderyabin/fix1Jeremy Kemper2012-04-251-5/+0
|\ \ \ \ \ | | | | | | | | | | | | Duplicate quote_table_name method
| * | | | | already defined in quotingAndrey Deryabin2012-04-251-5/+0
| | |_|/ / | |/| | |
* / | | | cleanliness in method parametersAndrey Deryabin2012-04-251-1/+1
|/ / / /
* | | | Merge pull request #5887 from mcrowe/document-relation-mergeVijay Dev2012-04-231-0/+14
|\ \ \ \ | | | | | | | | | | Add documentation to the SpawnMethods#merge method.
| * | | | Add documentation to the SpawnMethods#merge method.Mitch Crowe2012-04-171-0/+14
| | | | |
* | | | | be sure to currectly fetch PK name from MySQL even if the PK has some custom ↵Akira Matsuda2012-04-191-1/+1
|/ / / / | | | | | | | | | | | | option
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-181-1/+1
|\ \ \ \
| * | | | Revert "Added documentation to explain what happens if you don't set any ↵Rodrigo Flores2012-04-121-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values for the dependent option on has_many" This reverts commit 820a677d8622a540188704941a31871ed4d61461.