aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"Xavier Noria2013-03-181-1/+1
| | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
* Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtmRafael Mendonça França2013-03-182-3/+3
|\ | | | | Change from each to each_value;drop assignment in habtm
| * 1. Change from each to each_value since we did not use keyVipul A M2013-03-192-3/+3
| | | | | | | | 2. drop assignment of value to sum in test
* | instruct RDoc to only parse Ruby files under lib [Fixes #9779]Xavier Noria2013-03-181-1/+1
| |
* | Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1Steve Klabnik2013-03-189-10/+10
|\ \ | | | | | | fix typos in AR. lots of them.
| * | fix typos in AR. lots of them.Vipul A M2013-03-199-10/+10
| |/
* | Merge branch 'master-sec'Aaron Patterson2013-03-182-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 Patterson2013-03-152-11/+16
| |
* | Merge pull request #9766 from senny/remove_ancient_todosCarlos Antonio da Silva2013-03-181-3/+0
|\ \ | | | | | | Remove ancient TODOs [ci skip]
| * | remove ancient TODOs [ci skip].Yves Senn2013-03-181-3/+0
| | |
* | | Merge pull request #9765 from tkhr/mv-tests-out-from-base_testrbCarlos Antonio da Silva2013-03-182-14/+14
|\ \ \ | | | | | | | | Move tests out from base_test.rb to inheritance_test.rb
| * | | move tests out from base_test.rbTakehiro Adachi2013-03-182-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-kotoriCarlos Antonio da Silva2013-03-181-1/+1
|\ \ \ | |/ / |/| | SQLite3 3.6.8+ supports nested transactions [ci skip]
| * | SQLite3 3.6.8+ supports nested transactions [ci skip]Neeraj Singh2013-03-181-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 Senn2013-03-173-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 Noria2013-03-174-5/+58
| | | | | | | | | | | | | | | | | | "utf8mb4" Please, see rationale in the included CHANGELOG patch.
* | | Refactor Person/Friendship relationships to be more intuitiveMack Earnhardt2013-03-176-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 455d710Xavier Noria2013-03-161-14/+14
| | |
* | | If a counter_cache is defined, then using update_attributes and changingJohn Wang2013-03-153-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/masterRafael Mendonça França2013-03-151-2/+2
|\ \ \ | | | | | | | | Method #primary_key? is not reused
| * | | Refactored to reuse methodAnupam Choudhury2013-03-151-2/+2
| | | |
* | | | Fix implicit join references option reversion in testCarlos Antonio da Silva2013-03-151-1/+2
| | | |
* | | | Merge pull request #9733 from ↵Jon Leighton2013-03-154-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 Senn2013-03-154-2/+38
| |/ / / | | | | | | | | | | | | Closes #9712.
* / / / Cache the association proxy objectJon Leighton2013-03-152-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_optionJon Leighton2013-03-1523-54/+123
|\ \ \ | | | | | | | | rename `Relation#uniq` to `Relation#distinct`
| * | | Deprecate the `:distinct` option for `Relation#count`.Yves Senn2013-03-158-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 Senn2013-03-1521-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_pgJon Leighton2013-03-152-3/+14
|\ \ \ \ | |/ / / |/| | | Cast number to string in Postgres
| * | | Cast number to string in PostgresŁukasz Strzałkowski2013-03-122-3/+14
| | | | | | | | | | | | | | | | fixes #9170
* | | | `#reset_counters` verifies counter names.Yves Senn2013-03-152-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 pkAaron Patterson2013-03-141-1/+5
| | | |
* | | | fix hash duping on 1.9Aaron Patterson2013-03-141-1/+1
| | | |
* | | | clean up pk delclaration in `create_table`Aaron Patterson2013-03-141-1/+8
| | | |
* | | | bumping arelAaron Patterson2013-03-141-1/+1
| | | |
* | | | just access the ivars rather than rb_iv_getAaron Patterson2013-03-141-5/+3
| | | |
* | | | hide more data in the schema cacheAaron Patterson2013-03-144-17/+34
| | | |
* | | | safely publish columns and columns hash infoAaron Patterson2013-03-144-15/+23
| | | |
* | | | dup and set the default proc to nil rather than looping through everythingAaron Patterson2013-03-141-1/+3
| | | |
* | | | you can provide uuid_generate_v4 as the default value for uuid columnsAaron Patterson2013-03-143-2/+52
| | | |
* | | | pg is the only adapter that supports the xml type, so push the method downAaron Patterson2013-03-142-9/+4
| | | |
* | | | Apparently people were mutating this array. :'(Aaron Patterson2013-03-141-3/+3
| | | | | | | | | | | | | | | | This reverts commit abba61e2bbe320894ba8449ebdf778a1d2af545b.
* | | | hashes are ordered, so just use the columns_hash ivarAaron Patterson2013-03-141-3/+3
| | | |
* | | | use the method so we do not depend on internal ivarsAaron Patterson2013-03-141-1/+1
| | | |
* | | | extract factory method and push common code up to abstract adapterAaron Patterson2013-03-142-7/+7
| | | |
* | | | MOAR cleanups.Vipul A M2013-03-144-6/+5
| | | |
* | | | Add support for generate scaffold password:digestSam Ruby2013-03-132-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password entirely from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture
* | | | fix typo in Active Record CHANGELOG [ci skip]Yves Senn2013-03-131-1/+1
| | | |
* | | | Also quote extension name in disable_extensionStephen Touset2013-03-121-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-allRafael Mendonça França2013-03-121-2/+3
|\ \ \ | | | | | | | | dependent: :destroy should call destroy_all