aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Freeze columns only once per ResultSantiago Pastorino2013-03-031-3/+9
| | | | | Conflicts: activerecord/lib/active_record/result.rb
* Update docs, change_table does not use TableDefinition.Yves Senn2013-02-281-2/+2
| | | | | | | [ci skip] Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
* Improve AR changelog [ci skip]Carlos Antonio da Silva2013-02-281-2/+5
|
* Merge pull request #9485 from authorNari/backport-6755-to-3-2-stableCarlos Antonio da Silva2013-02-283-1/+16
|\ | | | | | | | | Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtures:load. CSV fixtures have already been removed some time ago in 1716da07204193c8acf967e2d75a53a82e4c7c28, but the task was still loading them, even though later it tried to find the related yaml file.
| * Backported #6755 to 3-2-stable. Don't read csv file during executing ↵Narihiro Nakamura2013-02-283-1/+16
|/ | | | db:fixtures:load.
* Enforce i18n version >= v0.6.4Carlos Antonio da Silva2013-02-271-1/+1
| | | | | v0.6.2 and v0.6.3 both have issues with Ruby 1.8.7, see https://github.com/svenfuchs/i18n/issues/192 for more info.
* Merge pull request #9472 from yahonda/revert_7544c7a9Rafael Mendonça França2013-02-271-3/+1
|\ | | | | Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated ...
| * Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated with ↵Yasuo Honda2013-02-281-3/+1
|/ | | | | | | | Oracle adapter." This reverts commit 7544c7a9f290a3ea25099ae38d52795458391785. Oracle enhanced adapter is supporting remove_column with Array.
* Merge pull request #9471 from yahonda/5837_32-stableRafael Mendonça França2013-02-271-4/+4
|\ | | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix
| * Fix ORA-00972 error at test_rename_table_with_prefix_and_suffixYasuo Honda2013-02-281-4/+4
|/ | | | backport pull request#5837 to 3-2-stable
* Tighten up AS.gemspec.Steve Klabnik2013-02-261-1/+1
| | | | | Apparently 0.6.2 has a call to force_encoding, which is not around in 1.8.7.
* CHANGELOG entry for ee291b9.Steve Klabnik2013-02-261-0/+5
| | | | Since we released it, it should go in the CHANGELOG.
* Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric"Steve Klabnik2013-02-267-49/+14
| | | | This reverts commit 921a296a3390192a71abeec6d9a035cc6d1865c8.
* Do not override attributes on `dup` by default scopesHiroshige Umino2013-02-263-1/+13
|
* Improve changelog entry [ci skip]Carlos Antonio da Silva2013-02-261-4/+4
|
* Merge pull request #9430 from authorNari/backport-7072-to-3-2-stableCarlos Antonio da Silva2013-02-263-1/+23
|\ | | | | Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope
| * Backported #7072 to 3-2-stable. Use database value for uniqueness validation ↵Narihiro Nakamura2013-02-263-1/+23
|/ | | | scope.
* Merge pull request #9408 from mikeycgto/origin/3-2-stableRafael Mendonça França2013-02-241-1/+1
|\ | | | | Update RUBY_VERSION check for performance testing to handle 2.0.0
| * Update RUBY_VERSION check for performance testing to handle 2.0.0mikeycgto2013-02-241-1/+1
|/
* Merge pull request #9406 from rails/3-2-stable-ruby-2Rafael Mendonça França2013-02-2417-39/+50
|\ | | | | Rails 3.2.x is now compatible with Ruby 2.0.0
| * Rails 3.2.x is now compatible with Ruby 2.0.0Prem Sichanugrist2013-02-241-3/+0
| |
| * added marshal_load and marshal_dump for ProxyTestResult. Behavior of ↵SHIBATA Hiroshi2013-02-241-2/+10
| | | | | | | | method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
| * Do not redirect cache logger to /dev/null in testPrem Sichanugrist2013-02-241-1/+0
| | | | | | | | | | | | | | | | | | | | For some reason, redirecting cache's logger to '/dev/null' resulting in a test failures and LoadError. I think it's because of Thread issue. Instead of trying to make every logger threadsafe for Rails 3.2, I think it's better to just don't set the logger for now. (Note: resetting the logger back to original value in the teardown block didn't fix the problem.)
| * Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. ↵Jeremy Kemper2013-02-241-1/+0
| | | | | | | | No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af
| * Make the tests pass with minitest 4.2Rafael Mendonça França2013-02-241-0/+3
| |
| * Check for `method_missing` in public and protectedPrem Sichanugrist2013-02-241-1/+2
| | | | | | | | | | | | Ruby 2.0 changed the behavior of `respond_to?` without argument to return only search for public method. We actually want to perform the action only if `method_missing` is either in public or protected.
| * There is already a Set of non-hidden action_names lying around.thedarkone2013-02-241-8/+2
| |
| * Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a ↵Jeremy Kemper2013-02-241-1/+1
| | | | | | | | few times, so fix up the test to work with however it chooses to escape.
| * Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag ↵Aaron Patterson2013-02-241-0/+1
| | | | | | | | this file with us-ascii
| * search private and protected methods for convert_keyAaron Patterson2013-02-243-4/+3
| |
| * Define #inspect instead of #to_sPrem Sichanugrist2013-02-241-2/+2
| | | | | | | | Ruby 2.0 Object#inspect does not call #to_s by default anymore.
| * Fix failing test case when no database.ymlPrem Sichanugrist2013-02-241-4/+11
| |
| * `name` should be public.Aaron Patterson2013-02-241-12/+12
| |
| * Add in missing requiresPrem Sichanugrist2013-02-242-0/+3
|/
* Merge pull request #9388 from senny/9367_wrong_schema_after_remove_columnCarlos Antonio da Silva2013-02-234-2/+34
|\ | | | | Sqlite preserves primary keys when copying/altering tables.
| * Sqlite preserves primary keys when copying/altering tables.Yves Senn2013-02-234-2/+34
|/ | | | | | | | Backport #2312. Fixes #9367. I also added a test-case to make sure that renaming or removing a column preserves the primary key.
* Use 1.8 hash styleCarlos Antonio da Silva2013-02-221-1/+1
|
* Merge pull request #9374 from senny/improved_match_shorthand_syntaxAndrew White2013-02-223-9/+54
|\ | | | | determine the match shorthand target early.
| * determine the match shorthand target early.Yves Senn2013-02-223-9/+54
|/ | | | | | | | | Backport #9361. Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes.
* Change tabs to spaces in form options helper [ci skip]Carlos Antonio da Silva2013-02-211-2/+2
|
* Use order to get the first record since postgresql returns in theRafael Mendonça França2013-02-201-1/+1
| | | | desired order
* Merge pull request #9323 from senny/build_fix_from_9252Rafael Mendonça França2013-02-191-1/+1
|\ | | | | keep the build :green_heart:, #first on 1.8.7 and pg is different
| * keep the build :green_heart:, #first on 1.8.7 and pg is differentYves Senn2013-02-191-1/+1
|/ | | | | | | | | | | The build only failed for ruby-1.8.7 and pg. The problem was that the statement: ```ruby author = Author.includes(:comments_with_order_and_conditions, :posts).first ``` resulted in Author with ID 2 where on all other rubies / db-engines Author with ID 1 was retunred. Of course this breaks the assertions.
* Merge pull request #9322 from senny/backport_9252Rafael Mendonça França2013-02-193-1/+31
|\ | | | | don't cache invalid subsets when preloading hmt associations.
| * don't cache invalid subsets when preloading hmt associations.Yves Senn2013-02-193-1/+31
|/ | | | | | | | | | | | | Backport #9252. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/eager_test.rb The preloader code on 3-2-stable is not based on relations but on option hashes. I had to modify the original patch and comparing the option hashes could be more fuzzy than comparing the relations. All the tests passed though.
* Allow failures to 2.0.0Rafael Mendonça França2013-02-181-0/+3
|
* Fix handling of dirty time zone aware attributesLilibeth De La Cruz2013-02-173-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when `time_zone_aware_attributes` were enabled, after changing a datetime or timestamp attribute and then changing it back to the original value, `changed_attributes` still tracked the attribute as changed. This caused `[attribute]_changed?` and `changed?` methods to return true incorrectly. Example: in_time_zone 'Paris' do order = Order.new original_time = Time.local(2012, 10, 10) order.shipped_at = original_time order.save order.changed? # => false # changing value order.shipped_at = Time.local(2013, 1, 1) order.changed? # => true # reverting to original value order.shipped_at = original_time order.changed? # => false, used to return true end (cherry picked from commit bc982cbcb34129ea2cfe8aa1f8e0b40e444e68db) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb Backport of #9073 Fixes #8898
* Merge pull request #9308 from joernchen/patch-1Xavier Noria2013-02-161-1/+1
|\ | | | | Update activemodel/CHANGELOG.md
| * Update activemodel/CHANGELOG.mdjoernchen of Phenoelit2013-02-161-1/+1
|/ | | Fixed a typo
* Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"Rafael Mendonça França2013-02-153-30/+1
| | | | | | | This reverts commit c5451777b038c5e48567f69256986ae42a2cde48. Conflicts: activerecord/CHANGELOG.md
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 07:07:08 +0000