Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm | Rafael Mendonça França | 2013-03-18 | 1 | -1/+1 |
|\ \ | | | | | | | 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 | -1/+1 |
| |/ | | | | | | | 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 | 4 | -4/+4 |
|\ \ | | | | | | | fix typos in AR. lots of them. | ||||
| * | | fix typos in AR. lots of them. | Vipul A M | 2013-03-19 | 4 | -4/+4 |
| |/ | |||||
* | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | | | * 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 | -1/+1 |
| | | |||||
* | | 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 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -5/+17 |
| | | | | | | | | | | | | | | | | | | "utf8mb4" Please, see rationale in the included CHANGELOG patch. | ||||
* | | | If a counter_cache is defined, then using update_attributes and changing | John Wang | 2013-03-15 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | 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 |
| | | | | |||||
* | | | | Merge pull request #9733 from ↵ | Jon Leighton | 2013-03-15 | 2 | -2/+14 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+14 |
| |/ / / | | | | | | | | | | | | | Closes #9712. | ||||
* / / / | Cache the association proxy object | Jon Leighton | 2013-03-15 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -25/+42 |
|\ \ \ | | | | | | | | | rename `Relation#uniq` to `Relation#distinct` | ||||
| * | | | Deprecate the `:distinct` option for `Relation#count`. | Yves Senn | 2013-03-15 | 2 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -22/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -3/+6 |
|\ \ \ \ | |/ / / |/| | | | Cast number to string in Postgres | ||||
| * | | | Cast number to string in Postgres | Łukasz Strzałkowski | 2013-03-12 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | fixes #9170 | ||||
* | | | | `#reset_counters` verifies counter names. | Yves Senn | 2013-03-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | |||||
* | | | | 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 | 2 | -2/+22 |
| | | | | |||||
* | | | | safely publish columns and columns hash info | Aaron Patterson | 2013-03-14 | 3 | -6/+14 |
| | | | | |||||
* | | | | 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 | 2 | -2/+9 |
| | | | | |||||
* | | | | 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. | ||||
* | | | | hashes are ordered, so just use the columns_hash ivar | Aaron Patterson | 2013-03-14 | 1 | -3/+3 |
| | | | | |||||
* | | | | use the method so we do not depend on internal ivars | Aaron Patterson | 2013-03-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | extract factory method and push common code up to abstract adapter | Aaron Patterson | 2013-03-14 | 2 | -7/+7 |
| | | | | |||||
* | | | | MOAR cleanups. | Vipul A M | 2013-03-14 | 1 | -3/+3 |
| | | | | |||||
* | | | | Also quote extension name in disable_extension | Stephen Touset | 2013-03-12 | 1 | -1/+1 |
|/ / / | | | | | | | A patch was committed recently which quoted the extension name in the SQL for `enable_extension`. But the same wasn't done for `disable_extension`. | ||||
* | | | Merge pull request #9676 from neerajdotname/9567-destroy-should-call-destroy-all | Rafael Mendonça França | 2013-03-12 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | dependent: :destroy should call destroy_all | ||||
| * | | | dependent: :destroy should call destroy_all | Neeraj Singh | 2013-03-11 | 1 | -2/+3 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit https://github.com/rails/rails/pull/9668 shows warning when `delete_all` is invoked with `:dependent` option `:destroy`. Unfortunately invoking `Post.destroy_all` invokes `post.comments.delete_all` as part of `has_many` callbacks. This commit ensures that instead `post.comments.destroy_all` is invoked and in the process no warning is generated. See issue #9567 for details . | ||||
* | | | Pass column to quote when copying a sqlite table. | Matthew M. Boedicker | 2013-03-11 | 1 | -1/+9 |
| | | | | | | | | | | | | To make quote escape binary data correctly it needs the column passed in. | ||||
* | | | Fix typo [ci skip] | Carlos Antonio da Silva | 2013-03-11 | 1 | -1/+1 |
|/ / | |||||
* | | promotes change_column_null to the migrations API | Xavier Noria | 2013-03-11 | 1 | -0/+20 |
| | | |||||
* | | quick pass over the RDoc of schema_statements.rb [ci skip] | Xavier Noria | 2013-03-11 | 1 | -122/+190 |
| | | |||||
* | | documents how to DROP DEFAULT [ci skip] | Xavier Noria | 2013-03-11 | 1 | -3/+7 |
| | | |||||
* | | Merge pull request #9668 from neerajdotname/9567-delete-all-warning | Xavier Noria | 2013-03-11 | 1 | -0/+9 |
|\ \ | | | | | | | Show warning message if delete_all is firing callbacks | ||||
| * | | Show warning message if delete_all is firing callbacks | Neeraj Singh | 2013-03-11 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | `post.comments.delete_all` will fire callbacks if :dependent option is :destroy . It will be fixed in Rails 4.1 . In the meantime display a warning . Look at #9567 for details . | ||||
* | | | default the reaping frequency to 10 seconds | Aaron Patterson | 2013-03-11 | 1 | -1/+1 |
|/ / |