aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Expand)AuthorAgeFilesLines
* modulize AR::NullRelationAkira Matsuda2012-06-011-1/+6
* Merge branch 'master-sec'Aaron Patterson2012-05-311-0/+19
|\
| * predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-301-0/+19
* | Fix backward compatibility with stored Hash values. Wrap coders to convert se...Jeremy Kemper2012-05-302-13/+19
* | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-301-0/+9
|\ \
| * | 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.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
* | | Allow blocks for count with ActiveRecord::Relation. Document and test that su...chrisfinne2012-05-281-0/+16
* | | Add support for CollectionAssociation#delete by Fixnum or StringFrancesco Rodriguez2012-05-281-3/+17
* | | ConnectionPool wait_timeout no longer used for different types of timeouts. #...Jonathan Rochkind2012-05-233-5/+5
* | | changed xml type datetime to dateTime, fixes #6328Angelo capilleri2012-05-231-7/+7
* | | Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool"Rafael Mendonça França2012-05-222-116/+1
| |/ |/|
* | Merge pull request #6368 from Antiarchitect/store-indifferent-accessJeremy Kemper2012-05-221-0/+34
|\ \
| * | Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store.Andrey Voronkov2012-05-221-0/+34
* | | Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-211-0/+10
* | | Remove not used variables from connection poll testCarlos Antonio da Silva2012-05-211-2/+2
* | | Refactor aggregation writer methodCarlos Antonio da Silva2012-05-211-1/+0
* | | Merge pull request #6416 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-212-1/+116
|\ \ \
| * | | 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 nilYves Senn2012-05-032-0/+23
* | | | fixed typo in word finidingIvan Kukobko2012-05-201-1/+1
* | | | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-191-2/+2
* | | | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-05-181-1/+1
|\ \ \ \
| * | | | 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
| |_|_|/ |/| | |
* | | | 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.Victor Costan2012-05-091-0/+1
* | | Merge pull request #6250 from iGEL/dont_destroy_readonly_modelsAaron Patterson2012-05-171-0/+1
|\ \ \
| * | | 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 RStankov/relation-from-to-accept-other-relation...Jon Leighton2012-05-172-1/+13
|\ \ \
| * | | Relation#from to accept other Relation objectsRadoslav Stankov2012-05-172-1/+13
* | | | Merge pull request #5453 from JonRowe/patch_uniq_has_and_belongs_to_many_when...Aaron Patterson2012-05-161-0/+6
|\ \ \ \
| * | | | when using a preloaded array and the uniq flag is set then return the size of...Jon Rowe2012-03-151-0/+6
* | | | | Merge pull request #6358 from jfirebaugh/schema_defineAaron Patterson2012-05-161-0/+7
|\ \ \ \ \
| * | | | | Call methods on the correct instance in AR::Schema.defineJohn Firebaugh2012-05-161-0/+7
| | |/ / / | |/| | |
* | | | | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-161-0/+12
* | | | | Merge pull request #6192 from danmcclain/add_inet_and_cidr_types_to_postgresq...Aaron Patterson2012-05-162-8/+32
|\ \ \ \ \
| * | | | | Removes NetAddr dependencyDan McClain2012-05-081-3/+4
| * | | | | Converts inet and cidr columns to NetAddr::CIDRDan Seaver2012-05-071-4/+6
| * | | | | Adds migration and schema dump support for INET, CIDR, and MACADDRDan Seaver2012-05-052-3/+24
* | | | | | Merge pull request #5535 from markmcspadden/issue_5527_rollbacksAaron Patterson2012-05-161-0/+37
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |