aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix bad test order dependency between LoadAllFixturesTest#test_all_there and ↵Ryan Davis2013-11-161-6/+10
| | | | FoxyFixturesTest#test_ignores_belongs_to_symbols_if_association_and_foreign_key_are_named_the_same
* Fix bad test order dependency between ↵Ryan Davis2013-11-161-8/+16
| | | | test/cases/validations/i18n_generate_message_validation_test.rb and test/cases/validations/uniqueness_validation_test.rb
* test should clean up after themselvesAaron Patterson2013-11-151-0/+3
|
* Merge pull request #12779 from ↵Aaron Patterson2013-11-154-10/+10
|\ | | | | | | | | dougbarth/dont_swallow_exceptions_during_transactional_statements_in_mysql Don't swallow exceptions in transctional statements
| * Remove tests for not swallowing exceptions.Doug Barth2013-11-152-42/+0
| | | | | | | | From PR, @tenderlove would prefer to not maintain these tests.
| * Don't swallow exceptions in transctional statementsDoug Barth2013-11-054-10/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MySQL connection adapater swallows all StandardError exceptions, which includes Mysql::Error and Mysql2::Error. The comment in the exception clause claims errors thrown here indicate that transactions aren't supported by the server but that isn't necessarily true. It's possible the MySQL server has gone away and swallowing a failed commit may let the application return a successful response when the data has not been saved. Also, replication libraries like Galera require that the application handle exceptions thrown at BEGIN/COMMIT. I'm unable to determine what version of MySQL threw an exception for transactional statements. I tried as far back as 3.23.49 with InnoDB disabled but BEGIN & COMMIT statements do not throw an error. If there's a real case for this logic to continue, we could instead push this behavior into a configuration setting. The exception swallowing has been there since the beginning: db045dbbf60b53dbe013ef25554fd013baf88134
* | Merge pull request #12531 from iamvery/database-tasks-exit-statusRafael Mendonça França2013-11-156-16/+51
|\ \ | | | | | | | | | | | | | | | | | | Explicitly exit with status "1" for create and drop task failures Conflicts: activerecord/CHANGELOG.md
| * | Explicitly exit with status "1" for create and drop failuresJay Hayes2013-11-116-16/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A non-zero exit status allows subsequent shell commands to be chained together such as: `rake db:reset test:prepare && rspec && cap deploy` (if you're feeling brave :) * Any exceptions raised during the `create` and `drop` tasks are caught in order to print a "pretty" message to the user. Unfortunately doing so prevents rake from aborting with a non-zero exit status to the shell. * Therefore we re-raise the exceptions after the "pretty" message and re-catch them in the task. * From the task we explicitly exit with a non-zero status. This method was chosen (rather than just letting rake fail from the exception) so that the backtrace is suppressed and the output to stderr is unchanged. * Update activerecord CHANGELOG
* | | Merge pull request #12853 from joshjordan/masterRafael Mendonça França2013-11-151-1/+1
|\ \ \ | | | | | | | | Allocate one less object using html_safe during content_tag construction
| * | | Allocate one less object using html_safe during content_tag constructionJosh Jordan2013-11-141-1/+1
| | | |
* | | | Merge pull request #10848 from 907th/add_block_to_cattr_readerRafael Mendonça França2013-11-154-0/+40
|\ \ \ \ | | | | | | | | | | Fix #10847: allow to pass a block to `cattr_reader`.
| * | | | Unify `cattr_*` interface: allow to pass a block to `cattr_reader`.Alexey Chernenkov2013-11-154-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: class A cattr_reader(:defr) { 'default_reader_value' } end A.defr # => 'default_reader_value'
* | | | | explain how `to_param` wil truncate long values. [ci skip] refs #12900.Yves Senn2013-11-151-0/+3
| | | | |
* | | | | Merge pull request #12900 from kuldeepaggarwal/f-to-paramRafael Mendonça França2013-11-152-0/+10
|\ \ \ \ \ | | | | | | | | | | | | added one test case and example for ActiveRecord::Base.to_param method
| * | | | | added one test case and example for ActiveRecord::Base.to_param methodKuldeep Aggarwal2013-11-152-0/+10
| |/ / / /
* | | | | Merge pull request #12899 from nateberkopec/remove_broken_internal_guide_linkRafael Mendonça França2013-11-151-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove broken Commmand Line guide link
| * | | | Remove broken Commmand Line guide linkNate Berkopec2013-11-151-2/+0
|/ / / / | | | | | | | | [ci skip]
* | | | Merge pull request #12898 from chocoby/fix/changelog_commentCarlos Antonio da Silva2013-11-151-1/+1
|\ \ \ \ | | | | | | | | | | Fix CHANGELOG typo [ci skip]
| * | | | Fix CHANGELOG typo [ci skip]chocoby2013-11-151-1/+1
| | | | |
* | | | | Avoid hash lookups for building an array of required defaultsCarlos Antonio da Silva2013-11-151-2/+3
| | | | | | | | | | | | | | | | | | | | Only set the value once after it's calculated.
* | | | | Get rid of useless temp variableCarlos Antonio da Silva2013-11-151-2/+1
| | | | |
* | | | | Set values instead of building hashes with single values for mergingCarlos Antonio da Silva2013-11-151-2/+2
|/ / / /
* | | | Merge pull request #9599 from ognevsky/hash-inside-array-in-url-forAndrew White2013-11-154-0/+31
|\ \ \ \ | | | | | | | | | | Take Hash with options inside Array in #url_for
| * | | | Take Hash with options inside Array in #url_forAndrey Ognevsky2013-11-154-0/+31
|/ / / /
* / / / document id prefixed String usage of `.find`. refs #12891 [ci skip]Yves Senn2013-11-151-5/+6
|/ / /
* | | Remove short circuit return in favor of simple conditionalCarlos Antonio da Silva2013-11-151-4/+7
| | |
* | | Invert conditional to avoid double checking for RegexpCarlos Antonio da Silva2013-11-151-11/+12
| | |
* | | Only check that the option exists once instead of doing on each conditionalCarlos Antonio da Silva2013-11-151-8/+9
| | |
* | | Remove argument that is accessible as attributeCarlos Antonio da Silva2013-11-151-3/+3
| | |
* | | Cache regexp source on format validation to avoid allocating new objectsCarlos Antonio da Silva2013-11-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Example: >> r = /some-regexp/ => /some-regexp/ >> r.source.object_id == r.source.object_id => false
* | | Make code simpler to read by using a case statementCarlos Antonio da Silva2013-11-151-2/+6
| | |
* | | Avoid a new hash allocationCarlos Antonio da Silva2013-11-151-1/+1
| | |
* | | Use a simple conditional rather than short circuit with nextCarlos Antonio da Silva2013-11-151-2/+3
| | |
* | | Simplify number parsing logic in numericality validationCarlos Antonio da Silva2013-11-151-10/+3
| | |
* | | Avoid creation of extra hash with merge just to set a valueCarlos Antonio da Silva2013-11-151-1/+3
| | |
* | | Fix test name [ci skip]Carlos Antonio da Silva2013-11-142-3/+1
| | |
* | | Fix AR Changelog examples and improve syntax highlight [ci skip]Carlos Antonio da Silva2013-11-141-12/+12
| | |
* | | Set branch for arel in Gemfile so that we can use bundle local config [ci skip]Carlos Antonio da Silva2013-11-141-1/+1
| | |
* | | Merge pull request #12862 from chancancode/json_gem_compatJeremy Kemper2013-11-143-3/+80
|\ \ \ | | | | | | | | JSON gem compatibility
| * | | Improved compatibility with the stdlib JSON gem.Godfrey Chan2013-11-143-3/+80
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, calling `::JSON.{generate,dump}` sometimes causes unexpected failures such as intridea/multi_json#86. `::JSON.{generate,dump}` now bypasses the ActiveSupport JSON encoder completely and yields the same result with or without ActiveSupport. This means that it will **not** call `as_json` and will ignore any options that the JSON gem does not natively understand. To invoke ActiveSupport's JSON encoder instead, use `obj.to_json(options)` or `ActiveSupport::JSON.encode(obj, options)`.
* | | Revert "Used Yield instead of block.call" -- this causes all of ↵David Heinemeier Hansson2013-11-144-9/+9
| | | | | | | | | | | | | | | | | | atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep". This reverts commit d3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd.
* | | Fix that eager loading of polymorphic associations did not work with ↵David Heinemeier Hansson2013-11-143-4/+10
| | | | | | | | | | | | association empty?/any? predicates any more (there is still a problem when select is applied to a relation, or if you try association#exists? -- but its easier to work around)
* | | Merge pull request #12893 from javan/to-param-addendumRafael Mendonça França2013-11-142-8/+28
|\ \ \ | | | | | | | | Addendum to #12891
| * | | Addendum to #12891Javan Makhmali2013-11-142-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | * Fix incorrectly named tests * Restore Object#to_param behavior * Ensure param is derived from a squished and truncated string
* | | | Merge pull request #12819 from vipulnsward/also_dup_column_typesRafael Mendonça França2013-11-141-3/+4
|\ \ \ \ | | | | | | | | | | Also dup `column_types` in AR::Result `initialize_copy`
| * | | | Also dup `column_types` in AR::Result `initialize_copy`Vipul A M2013-11-101-3/+4
| | | | |
* | | | | Merge pull request #12892 from akshay-vishnoi/refactorRafael Mendonça França2013-11-141-9/+12
|\ \ \ \ \ | |_|/ / / |/| | | | avoiding next statements
| * | | | avoiding next statementsAkshay Vishnoi2013-11-151-9/+12
| | | | |
* | | | | Merge pull request #12889 from kuldeepaggarwal/speed_upsRafael Mendonça França2013-11-144-9/+9
|\ \ \ \ \ | | | | | | | | | | | | Used Yield instead of block.call
| * | | | | Used Yield instead of block.callKuldeep Aggarwal2013-11-154-9/+9
| | | | | |