aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | 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
|
* modulize AR::NullRelationAkira Matsuda2012-06-011-1/+6
| | | | now we can invoke previously added scope extension methods
* Merge branch 'master-sec'Aaron Patterson2012-05-311-0/+19
|\ | | | | | | | | | | * 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-301-0/+19
| | | | | | | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661
* | Fix backward compatibility with stored Hash values. Wrap coders to convert ↵Jeremy Kemper2012-05-302-13/+19
| | | | | | | | serialized values to indifferent access.
* | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-301-0/+9
|\ \ | | | | | | 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-301-0/+9
| | |
* | | Merge pull request #6386 from kennyj/fix_logs_name_consistencyAaron Patterson2012-05-304-15/+108
|\ \ \ | |/ / |/| | Fix logs name consistency.
| * | Fix logs name consistency.kennyj2012-05-194-15/+108
| | |
* | | Add tests to delete by fixnum or string id with has many through associationsFrancesco Rodriguez2012-05-281-0/+20
| | |
* | | Fix failing build related to change in CollectionAssociation#deleteCarlos Antonio da Silva2012-05-291-1/+1
| | | | | | | | | | | | Merge commit 6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e
* | | Allow blocks for count with ActiveRecord::Relation. Document and test that ↵chrisfinne2012-05-281-0/+16
| | | | | | | | | | | | sum allows blocks
* | | Add support for CollectionAssociation#delete by Fixnum or StringFrancesco Rodriguez2012-05-281-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found the next issue between CollectionAssociation `delete` and `destroy`. class Person < ActiveRecord::Base has_many :pets end person.pets.destroy(1) # => OK, returns the destroyed object person.pets.destroy("2") # => OK, returns the destroyed object person.pets.delete(1) # => ActiveRecord::AssociationTypeMismatch person.pets.delete("2") # => ActiveRecord::AssociationTypeMismatch Adding support for deleting with a fixnum or string like `destroy` method.
* | | ConnectionPool wait_timeout no longer used for different types of timeouts. ↵Jonathan Rochkind2012-05-233-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #6441 An AR ConnectionSpec `wait_timeout` is pre-patch used for three different things: * mysql2 uses it for MySQL's own wait_timeout (how long MySQL should allow an idle connection before closing it), and defaults to 2592000 seconds. * ConnectionPool uses it for "number of seconds to block and wait for a connection before giving up and raising a timeout error", default 5 seconds. * ConnectionPool uses it for the Reaper, for deciding if a 'dead' connection can be reaped. Default 5 seconds. Previously, if you want to change these from defaults, you need to change them all together. This is problematic _especially_ for the mysql2/ConnectionPool conflict, you will generally _not_ want them to be the same, as evidenced by their wildly different defaults. This has caused real problems for people #6441 #2894 But as long as we're changing this, forcing renaming the ConnectionPool key to be more specific, it made sense to seperate the two ConnectionPool uses too -- these two types of ConnectionPool timeouts ought to be able to be changed independently, you won't neccesarily want them to be the same, even though the defaults are (currently) the same.
* | | changed xml type datetime to dateTime, fixes #6328Angelo capilleri2012-05-231-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | XmlMini define the xml 'datatime', but according to http://www.w3.org/TR/xmlschema-2/#dateTime could be better change this to 'dateTime' with upper case letter 'T. So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime' add the changing to the changelog
* | | Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool"Rafael Mendonça França2012-05-222-116/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | This reverts commit d2901f0fc4270a765717ad572d559dc49a56b3a8, reversing changes made to 525839fdd8cc34d6d524f204528d5b6f36fe410c. Conflicts: activerecord/test/cases/connection_pool_test.rb Reason: This change broke the build (http://travis-ci.org/#!/rails/rails/builds/1391490) and we don't have any solution until now. I asked the author to try to fix it and open a new pull request.
* | Merge pull request #6368 from Antiarchitect/store-indifferent-accessJeremy Kemper2012-05-221-0/+34
|\ \ | | | | | | Support migrating from Hash to HashWithIndifferentAccess for accessing attributes.
| * | Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store.Andrey Voronkov2012-05-221-0/+34
| | | | | | | | | | | | | | | | | | | | | In order to make migration from 3.x apps easier, we should try to convert Hash instances to HashWithIndifferentAccess, to allow accessing values with both symbol and a string. This is follow up to changes in 3c0bf043.
* | | Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when saving a frozen record, an exception would be thrown which causes a rollback. However, there is a bug in active record that "defrost" the record as a side effect: >> t = Topic.new => #<Topic id: nil, ...> >> t.freeze => #<Topic id: nil, ...> >> t.save RuntimeError: can't modify a frozen Hash >> t.frozen? => false >> t.save => true This patch fixes the bug by explictly restoring the frozen state on the attributes Hash after every rollback.
* | | Remove not used variables from connection poll testCarlos Antonio da Silva2012-05-211-2/+2
| | | | | | | | | | | | These variables were issuing some "not used" warnings.
* | | Refactor aggregation writer methodCarlos Antonio da Silva2012-05-211-1/+0
| | | | | | | | | | | | Only constantize class_name once.
* | | Merge pull request #6416 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-212-1/+116
|\ \ \ | | | | | | | | Make connection pool fair with respect to waiting threads.
| * | | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-202-1/+116
| | | |
* | | | Merge pull request #6143 from senny/composed_of_converter_returns_nilAaron Patterson2012-05-212-0/+23
|\ \ \ \ | |/ / / |/| | | allow the :converter Proc form composed_of to return nil
| * | | allow the :converter Proc form composed_of to return nilYves Senn2012-05-032-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to filter invalid input values before they are passed into the value-object (like empty strings). This behaviour is only relevant if the :allow_nil options is set to true. Otherwise you will get the resulting NoMethodError.
* | | | fixed typo in word finidingIvan Kukobko2012-05-201-1/+1
| | | |
* | | | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association.
* | | | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-05-181-1/+1
|\ \ \ \ | | | | | | | | | | Increase numeric-timestamp precision to nanoseconds
| * | | | Increase `AR#cache_key` precision to nanosecondsJamie Gaskins2012-05-191-1/+1
| | | | |
* | | | | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-181-0/+6
| | | | |
* | | | | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-181-0/+12
| |_|_|/ |/| | | | | | | | | | | Bug #6289
* | | | port some mocha to minitest/mockAaron Patterson2012-05-183-222/+222
| |_|/ |/| |
* | | quarantine more deprecated stuffJon Leighton2012-05-184-36/+36
| | |
* | | quarantine deprecated testsJon Leighton2012-05-1810-578/+605
|/ /
* | Merge pull request #6238 from pwnall/pgsql_bytea_limitAaron Patterson2012-05-171-0/+1
|\ \ | | | | | | Postgresql doesn't accept limits on binary (bytea) columns.
| * | Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-091-0/+1
| | |
* | | Merge pull request #6250 from iGEL/dont_destroy_readonly_modelsAaron Patterson2012-05-171-0/+1
|\ \ \ | | | | | | | | Don't allow to destroy readonly models
| * | | Don't destroy readonly modelsJohannes Barre2012-05-171-0/+1
| | | |
* | | | Fix warning: ambiguous first argument.kennyj2012-05-181-1/+1
|/ / /
* | | Merge pull request #6058 from ↵Jon Leighton2012-05-172-1/+13
|\ \ \ | | | | | | | | | | | | | | | | RStankov/relation-from-to-accept-other-relation-objects Relation#from to accept other Relation objects
| * | | Relation#from to accept other Relation objectsRadoslav Stankov2012-05-172-1/+13
| | | | | | | | | | | | | | | | Record.from("(#{sub_query.to_sql})") -> Record.from(sub_query) Record.from("(#{sub_query.to_sql}) a") -> Record.from(sub_query, :a)
* | | | Merge pull request #5453 from ↵Aaron Patterson2012-05-161-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | JonRowe/patch_uniq_has_and_belongs_to_many_when_already_loaded When Active Record has already loaded a unique association `.size` returns the wrong number.
| * | | | when using a preloaded array and the uniq flag is set then return the size ↵Jon Rowe2012-03-151-0/+6
| | | | | | | | | | | | | | | | | | | | of the uniq array
* | | | | Merge pull request #6358 from jfirebaugh/schema_defineAaron Patterson2012-05-161-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Call methods on the correct instance in AR::Schema.define
| * | | | | Call methods on the correct instance in AR::Schema.defineJohn Firebaugh2012-05-161-0/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Now that migrations support instance methods, we should use the same instance rather than relying on delegation to a global instance. This allows subclassing AR::Schema.
* | | | | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-161-0/+12
| | | | |
* | | | | Merge pull request #6192 from ↵Aaron Patterson2012-05-162-8/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | danmcclain/add_inet_and_cidr_types_to_postgresql_adapter Add support for macaddr, inet, and cidr types to PostgreSQL adapter
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 14:32:37 +0000