Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | decouple column definition from the database connection | Aaron Patterson | 2013-03-22 | 1 | -3/+3 |
| | |||||
* | remove knowledge of SQL from the column definition object | Aaron Patterson | 2013-03-22 | 1 | -3/+4 |
| | |||||
* | Merge pull request #9866 from choudhuryanupam/fix_connection_test | Carlos Antonio da Silva | 2013-03-22 | 1 | -1/+1 |
|\ | | | | | Removed unused loop variable | ||||
| * | Removed unused loop variable | Anupam Choudhury | 2013-03-22 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_test | Carlos Antonio da Silva | 2013-03-22 | 1 | -2/+1 |
|\ \ | | | | | | | Removed unnecessary block | ||||
| * | | Removed unnecessary block | Anupam Choudhury | 2013-03-22 | 1 | -2/+1 |
| | | | |||||
* | | | test-case to prevent resetting associations when preloading twice. | Yves Senn | 2013-03-22 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/preloader/through_association.rb activerecord/test/cases/associations/eager_test.rb | ||||
* | | | When we pass id to update_attributes it will try to set new id for that record | Dmitry Vorotilin | 2013-03-22 | 1 | -0/+9 |
|/ / | |||||
* / | Delete failing test | Jon Leighton | 2013-03-22 | 1 | -36/+0 |
|/ | | | | | | | | | | | | I don't think this is testing anything useful, and the test code is exceedingly brittle. It is broken since 34c7e73c1def1312e59ef1f334586ff2f668246e because the test code makes assumptions about the implementation of PostgreSQLAdapter#active? which are incorrect after the commit. I could fix this test but it would be even more brittle (by stubbing the underlying @connection.connect_poll) and it doesn't test any complex logic. I conclude that it's not worth it. | ||||
* | Allows setting fixture_path to a Pathname | Alexander Murmann and Can Berk Güder | 2013-03-21 | 1 | -0/+9 |
| | |||||
* | Merge pull request #9847 from vipulnsward/fix_sqlite_test | Rafael Mendonça França | 2013-03-21 | 1 | -1/+1 |
|\ | | | | | Fix copy table index test; Change == to ! on false in travis.rb | ||||
| * | Fix copy table index test; Change == to ! on false in travis.rb | Vipul A M | 2013-03-21 | 1 | -1/+1 |
| | | |||||
* | | Update other counter caches on destroy | Ian Young | 2013-03-20 | 6 | -7/+23 |
|/ | |||||
* | Removed unnecessary block | Anupam Choudhury | 2013-03-20 | 1 | -2/+1 |
| | |||||
* | Fix some typos in AR- CHANGELOG, tests, method doc. fixed | Vipul A M | 2013-03-20 | 2 | -2/+2 |
| | |||||
* | Commas aren't comas. | Josh Adams | 2013-03-19 | 1 | -2/+2 |
| | | | | Type a fixo. | ||||
* | Calling find() on an association with an inverse will now check to see | wangjohn | 2013-03-19 | 1 | -0/+25 |
| | | | | | if the association already holds that record in memory before checking the database for the specified ids. | ||||
* | The repair_validations helper was not working correctly before because | wangjohn | 2013-03-19 | 1 | -2/+2 |
| | | | | | | it only cleared the validations that created :validate callbacks. This didn't include the validates created by validates_with, so I've added a method to clear all validations. | ||||
* | Fix failing tests related to where values change to strings | Carlos Antonio da Silva | 2013-03-18 | 1 | -7/+7 |
| | | | | Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d. | ||||
* | Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm | Rafael Mendonça França | 2013-03-18 | 1 | -2/+2 |
|\ | | | | | Change from each to each_value;drop assignment in habtm | ||||
| * | 1. Change from each to each_value since we did not use key | Vipul A M | 2013-03-19 | 1 | -2/+2 |
| | | | | | | | | 2. drop assignment of value to sum in test | ||||
* | | Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1 | Steve Klabnik | 2013-03-18 | 5 | -6/+6 |
|\ \ | | | | | | | fix typos in AR. lots of them. | ||||
| * | | fix typos in AR. lots of them. | Vipul A M | 2013-03-19 | 5 | -6/+6 |
| |/ | |||||
* | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 1 | -10/+15 |
|\ \ | |/ |/| | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] | ||||
| * | stop calling to_sym when building arel nodes [CVE-2013-1854] | Aaron Patterson | 2013-03-15 | 1 | -10/+15 |
| | | |||||
* | | Merge pull request #9766 from senny/remove_ancient_todos | Carlos Antonio da Silva | 2013-03-18 | 1 | -3/+0 |
|\ \ | | | | | | | Remove ancient TODOs [ci skip] | ||||
| * | | remove ancient TODOs [ci skip]. | Yves Senn | 2013-03-18 | 1 | -3/+0 |
| | | | |||||
* | | | move tests out from base_test.rb | Takehiro Adachi | 2013-03-18 | 2 | -14/+14 |
|/ / | | | | | | | | | These tests should be in inheritance_test.rb since its testing a feature which is implemented in inheritance.rb | ||||
* | | `rake db:create` does not change permissions of root user. | Yves Senn | 2013-03-17 | 1 | -2/+18 |
| | | | | | | | | | | | | | | | | Closes #8079. I had to rework some of the tests because the mock allowed any arguments for `connection.exeucte`. I think this is very dangerous as there could anything be executed without the tests noticing it. | ||||
* | | sets limit 191 for schema_migrations#version in mysql2 if the encoding is ↵ | Xavier Noria | 2013-03-17 | 1 | -0/+26 |
| | | | | | | | | | | | | "utf8mb4" Please, see rationale in the included CHANGELOG patch. | ||||
* | | Refactor Person/Friendship relationships to be more intuitive | Mack Earnhardt | 2013-03-17 | 6 | -6/+15 |
| | | | | | | | | | | | | | | | | PR #5210 added a Friendship model to illustrate a bug, but in doing so created a confusing structure because both belongs_to declarations in Friendship referred to the same side of the join. The new structure maintains the integrity of the bug test while changing the follower relationship to be more useful for other testing. | ||||
* | | If a counter_cache is defined, then using update_attributes and changing | John Wang | 2013-03-15 | 1 | -0/+31 |
| | | | | | | | | | | the primary key on an association will make sure that the corresponding counter on the association is changed properly. Fixes #9722. | ||||
* | | Fix implicit join references option reversion in test | Carlos Antonio da Silva | 2013-03-15 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #9733 from ↵ | Jon Leighton | 2013-03-15 | 1 | -0/+9 |
|\ \ | | | | | | | | | | | | | senny/9712_option_to_turn_references_deprecation_off make it possible to disable implicit join references. | ||||
| * | | make it possible to disable implicit join references. | Yves Senn | 2013-03-15 | 1 | -0/+9 |
| | | | | | | | | | | | | Closes #9712. | ||||
* | | | Cache the association proxy object | Jon Leighton | 2013-03-15 | 1 | -0/+5 |
|/ / | | | | | | | | | | | | | | | This reimplements the behaviour of Rails 3, as I couldn't see why we shouldn't cache the object, and @alindeman had a good use case for caching it: https://github.com/rails/rails/commit/c86a32d7451c5d901620ac58630460915292f88b#commitcomment-2784312 | ||||
* | | Merge pull request #9683 from senny/deprecate_count_distinct_option | Jon Leighton | 2013-03-15 | 14 | -29/+61 |
|\ \ | | | | | | | rename `Relation#uniq` to `Relation#distinct` | ||||
| * | | Deprecate the `:distinct` option for `Relation#count`. | Yves Senn | 2013-03-15 | 5 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | We moved more and more away from passing options to finder / calculation methods. The `:distinct` option in `#count` was one of the remaining places. Since we can now combine `Relation#distinct` with `Relation#count` the option is no longer necessary and can be deprecated. | ||||
| * | | rename `Relation#uniq` to `Relation#distinct`. `#uniq` still works. | Yves Senn | 2013-03-15 | 12 | -18/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | The similarity of `Relation#uniq` to `Array#uniq` is confusing. Since our Relation API is close to SQL terms I renamed `#uniq` to `#distinct`. There is no deprecation. `#uniq` and `#uniq!` are aliases and will continue to work. I also updated the documentation to promote the use of `#distinct`. | ||||
* | | | Merge pull request #9686 from strzalek/cast_number_to_string_in_pg | Jon Leighton | 2013-03-15 | 1 | -0/+8 |
|\ \ \ | |/ / |/| | | Cast number to string in Postgres | ||||
| * | | Cast number to string in Postgres | Łukasz Strzałkowski | 2013-03-12 | 1 | -0/+8 |
| | | | | | | | | | | | | fixes #9170 | ||||
* | | | `#reset_counters` verifies counter names. | Yves Senn | 2013-03-15 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | Closes #9724. Raise an `ArgumentError` when the name of the counter does not match an association name. | ||||
* | | | hide more data in the schema cache | Aaron Patterson | 2013-03-14 | 2 | -15/+12 |
| | | | |||||
* | | | safely publish columns and columns hash info | Aaron Patterson | 2013-03-14 | 1 | -9/+9 |
| | | | |||||
* | | | you can provide uuid_generate_v4 as the default value for uuid columns | Aaron Patterson | 2013-03-14 | 1 | -0/+43 |
| | | | |||||
* | | | MOAR cleanups. | Vipul A M | 2013-03-14 | 3 | -3/+2 |
|/ / | |||||
* | | Pass column to quote when copying a sqlite table. | Matthew M. Boedicker | 2013-03-11 | 1 | -1/+5 |
| | | | | | | | | To make quote escape binary data correctly it needs the column passed in. | ||||
* | | add an missing assertion to inheritance_test.rb | Takehiro Adachi | 2013-03-11 | 1 | -0/+1 |
| | | | | | | | | | | | | assertion for https://github.com/rails/rails/blob/ad624345e54bd20802de67b2b5c9ef29ecf5 d5f4/activerecord/lib/active_record/inheritance.rb#L32 | ||||
* | | Address ActiveRecord::StatementInvalid: OCIError: ORA-00979 | Yasuo Honda | 2013-03-11 | 1 | -2/+2 |
| | | |||||
* | | Change uniq validation with conditions examples to use where with hashes | Carlos Antonio da Silva | 2013-03-09 | 1 | -2/+2 |
| | | | | | | | | Take the opportunity to showcase where.not. |