aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9821 from vipulnsward/fix_typos_in_ARVijay Dev2013-03-205-6/+6
|\ | | | | Fix some typos in AR- CHANGELOG, tests, method doc. fixed
| * Fix some typos in AR- CHANGELOG, tests, method doc. fixedVipul A M2013-03-205-6/+6
| |
* | Fix a typoRajeev N Bharshetty2013-03-201-1/+1
|/
* Merge pull request #9818 from wangjohn/sort_last_to_max_in_migration_versionCarlos Antonio da Silva2013-03-191-1/+1
|\ | | | | Changed the call to .sort.last to .max when computing the migration version
| * Changed the call to .sort.last to .max when computing the migration version. Youwangjohn2013-03-191-1/+1
| | | | | | | | | | do not actually need to sort everything (incurs more cost than just a simple max).
* | Commas aren't comas.Josh Adams2013-03-191-2/+2
|/ | | | Type a fixo.
* Calling find() on an association with an inverse will now check to seewangjohn2013-03-193-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 becausewangjohn2013-03-191-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 Silva2013-03-181-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_stringCarlos Antonio da Silva2013-03-181-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 M2013-03-191-4/+4
| | | | | | | | calls
* | Fix failing tests related to where values change to stringsCarlos Antonio da Silva2013-03-181-7/+7
| | | | | | | | Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d.
* | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 16:28:02 +0000