aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-141-1/+1
|\
| * Fixed typo.chrismcc2012-06-111-1/+1
| |
* | 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).
* | 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
| | |
* | | Create hstore extension when building PostgreSQL databases.kennyj2012-06-121-0/+10
| | |
* | | 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
| | |
* | | 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
| | | | |
* | | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9Akira Matsuda2012-06-121-1/+1
|/ / / /
* | | | Address ORA-00911 errors because of the heading underscore.Yasuo Honda2012-06-112-2/+2
| | | |
* | | | 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.
| * | | | Fix #6635. We should call Scoping methods, before calling Array methods.kennyj2012-06-102-5/+14
| | | | |
* | | | | Ensure that mass assignment options are preservedAndrew White2012-06-104-11/+55
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two possible scenarios where the @mass_assignment_options instance variable can become corrupted: 1. If the assign_attributes doesn't complete correctly, then subsequent calls to a nested attribute assignment method will use whatever options were passed to the previous assign_attributes call. 2. With nested assign_attributes calls, the inner call will overwrite the current options. This will only affect nested attributes as the attribute hash is sanitized before any methods are called. To fix this we save the current options in a local variable and then restore these options in an ensure block.
* | | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fbaArun Agrawal2012-06-101-1/+1
| | | |
* | | | Use . instead of :: for class methods, add CHANGELOG entriesJosé Valim2012-06-103-4/+7
| | | |
* | | | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-103-0/+54
|\ \ \ \ | | | | | | | | | | Notify A User they Have Pending Migrations
| * | | | raise error for pending migration schneems2012-06-093-4/+35
| | | | | | | | | | | | | | | can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications.
| * | | | add convenience methods for checking migrationsschneems2012-06-032-0/+23
| | | | | | | | | | | | | | | if a rails project needs to be migrated ActiveRecord::Migrator.needs_migration? will be true or false if the current version matches the last version.
* | | | | Merge pull request #6683 from stevecj/fix-fragile-assert-queriesRafael Mendonça França2012-06-095-25/+37
|\ \ \ \ \ | | | | | | | | | | | | Fix fragile #assert_queries implementation and usages.
| * | | | | Fix fragile #assert_queries implementation and usages.Steve Jorgensen2012-06-095-25/+37
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several tests that passed when run in the order they are loaded by rake test were failing when run in different sequences due to problems with the implementation of assert_queries and assert_no_queries as well as incorrect assumptions made about how many queries might be executed by a database adapter in various cases.
* | | | | Remove conditional committed by accidentSantiago Pastorino2012-06-091-1/+1
| | | | |
* | | | | Use each_with_object instead of each hereSantiago Pastorino2012-06-092-4/+4
| | | | |
* | | | | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
|/ / / / | | | | | | | | | | | | ActiveRecord#attributes optimization: minimize objects created
* | | | Skip two tests with polymorphic if current adapter is Oracle Adapter.Yasuo Honda2012-06-081-0/+3
| | | | | | | | | | | | | | | | because Oracle Adapter does not support foreign keys if :polymorphic => true is used.
* | | | Merge pull request #6629 from marcandre/destroyCarlos Antonio da Silva2012-06-065-0/+34
|\ \ \ \ | | | | | | | | | | Add ActiveRecord::Base#destroy!
| * | | | + ActiveRecord::Base#destroy!Marc-Andre Lafortune2012-06-065-0/+34
| | | | |
* | | | | reduce number of StringsAkira Matsuda2012-06-061-1/+1
| | | | |
* | | | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-061-1/+1
| | | | |
* | | | | stop `to_s`ing method namesAkira Matsuda2012-06-062-3/+2
| | | | | | | | | | | | | | | | | | | | Module#methods are Symbols in Ruby >= 1.9
* | | | | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-06-051-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | Resolver tests fail if mysql adapter not installed
| * | | | The resolver tests fail if the mysql gem is not installed; this breaksDavid Paschich2012-06-031-0/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | being able to run the sqlite3 tests without that gem. This fix ensures the tests will only run if the mysql gem is installed. A better solution might be to move these tests into the per-adapter tests, and test each adapter's resolver.
* | | | Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
| | | |
* | | | Add failing test for 3.2.5 datetime attribute regressionEvan Arnold2012-06-041-0/+11
|/ / /
* | | a test case that ensures AR::Relation#merge can merge associationsAkira Matsuda2012-06-031-0/+8
| | |
* | | minor comment revisionXavier Noria2012-06-011-1/+1
| | |
* | | Sync CHANGLOG with the 3-2-stable branchRafael Mendonça França2012-06-011-0/+27
| | |
* | | improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
| | |
* | | unused method argumentsAkira Matsuda2012-06-011-7/+6
| | |
* | | modulize AR::NullRelationAkira Matsuda2012-06-013-4/+9
| | | | | | | | | | | | now we can invoke previously added scope extension methods
* | | Merge branch 'master-sec'Aaron Patterson2012-05-313-3/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 20:35:26 +0000