Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #5973 from academia-edu/master | Aaron Patterson | 2012-04-25 | 2 | -3/+10 | |
|\ \ \ \ | | | | | | | | | | | 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 | 2 | -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 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 | 5 | -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. | kennyj | 2012-04-13 | 2 | -1/+13 | |
| | | | | | | | ||||||
| * | | | | | | @stale_state should be nil when a model isn't saved. | kennyj | 2012-04-13 | 3 | -3/+4 | |
| | | | | | | | ||||||
* | | | | | | | add missing test | Jon Leighton | 2012-04-25 | 1 | -0/+12 | |
| | | | | | | | ||||||
* | | | | | | | 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 | 3 | -11/+4 | |
| | | | | | | | ||||||
* | | | | | | | Extract deprecated code | Jon Leighton | 2012-04-25 | 2 | -9/+13 | |
| | | | | | | | ||||||
* | | | | | | | fix interpolation for hash merging | Jon Leighton | 2012-04-25 | 3 | -24/+39 | |
| | | | | | | | ||||||
* | | | | | | | allow merging a single where value | Jon Leighton | 2012-04-25 | 2 | -1/+7 | |
| | | | | | | | ||||||
* | | | | | | | 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 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
|/ / / / / / | ||||||
* | | | | | | Fix build. It seems that the Mocha's behavior were changed. | kennyj | 2012-04-25 | 2 | -3/+9 | |
| | | | | | | ||||||
* | | | | | | 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 | 2 | -1/+31 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | 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 | |
| |/ / / / / | ||||||
* | | | | | | Update Rails 3.2.3 release date in changelogs as March 30, 2012 | Michael de Silva | 2012-04-16 | 1 | -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 full | Aaron Patterson | 2012-04-15 | 2 | -20/+63 | |
| | | | | | | ||||||
* | | | | | | Automatically create indexes for references/belongs_to statements in migrations. | Joshua Wood | 2012-04-14 | 6 | -5/+145 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #5837 from yahonda/new_sequence_name_is_too_long | Jon Leighton | 2012-04-14 | 1 | -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_suffix | Yasuo Honda | 2012-04-13 | 1 | -4/+4 | |
| | | | | | | | ||||||
* | | | | | | | extract deprecated code for #find, #first, #last, #all | Jon Leighton | 2012-04-13 | 1 | -105/+36 | |
| | | | | | | | ||||||
* | | | | | | | extract deprecated #calculate code | Jon Leighton | 2012-04-13 | 1 | -83/+25 | |
| | | | | | | | ||||||
* | | | | | | | move code out to active_record_deprecated_finders | Jon Leighton | 2012-04-13 | 1 | -7/+2 | |
| | | | | | | | ||||||
* | | | | | | | fix tests | Jon Leighton | 2012-04-13 | 7 | -81/+74 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5832 from kennyj/fix_5267 | Jon Leighton | 2012-04-13 | 2 | -3/+7 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix a wrong return value from reset_sequence_name method. | |||||
| * | | | | | | | Fix wrong return value from reset_sequence_name method. | kennyj | 2012-04-14 | 2 | -3/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | move some of the update_all implementation to active_record_deprecated_finders | Jon Leighton | 2012-04-13 | 1 | -27/+14 | |
| | | | | | | | | ||||||
* | | | | | | | | now we can just manipulate the values hash in #only and #except | Jon Leighton | 2012-04-13 | 4 | -36/+26 | |
| | | | | | | | | ||||||
* | | | | | | | | use a hash to store relation values | Jon Leighton | 2012-04-13 | 5 | -52/+74 | |
|/ / / / / / / | ||||||
* | | | | | | | doesn't make sense for select! to take a block | Jon Leighton | 2012-04-13 | 1 | -8/+3 | |
| | | | | | | | ||||||
* | | | | | | | remove apply_finder_options call from AssociationScope | Jon Leighton | 2012-04-13 | 4 | -9/+15 | |
| | | | | | | | ||||||
* | | | | | | | Make Relation#extending work like other value methods | Jon Leighton | 2012-04-13 | 5 | -27/+22 | |
| | | | | | | | ||||||
* | | | | | | | Add Relation#merge! | Jon Leighton | 2012-04-13 | 2 | -9/+17 | |
| | | | | | | | ||||||
* | | | | | | | assert valid keys | Jon Leighton | 2012-04-13 | 3 | -0/+11 | |
| | | | | | | | ||||||
* | | | | | | | Allow Relation#merge to take a hash | Jon Leighton | 2012-04-13 | 4 | -49/+95 | |
| | | | | | | | ||||||
* | | | | | | | we have no need for the ASSOCIATION_METHODS constant | Jon Leighton | 2012-04-13 | 4 | -15/+11 | |
| | | | | | | | ||||||
* | | | | | | | we don't need to test that constant assignment works | Jon Leighton | 2012-04-13 | 1 | -15/+0 | |
| | | | | | | | ||||||
* | | | | | | | refactoring | Jon Leighton | 2012-04-13 | 1 | -36/+45 | |
| | | | | | | |