Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
| | | | | | ||||||
* | | | | | fix code typo in `MysqlAdapter` .Closes #12647. | Yves Senn | 2013-10-30 | 3 | -1/+22 | |
| | | | | | ||||||
* | | | | | short arrays in inspect | Jan Bernacki | 2013-10-30 | 3 | -3/+19 | |
| | | | | | ||||||
* | | | | | Merge pull request #10664 from aderyabin/docpatch | Yves Senn | 2013-10-29 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix doc in Postgres database creation [ci skip] | |||||
| * | | | | | Fix doc in Postgres database creation | Andrey Deryabin | 2013-06-25 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Fix broken delete_all test, which will now be failing since #delete_all is ↵ | David Heinemeier Hansson | 2013-10-28 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | broken | |||||
* | | | | | | Add failing test for preloading with a polymorphic association and using the ↵ | David Heinemeier Hansson | 2013-10-28 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | existential predicate | |||||
* | | | | | | Remove confusing generated-code commentary | Jeremy Kemper | 2013-10-28 | 1 | -4/+4 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Fix typo | David Heinemeier Hansson | 2013-10-27 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #12578 from ↵ | Rafael Mendonça França | 2013-10-27 | 4 | -3/+22 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jeradphelps/configurable_schema_migrations_table_name Configurable name for schema_migrations table Conflicts: activerecord/CHANGELOG.md | |||||
| * | | | | | added schema_migrations_table_name to ActiveRecord::Base in order that the ↵ | Jerad Phelps | 2013-10-27 | 4 | -3/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name of the schema migrations table can be configured. consolidated test_schema_migrations_table_name tests Added changelog entry edited changelog removed commented lines removed reader ensure the schema migrations table is reset at end of test added entry to configuration guide guides typo and changelog order | |||||
* | | | | | | Assert the return value in the test | Rafael Mendonça França | 2013-10-27 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #12664 from jetthoughts/12242_includes_in_through_association | Rafael Mendonça França | 2013-10-27 | 4 | -2/+37 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Skip `include_values` from through associations chains for building association scope | |||||
| * | | | | | | Skip `include_values` from through associations chains for building target scope | Paul Nikitochkin | 2013-10-27 | 4 | -2/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #12242, #9517, #10240 | |||||
* | | | | | | | Add a note about ensuring the version is right for the adapter (since you ↵ | David Heinemeier Hansson | 2013-10-27 | 1 | -1/+1 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | might well have specified the right gem, but locked it to too low of a version) | |||||
* | | | | | | Fixed typo with after_commit docs | Chris Ledet | 2013-10-25 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | Fixed syntax error on `after_commit` docs | |||||
* | | | | | | Merge pull request #12643 from severin/pg_cast_json_on_write | Yves Senn | 2013-10-25 | 3 | -0/+26 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | cast json values on write to be consistent with reading from the db. | |||||
| * | | | | | | cast json values on write to be consistent with reading from the db. | Severin Schoepke | 2013-10-25 | 3 | -0/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | See also commit 5ac2341fab689344991b2a4817bd2bc8b3edac9d | |||||
* | | | | | | | prevent `time_zone_aware_attributes` test leak. follow-up to #12633. | Yves Senn | 2013-10-25 | 1 | -21/+21 | |
| | | | | | | | ||||||
* | | | | | | | only warn on leaked time zone state instead of rasing an error. | Yves Senn | 2013-10-25 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raising `RuntimeErrors` skips important cleanup code and leads to a lot of subsequent errors. This clutters the test output with a lot of noise. | |||||
* | | | | | | | Merge pull request #12633 from senny/no_more_time_zone_leaks | Yves Senn | 2013-10-25 | 12 | -214/+223 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | prevent global timezone state from leaking out of test cases. | |||||
| * | | | | | | prevent global timezone state from leaking out of test cases. | Yves Senn | 2013-10-25 | 12 | -214/+223 | |
| | | | | | | |