Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Changed the call to .sort.last to .max when computing the migration version. You | wangjohn | 2013-03-19 | 1 | -1/+1 | |
| | | | | | | | | | | do not actually need to sort everything (incurs more cost than just a simple max). | |||||
* | | 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 | 3 | -2/+38 | |
| | | | | | 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. | |||||
* | Revert "Merge pull request #9784 from ↵ | Carlos Antonio da Silva | 2013-03-18 | 1 | -4/+4 | |
| | | | | | | | | | | vipulnsward/change_from_blank_to_empty_on_string" This reverts commit 9c4c05fc82e997b722dec4068c3aa27eaee69eb8, reversing changes made to 4620bdcefd0c88905a005f191496df887877b8f3. Reason: They're not completely interchangeable, since blank? will also check for strings containing spaces. | |||||
* | Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_string | Carlos Antonio da Silva | 2013-03-18 | 1 | -4/+4 | |
|\ | | | | | Change from blank? to empty? on obvious string values to save extra calls | |||||
| * | change from blank? to empty? on obvious string values to save extra method ↵ | Vipul A M | 2013-03-19 | 1 | -4/+4 | |
| | | | | | | | | calls | |||||
* | | Fix failing tests related to where values change to strings | Carlos Antonio da Silva | 2013-03-18 | 1 | -7/+7 | |
| | | | | | | | | Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d. | |||||
* | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" | Xavier Noria | 2013-03-18 | 1 | -1/+1 | |
| | | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57. | |||||
* | | Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm | Rafael Mendonça França | 2013-03-18 | 2 | -3/+3 | |
|\ \ | | | | | | | 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 | 2 | -3/+3 | |
| |/ | | | | | | | 2. drop assignment of value to sum in test | |||||
* | | instruct RDoc to only parse Ruby files under lib [Fixes #9779] | Xavier Noria | 2013-03-18 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1 | Steve Klabnik | 2013-03-18 | 9 | -10/+10 | |
|\ \ | | | | | | | fix typos in AR. lots of them. | |||||
| * | | fix typos in AR. lots of them. | Vipul A M | 2013-03-19 | 9 | -10/+10 | |
| |/ | ||||||
* | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 2 | -11/+16 | |
|\ \ | |/ |/| | | | | | | | | | | | * 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 | 2 | -11/+16 | |
| | | ||||||
* | | 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 | |
| | | | ||||||
* | | | Merge pull request #9765 from tkhr/mv-tests-out-from-base_testrb | Carlos Antonio da Silva | 2013-03-18 | 2 | -14/+14 | |
|\ \ \ | | | | | | | | | Move tests out from base_test.rb to inheritance_test.rb | |||||
| * | | | 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 | |||||
* | | | Merge pull request #9677 from neerajdotname/update-comments-about-kotori | Carlos Antonio da Silva | 2013-03-18 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | SQLite3 3.6.8+ supports nested transactions [ci skip] | |||||
| * | | SQLite3 3.6.8+ supports nested transactions [ci skip] | Neeraj Singh | 2013-03-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | http://www.sqlite.org/lang_savepoint.html https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132 | |||||
* | | | `rake db:create` does not change permissions of root user. | Yves Senn | 2013-03-17 | 3 | -3/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -5/+58 | |
| | | | | | | | | | | | | | | | | | | "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. | |||||
* | | | fixes markup of the CHANGELOG entry from 455d710 | Xavier Noria | 2013-03-16 | 1 | -14/+14 | |
| | | | ||||||
* | | | If a counter_cache is defined, then using update_attributes and changing | John Wang | 2013-03-15 | 3 | -0/+77 | |
| | | | | | | | | | | | | | | | the primary key on an association will make sure that the corresponding counter on the association is changed properly. Fixes #9722. | |||||
* | | | Merge pull request #9734 from choudhuryanupam/master | Rafael Mendonça França | 2013-03-15 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Method #primary_key? is not reused | |||||
| * | | | Refactored to reuse method | Anupam Choudhury | 2013-03-15 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | 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 | 4 | -2/+38 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -2/+38 | |
| |/ / / | | | | | | | | | | | | | Closes #9712. | |||||
* / / / | Cache the association proxy object | Jon Leighton | 2013-03-15 | 2 | -1/+6 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | 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 | 23 | -54/+123 | |
|\ \ \ | | | | | | | | | rename `Relation#uniq` to `Relation#distinct` | |||||
| * | | | Deprecate the `:distinct` option for `Relation#count`. | Yves Senn | 2013-03-15 | 8 | -15/+44 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 21 | -40/+80 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -3/+14 | |
|\ \ \ \ | |/ / / |/| | | | Cast number to string in Postgres | |||||
| * | | | Cast number to string in Postgres | Łukasz Strzałkowski | 2013-03-12 | 2 | -3/+14 | |
| | | | | | | | | | | | | | | | | fixes #9170 | |||||
* | | | | `#reset_counters` verifies counter names. | Yves Senn | 2013-03-15 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9724. Raise an `ArgumentError` when the name of the counter does not match an association name. | |||||
* | | | | ask column if it is a pk | Aaron Patterson | 2013-03-14 | 1 | -1/+5 | |
| | | | | ||||||
* | | | | fix hash duping on 1.9 | Aaron Patterson | 2013-03-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | clean up pk delclaration in `create_table` | Aaron Patterson | 2013-03-14 | 1 | -1/+8 | |
| | | | | ||||||
* | | | | bumping arel | Aaron Patterson | 2013-03-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | just access the ivars rather than rb_iv_get | Aaron Patterson | 2013-03-14 | 1 | -5/+3 | |
| | | | | ||||||
* | | | | hide more data in the schema cache | Aaron Patterson | 2013-03-14 | 4 | -17/+34 | |
| | | | | ||||||
* | | | | safely publish columns and columns hash info | Aaron Patterson | 2013-03-14 | 4 | -15/+23 | |
| | | | | ||||||
* | | | | dup and set the default proc to nil rather than looping through everything | Aaron Patterson | 2013-03-14 | 1 | -1/+3 | |
| | | | | ||||||
* | | | | you can provide uuid_generate_v4 as the default value for uuid columns | Aaron Patterson | 2013-03-14 | 3 | -2/+52 | |
| | | | | ||||||
* | | | | pg is the only adapter that supports the xml type, so push the method down | Aaron Patterson | 2013-03-14 | 2 | -9/+4 | |
| | | | | ||||||
* | | | | Apparently people were mutating this array. :'( | Aaron Patterson | 2013-03-14 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | This reverts commit abba61e2bbe320894ba8449ebdf778a1d2af545b. |