aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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.
| * | | | | | Added documentation to explain what happens if you don't set any values for ↵Rodrigo Flores2012-04-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the dependent option on has_many
| * | | | | | Fix typo on the add_index.kennyj2012-04-131-1/+1
| |/ / / / /
* | | | | | opening a connection will block if the pool is fullAaron Patterson2012-04-151-20/+39
| | | | | |
* | | | | | Automatically create indexes for references/belongs_to statements in migrations.Joshua Wood2012-04-142-4/+21
| | | | | |
* | | | | | extract deprecated code for #find, #first, #last, #allJon Leighton2012-04-131-105/+36
| | | | | |
* | | | | | extract deprecated #calculate codeJon Leighton2012-04-131-83/+25
| | | | | |
* | | | | | move code out to active_record_deprecated_findersJon Leighton2012-04-131-7/+2
| | | | | |
* | | | | | Merge pull request #5832 from kennyj/fix_5267Jon Leighton2012-04-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix a wrong return value from reset_sequence_name method.
| * | | | | | Fix wrong return value from reset_sequence_name method.kennyj2012-04-141-1/+1
| | | | | | |
* | | | | | | move some of the update_all implementation to active_record_deprecated_findersJon Leighton2012-04-131-27/+14
| | | | | | |
* | | | | | | now we can just manipulate the values hash in #only and #exceptJon Leighton2012-04-133-36/+13
| | | | | | |
* | | | | | | use a hash to store relation valuesJon Leighton2012-04-134-45/+67
|/ / / / / /
* | | | | | doesn't make sense for select! to take a blockJon Leighton2012-04-131-8/+3
| | | | | |