aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-121-1/+1
|\ | | | | Don't assign the attributes if the list is empty
| * Don't assign the attributes if the list is empty.Aurelian Oancea2012-06-081-1/+1
| |
* | Merge pull request #6492 from pmahoney/fair-connection-pool2Rafael Mendonça França2012-06-111-37/+174
|\ \ | | | | | | | | | | | | | | | | | | Fair connection pool2 Conflicts: activerecord/test/cases/associations/eager_test.rb
| * | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-251-37/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Address ORA-00911 errors because of the heading underscore.Yasuo Honda2012-06-111-1/+1
| | |
* | | Fix that #exists? raises ThrowResult when called with an empty limitedBen Woosley2012-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-101-5/+5
|\ \ \ | | | | | | | | Fix #6635. We should call Scoping methods, before calling Array methods.
| * | | Fix #6635. We should call Scoping methods, before calling Array methods.kennyj2012-06-101-5/+5
| | | |
* | | | Ensure that mass assignment options are preservedAndrew White2012-06-102-10/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-2/+2
| | |
* | | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-102-0/+39
|\ \ \ | | | | | | | | Notify A User they Have Pending Migrations
| * | | raise error for pending migration schneems2012-06-092-2/+33
| | | | | | | | | | | | 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-031-0/+8
| | | | | | | | | | | | 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-091-19/+31
|\ \ \ \ | | | | | | | | | | Fix fragile #assert_queries implementation and usages.
| * | | | Fix fragile #assert_queries implementation and usages.Steve Jorgensen2012-06-091-19/+31
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #6629 from marcandre/destroyCarlos Antonio da Silva2012-06-062-0/+20
|\ \ \ | | | | | | | | Add ActiveRecord::Base#destroy!
| * | | + ActiveRecord::Base#destroy!Marc-Andre Lafortune2012-06-062-0/+20
| | | |
* | | | reduce number of StringsAkira Matsuda2012-06-061-1/+1
| | | |
* | | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-061-1/+1
|/ / /
* | | Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
| | |
* | | minor comment revisionXavier Noria2012-06-011-1/+1
| | |
* | | improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
| | |
* | | unused method argumentsAkira Matsuda2012-06-011-7/+6
| | |
* | | modulize AR::NullRelationAkira Matsuda2012-06-012-3/+3
| | | | | | | | | | | | now we can invoke previously added scope extension methods
* | | Merge branch 'master-sec'Aaron Patterson2012-05-312-3/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | * 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
| * | | predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-302-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661
* | | | Psych is always available on 1.9Jeremy Kemper2012-05-312-29/+23
| | | |
* | | | Fix wrong example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
| | | | | | | | | | | | | | | | Thanks @splattael.
* | | | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-05-311-0/+1
| | | |
* | | | Fix backward compatibility with stored Hash values. Wrap coders to convert ↵Jeremy Kemper2012-05-301-2/+32
| | | | | | | | | | | | | | | | serialized values to indifferent access.
* | | | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
|\ \ \ \ | |_|/ / |/| | | Properly discover a connection is closed in postgresql_adapter
| * | | Properly discover a connection is closed in postgresql_adapterSteve Klabnik2012-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PQstatus doesn't properly test if future operations will succeed. A PQping function is added to libpq in PostgreSQL 9.1, but if we rely on it, everyone on earlier versions of Postgres is out of luck, and the pg gem wouldn't have the 'fix' until the next release. Thanks to @cbrecabarren and @ged for handling all the dirty details. Closes #3392.
* | | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-303-5/+6
|\ \ \ \ | | | | | | | | | | Fix #5797. Error calling dup method on AR model with serialized field
| * | | | Fix #5797. Error calling dup method on AR model with serialized fieldkennyj2012-05-303-5/+6
| | | | |
* | | | | Merge pull request #6386 from kennyj/fix_logs_name_consistencyAaron Patterson2012-05-303-18/+15
|\ \ \ \ \ | | | | | | | | | | | | Fix logs name consistency.
| * | | | | Fix logs name consistency.kennyj2012-05-193-18/+15
| | | | | |
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-304-23/+33
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | copy edit the batches docs [ci skip]Vijay Dev2012-05-301-9/+7
| | | | | |
| * | | | | change example on CollectionProxy#delete to accept multiple valuesFrancesco Rodriguez2012-05-281-1/+1
| | | | | |
| * | | | | Adds to Batch processing documentation [ci skip]Alvaro Pereyra2012-05-281-9/+20
| | | | | |
| * | | | | fix typo and remove 'examples' noise [ci skip]Francesco Rodriguez2012-05-281-18/+6
| | | | | |
| * | | | | Updates examples for FinderMethods [ci skip]Alvaro Pereyra2012-05-281-2/+14
| | | | | |
| * | | | | Merge branch 'master' of github.com:lifo/docrailsAlvaro Pereyra2012-05-2827-86/+715
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:02:59 +0000