aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* removes item in the Active Record CHANGELOGXavier Noria2012-06-141-2/+0
| | | | | | | That change to update_attribute was considered to be too subtle and was reverted in 30ea923 just before Rails 3 shipped. Later we introduced update_column (Rails 3.1).
* using hax to fix tests on Ruby 2.0Aaron Patterson2012-06-131-1/+6
|
* Fix buildSantiago Pastorino2012-06-131-2/+2
|
* Merge pull request #6721 from homakov/patch-2Santiago Pastorino2012-06-131-3/+0
|\ | | | | These lines don't help to mitigate CVE. They only turn [nil] into nil, w...
| * These lines don't help to mitigate CVE. They only turn [nil] into nil, w/o ↵Egor Homakov2012-06-131-3/+0
| | | | | | | | | | | | them [nil] turns into [] and that is quite innocent. generated SQL - `IN (NULL)` compact! did all the job.
* | ActionController::Caching depends on RackDelegation and ↵Santiago Pastorino2012-06-132-0/+35
|/ | | | AbstractController::Callbacks
* raise the same exception in order to keep path infoAaron Patterson2012-06-122-1/+15
| | | | | | Ruby 2.0.0 implements LoadError#path, but newly raised load errors will not contain the path information. Replace the error message, copy blame, and rereaise the same exception object
* fixing security email addressAaron Patterson2012-06-121-1/+1
|
* Merge branch 'master-sec'Aaron Patterson2012-06-122-2/+8
|\ | | | | | | | | * master-sec: Array parameters should not contain nil values.
| * Array parameters should not contain nil values.Aaron Patterson2012-06-122-2/+8
| |
* | Merge pull request #6715 from arunagw/add_assertsRafael Mendonça França2012-06-121-2/+2
|\ \ | | | | | | Need a assert here in tests
| * | Need a assert here in testsArun Agrawal2012-06-121-2/+2
|/ /
* | Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-122-1/+5
|\ \ | | | | | | Don't assign the attributes if the list is empty
| * | Don't assign the attributes if the list is empty.Aurelian Oancea2012-06-082-1/+5
| | |
* | | content_type is already a Mime::Type objectSantiago Pastorino2012-06-121-1/+1
| | |
* | | This consider_all_requests_local doesn't make senseSantiago Pastorino2012-06-122-21/+2
| | | | | | | | | | | | | | | This middleware is only for Public Exceptions. This follows bd8c0b8a
* | | Merge pull request #6444 from kennyj/create_extenstion_hstoreRafael Mendonça França2012-06-122-0/+12
|\ \ \ | | | | | | | | Create hstore extension when building PostgreSQL databases (for rails contributor).
| * | | Create hstore extension when building PostgreSQL databases.kennyj2012-06-122-0/+12
|/ / /
* | | Merge pull request #6711 from takkanm/fix-warning-LoadError-path-methodJosé Valim2012-06-121-5/+7
|\ \ \ | | | | | | | | fix method redefined warning in Ruby2.0
| * | | fix method redefined warning in Ruby2.0Mitsutaka Mimura2012-06-121-5/+7
| | | | | | | | | | | | | | | | Ruby2.0 already has LoadError#path.
* | | | Stop relying on mutable structures in the FileUpdateCheckerJosé Valim2012-06-122-35/+7
|/ / /
* | / Remove warnings and unused codeRafael Mendonça França2012-06-112-7/+2
| |/ |/|
* | No need to cache table metadata in advance now that #6683 was merged.Rafael Mendonça França2012-06-112-16/+0
| |
* | Return proper format on exceptionsSantiago Pastorino2012-06-113-14/+81
| |
* | Merge pull request #6492 from pmahoney/fair-connection-pool2Rafael Mendonça França2012-06-115-38/+286
|\ \ | | | | | | | | | | | | | | | | | | Fair connection pool2 Conflicts: activerecord/test/cases/associations/eager_test.rb
| * | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-254-38/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core of this fix is a threadsafe, fair Queue class. It is very similar to Queue in stdlib except that it supports waiting with a timeout. The issue this solves is that if several threads are contending for database connections, an unfair queue makes is possible that a thread will timeout even while other threads successfully acquire and release connections. A fair queue means the thread that has been waiting the longest will get the next available connection. This includes a few test fixes to avoid test ordering issues that cropped up during development of this patch.
| * | Cache metadata in advance to avoid extra sql statements while testing.Yasuo Honda2012-05-251-0/+7
| | | | | | | | | | | | | | | Reason: If metadata is not cached extra sql statements will be executed, which causes failures tests with assert_queries().
* | | Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125Rafael Mendonça França2012-06-111-1/+1
|\ \ \ | | | | | | | | current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6
| * | | current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6Akira Matsuda2012-06-121-1/+1
| | | |
* | | | Merge pull request #6708 from ↵José Valim2012-06-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted ignore .gitignore'd files in rake test:uncomitted
| * | | | ignore .gitignore'd files in rake test:uncomittedAkira Matsuda2012-06-121-1/+1
| |/ / /
* | | | Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fixRafael Mendonça França2012-06-111-1/+1
|\ \ \ \ | | | | | | | | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9
| * | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9Akira Matsuda2012-06-121-1/+1
| |/ / /
* | | | Merge pull request #6705 from ganeshkumar/string_method_changesRafael Mendonça França2012-06-112-8/+8
|\ \ \ \ | | | | | | | | | | both string and symbol will be interpolated as string no need to convert to_s
| * | | | both string and sumbol will be interpolated as string no need to convert to_sganesh2012-06-112-8/+8
| | | | |
* | | | | Merge pull request #6704 from amatsuda/lambda_respond_to_bindingJosé Valim2012-06-111-43/+39
|\ \ \ \ \ | |/ / / / |/| | | | Proc always respond_to :binding
| * | | | Proc always respond_to :bindingAkira Matsuda2012-06-121-43/+39
| |/ / /
* | | | Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-112-1/+12
|\ \ \ \ | |/ / / |/| | | Fix: 'rake rails:templates:copy' doesn't work
| * | | Added a testcase for #6690.kennyj2012-06-121-0/+11
| | | |
| * | | fix stylesheet template dirSugino Yasuhiro2012-06-091-1/+1
| | | |
* | | | Merge pull request #6699 from ↵Rafael Mendonça França2012-06-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | takkanm/fix-character-class-duplicated-range-warning fix warning in Ruby2.0.0
| * | | | fix warning in Ruby2.0.0takkanm2012-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` rails/activesupport/lib/active_support/multibyte/chars.rb:136: warning: character class has duplicated range: /\b('?[\S])/ ```
* | | | | Merge pull request #6698 from yahonda/address_ora_911_masterRafael Mendonça França2012-06-102-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Address ORA-00911 errors because of the heading underscore.
| * | | | Address ORA-00911 errors because of the heading underscore.Yasuo Honda2012-06-112-2/+2
|/ / / /
* | | | Merge pull request #6521 from Empact/throw-resultRafael Mendonça França2012-06-102-1/+8
|\ \ \ \ | | | | | | | | | | Fix that #exists? can blow up with ThrowResult exception
| * | | | Fix that #exists? raises ThrowResult when called with an empty limitedBen Woosley2012-06-102-1/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflection. ActiveRecord::FinderMethods#construct_limited_ids_condition will raise ThrowResult if the limited reflection comes back empty. The other callers of #construct_limited_ids_condition handle this exception (more specifically, the callers of construct_relation_for*), but #exists? didn't until now.
* | | | Remove bundle exec from the exception messageRafael Mendonça França2012-06-101-1/+1
| | | |
* | | | Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-102-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior was added in be4ecdcc87984e9421ff5d5c90d33f475e0fbc01. Closes #1139. Fixes #2553, #1141, #1623 and #2062.
* | | | Minimal change to query generation of exists? that makes SQLServer and ↵iaddict2012-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | others happy that do not work without a column alias. Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
* | | | Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-102-5/+14
|\ \ \ \ | | | | | | | | | | Fix #6635. We should call Scoping methods, before calling Array methods.
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-18 12:43:52 +0000