Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #12791 from jasonayre/ja/fix_autoload_error | Rafael Mendonça França | 2013-11-07 | 2 | -0/+6 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add autoload :TransactionState to fix Marshal.load issues | |||||
| * | | | | | | | | revised changelog comment to be less than 80 chars | Jason Ayre | 2013-11-07 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | add autoload :TransactionState to fix Marshal.load issues | Jason Ayre | 2013-11-07 | 2 | -0/+6 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Warning removed for ruby-head | Rashmi Yadav | 2013-11-07 | 1 | -1/+1 | |
| |_|_|_|/ / / |/| | | | | | | ||||||
* | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-11-07 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | refine usage docs of `store` in combination with `hstore` and `json`. | Yves Senn | 2013-11-06 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs #11561 #12700 | |||||
| * | | | | | | Hstore and JSON fields are not supported with store | Robin Dupret | 2013-10-30 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of `store` on Hstore fields (for instance) is not needed because serialization aimed to interact with Ruby objects and not with provided field types | |||||
| * | | | | | | warning about saving models with dirty attributes | Damien Mathieu | 2013-10-23 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #8328 | |||||
* | | | | | | | Stop using method missing for singleton delegation. | Aaron Patterson | 2013-11-06 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saved about 46 array allocations per request on an extremely simple application. The delegation happened in the notification subsystem which is a hotspot, so this should result in even more savings with larger apps. Squashed commit of the following: commit 41eef0d1479526f7de25fd4391d98e61c126d9f5 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Nov 6 16:32:31 2013 -0800 speed up notifications commit 586b4a18656f66fb2c518fb8e8fee66a016e8ae6 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Nov 6 16:31:05 2013 -0800 speed up runtime registry methods commit b67d074cb4314df9a88438f785868cef77e583d7 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Nov 6 16:28:12 2013 -0800 change method name and make it public | |||||
* | | | | | | | bring back constant to expose the enum mapping as HWIA. | Yves Senn | 2013-11-06 | 2 | -4/+19 | |
| | | | | | | | ||||||
* | | | | | | | update the AR enum docs to match the actual behavior. [ci skip] | Yves Senn | 2013-11-06 | 1 | -5/+3 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | store enum mapping using `Strings` instead of `Symbols`. | Yves Senn | 2013-11-05 | 2 | -3/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to assign both `String` and `Symbol` values to the enum without having to call `to_sym`, which is a security problem. | |||||
* | | | | | | direct enum assignment rasies ArgumentError for unknown values. | Yves Senn | 2013-11-05 | 2 | -1/+18 | |
| | | | | | | ||||||
* | | | | | | define enum methods inside a `Module` to make them overwritable. | Yves Senn | 2013-11-05 | 3 | -13/+34 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #12390 from kennyj/rename_to_association_methods | Rafael Mendonça França | 2013-11-05 | 4 | -7/+7 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed generated_feature_methods to generated_association_methods. Conflicts: activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/singular_association.rb activerecord/test/cases/base_test.rb | |||||
| * | | | | | | Renamed generated_feature_methods to generated_association_methods. | kennyj | 2013-09-28 | 5 | -12/+12 | |
| | | | | | | | ||||||
* | | | | | | | Remove private API test | Rafael Mendonça França | 2013-11-05 | 1 | -10/+0 | |
| | | | | | | | ||||||
* | | | | | | | Use 1.9 Hash syntax consistently | Pablo Torres | 2013-11-05 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | ask the fixture set for the sql statements | Aaron Patterson | 2013-11-04 | 2 | -11/+17 | |
| | | | | | | | ||||||
* | | | | | | | The enum value constant isn't used, so rm it for now. | Aaron Patterson | 2013-11-04 | 2 | -27/+7 | |
| | | | | | | | ||||||
* | | | | | | | stop doing the same calculation over and over | Aaron Patterson | 2013-11-04 | 1 | -4/+5 | |
| | | | | | | | ||||||
* | | | | | | | fix copy & paste test-case naming. [ci skip] | Yves Senn | 2013-11-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Fix failures related to enum changes | Carlos Antonio da Silva | 2013-11-04 | 1 | -6/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6e4a810f51b9ed2468b92247ef5568cc9d6dbcc0 changed the implementation from class_eval to define_method, but missed the access to the constant versus the access to the constant name. | |||||
* | | | | | | | Convert schema file to ruby 1.9 style hash | Carlos Antonio da Silva | 2013-11-04 | 1 | -214/+214 | |
| | | | | | | | ||||||
* | | | | | | | Style fixes on test schema file | Carlos Antonio da Silva | 2013-11-04 | 1 | -6/+6 | |
| | | | | | | | ||||||
* | | | | | | | Refactor logic to grab the max time of the list of timestamp names in #cache_key | Carlos Antonio da Silva | 2013-11-04 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse the already existing logic used for grabbing this information from the updated columns. | |||||
* | | | | | | | Respect cache timestamp format when giving timestamps to #cache_key | Carlos Antonio da Silva | 2013-11-04 | 2 | -3/+4 | |
| | | | | | | | ||||||
* | | | | | | | :scissors: [ci skip] | Carlos Antonio da Silva | 2013-11-04 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #12754 from ↵ | David Heinemeier Hansson | 2013-11-04 | 1 | -4/+12 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ck3g/replace-class-evals-with-define-method-for-enum Replace `class_eval` with `define_method` for enum | |||||
| * | | | | | | | Replace `class_eval` with `define_method` for enum | Vitaly Tatarintsev | 2013-11-04 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/db41eb8a6ea88b854bf5cd11070ea4245e1639c5#commitcomment-4502683 | |||||
* | | | | | | | | Fix changelog indent [ci skip] | Carlos Antonio da Silva | 2013-11-04 | 1 | -6/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Add test verifying that you can only sort ARs of the same type | David Heinemeier Hansson | 2013-11-02 | 1 | -1/+7 | |
| | | | | | | | ||||||
* | | | | | | | Revert "ActiveRecord::Base#<=> has been removed. Primary keys may not be in ↵ | David Heinemeier Hansson | 2013-11-02 | 3 | -12/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order," -- will be replaced with a check to ensure that the keys used for comparison are integers, and only fail if they are not. This reverts commit 6256734e2d0bdd89f4b5d11da259d40afa0c95c7. Conflicts: activerecord/CHANGELOG.md | |||||
* | | | | | | | Delegate #rewhere to all on the class like all other relation methods | David Heinemeier Hansson | 2013-11-02 | 2 | -1/+5 | |
| | | | | | | | ||||||
* | | | | | | | Move documentation around a bit | David Heinemeier Hansson | 2013-11-02 | 1 | -4/+7 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #12747 from yury/explicit-enum-values | David Heinemeier Hansson | 2013-11-02 | 4 | -1/+15 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Explicit mapping for enum | |||||
| * | | | | | | | Explicit mapping for enum | Yury Korolev | 2013-11-02 | 4 | -1/+15 | |
| | | | | | | | | ||||||
* | | | | | | | | Added ActiveRecord::QueryMethods#rewhere which will overwrite an existing, ↵ | David Heinemeier Hansson | 2013-11-02 | 3 | -0/+52 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | named where condition. | |||||
* | | | | | | | | unscope now works on default_scope after ↵ | Rafael Mendonça França | 2013-11-02 | 3 | -9/+9 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | 94924dc32baf78f13e289172534c2e71c9c8cade | |||||
* | | | | | | | Add a test case for the scope enum adds | David Heinemeier Hansson | 2013-11-02 | 1 | -0/+4 | |
| | | | | | | | ||||||
* | | | | | | | Extend ActiveRecord::Base#cache_key to take an optional list of timestamp ↵ | David Heinemeier Hansson | 2013-11-02 | 4 | -2/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | attributes of which the highest will be used. | |||||
* | | | | | | | Use an already existing fixture | Carlos Antonio da Silva | 2013-11-02 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Fix to work on Ruby 1.9.3, example and changelog improvements | Carlos Antonio da Silva | 2013-11-02 | 4 | -34/+34 | |
| | | | | | | | ||||||
* | | | | | | | Added ActiveRecord::Base#enum for declaring enum attributes where the values ↵ | David Heinemeier Hansson | 2013-11-02 | 7 | -2/+128 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | map to integers in the database, but can be queried by name | |||||
* | | | | | | | Fix wrong behavior where associations with dependent: :destroy options | Rafael Mendonça França | 2013-11-01 | 3 | -10/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was using nullify strategy This caused a regression in applications trying to upgrade. Also if the user set the dependent option as destroy he expects to get the records removed from the database. | |||||
* | | | | | | | Test with the right association | Rafael Mendonça França | 2013-11-01 | 1 | -3/+3 | |
| | | | | | | | ||||||
* | | | | | | | More Warnings removed for ruby trunk | Arun Agrawal | 2013-11-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb | |||||
* | | | | | | | Warnings removed for ruby trunk | Arun Agrawal | 2013-11-01 | 6 | -26/+26 | |
| | | | | | | | | | | | | | | | | | | | | | Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb | |||||
* | | | | | | | :cut: whitespace | Aaron Patterson | 2013-10-30 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | no need for a CHANGELOG entry. [ci skip]. | Yves Senn | 2013-10-30 | 1 | -7/+1 | |
| | | | | | | |