aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | remove tests for #with_scope (it's now deprecated)Jon Leighton2012-04-2513-767/+6
| |
* | Merge pull request #5973 from academia-edu/masterAaron Patterson2012-04-252-3/+10
|\ \ | | | | | | 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-242-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 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-255-4/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-132-1/+13
| | | | |
| * | | | @stale_state should be nil when a model isn't saved.kennyj2012-04-133-3/+4
| | | | |
* | | | | add missing testJon Leighton2012-04-251-0/+12
| | | | |
* | | | | extract #with_scope and #with_exclusive_scope to ↵Jon Leighton2012-04-252-122/+4
| | | | | | | | | | | | | | | | | | | | active_record_deprecated_finders
* | | | | extract deprecated codeJon Leighton2012-04-253-11/+4
| | | | |
* | | | | Extract deprecated codeJon Leighton2012-04-252-9/+13
| | | | |
* | | | | fix interpolation for hash mergingJon Leighton2012-04-253-24/+39
| | | | |
* | | | | allow merging a single where valueJon Leighton2012-04-252-1/+7
| | | | |
* | | | | 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-252-3/+3
| | | | | | | | | | | | | | | | | | | | 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
|/ / / /
* | | | Fix build. It seems that the Mocha's behavior were changed.kennyj2012-04-252-3/+9
| | | |
* | | | 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-192-1/+31
|/ / / / | | | | | | | | | | | | 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
| |/ / /
* | | | Update Rails 3.2.3 release date in changelogs as March 30, 2012Michael de Silva2012-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | The release date details have been taken from http://weblog.rubyonrails.org/2012/3/30/ann-rails-3-2-3-has-been-released/
* | | | opening a connection will block if the pool is fullAaron Patterson2012-04-152-20/+63
| | | |
* | | | Automatically create indexes for references/belongs_to statements in migrations.Joshua Wood2012-04-146-5/+145
| | | |
* | | | Merge pull request #5837 from yahonda/new_sequence_name_is_too_longJon Leighton2012-04-141-4/+4
|\ \ \ \ | | | | | | | | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix
| * | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffixYasuo Honda2012-04-131-4/+4
| | | | |
* | | | | 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
| | | | |
* | | | | fix testsJon Leighton2012-04-137-81/+74
| | | | |
* | | | | Merge pull request #5832 from kennyj/fix_5267Jon Leighton2012-04-132-3/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix a wrong return value from reset_sequence_name method.
| * | | | | Fix wrong return value from reset_sequence_name method.kennyj2012-04-142-3/+7
| | | | | |
* | | | | | 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-134-36/+26
| | | | | |
* | | | | | use a hash to store relation valuesJon Leighton2012-04-135-52/+74
|/ / / / /
* | | | | doesn't make sense for select! to take a blockJon Leighton2012-04-131-8/+3
| | | | |
* | | | | remove apply_finder_options call from AssociationScopeJon Leighton2012-04-134-9/+15
| | | | |
* | | | | Make Relation#extending work like other value methodsJon Leighton2012-04-135-27/+22
| | | | |
* | | | | Add Relation#merge!Jon Leighton2012-04-132-9/+17
| | | | |
* | | | | assert valid keysJon Leighton2012-04-133-0/+11
| | | | |
* | | | | Allow Relation#merge to take a hashJon Leighton2012-04-134-49/+95
| | | | |
* | | | | we have no need for the ASSOCIATION_METHODS constantJon Leighton2012-04-134-15/+11
| | | | |
* | | | | we don't need to test that constant assignment worksJon Leighton2012-04-131-15/+0
| | | | |