aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-211-1/+1
| |\
| | * Tpyo: fixing several cases of the theNicholas Rowe2011-02-191-1/+1
| | |
| * | oops, no need for puts!Aaron Patterson2011-02-181-1/+0
| | |
| * | AR::AttributeMethods does not need to be included in an AR::Base class.Aaron Patterson2011-02-181-0/+62
| | |
| * | fixes a merge conflictXavier Noria2011-02-191-10/+0
| |/
| * merges docrailsXavier Noria2011-02-181-0/+10
| |\
| | * Fix Typos: remove several occurences of the theNicholas Rowe2011-02-171-1/+1
| | |
| * | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-181-8/+0
| |\ \
| | * | Remove test which was broken on 1.8. This test is now irrelevant since ↵Jon Leighton2011-02-181-8/+0
| | | | | | | | | | | | | | | | singular associations no longer return a proxy object.
| * | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8Emilio Tagua2011-02-182-8/+4
| | | |
| * | | Should use "=" instead "replace" after this commit: ↵Emilio Tagua2011-02-181-1/+1
| | | | | | | | | | | | | | | | 1644663ba7f678d178deab2bf1629dc05626f85b
| * | | No need to test agaisnt target.Emilio Tagua2011-02-181-1/+1
| | | |
| * | | Use to_a instead :load in test, since :load changed.Emilio Tagua2011-02-181-1/+1
| | | |
| * | | No need to test against target anymore.Emilio Tagua2011-02-181-8/+8
| | | |
| * | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1816-162/+105
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb
| | * | Split AssociationProxy into an Association class (and subclasses) which ↵Jon Leighton2011-02-1810-152/+19
| | | | | | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more.
| | * | Allow building and then later saving has_many :through records, such that ↵Jon Leighton2011-02-184-1/+23
| | | | | | | | | | | | | | | | the join record is automatically saved too. This requires the :inverse_of option to be set on the source association in the join model. See the CHANGELOG for details. [#4329 state:resolved]
| | * | Ensure that association_ids uses the correct attribute where the association ↵Jon Leighton2011-02-182-0/+11
| | | | | | | | | | | | | | | | is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved]
| | * | explicitly allowing lolqueriesAaron Patterson2011-02-161-3/+10
| | | |
| | * | fixing whitespace problemsAaron Patterson2011-02-161-3/+3
| | | |
| | * | removed an unnecessary second query when passing an ActiveRecord::Relation ↵Steven Fenigstein2011-02-161-1/+28
| | | | | | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses.
| | * | fixture methods can be overridden and super() is usefulAaron Patterson2011-02-151-0/+15
| | | |
| | * | fixing variable names, removing FixtureFile instances from test ivarsAaron Patterson2011-02-151-6/+0
| | | |
| * | | Fix expected queries in relation tests.Emilio Tagua2011-02-151-2/+2
| | | |
| * | | Run tests without IdentityMap when IM=false is given.Emilio Tagua2011-02-156-15/+23
| | | |
| * | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1590-783/+2261
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb
| | * | bad tests are badAaron Patterson2011-02-141-18/+0
| | | |
| | * | removing irrelevant testAaron Patterson2011-02-141-18/+0
| | | |
| | * | Fix test/cases/connection_pool_test.rb for sqlite3 in-memory dbJon Leighton2011-02-141-0/+10
| | | |
| | * | Add interpolation of association conditions back in, in the form of proc { ↵Jon Leighton2011-02-1410-25/+47
| | | | | | | | | | | | | | | | ... } rather than instance_eval-ing strings
| | * | Add missing requireSantiago Pastorino2011-02-131-0/+1
| | | |
| | * | Remove Relation#& alias for Relation#mergeErnie Miller2011-02-123-10/+10
| | | |
| | * | Fix table name collision due to incorrect alias count on certain joins.Ernie Miller2011-02-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | [#6423 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * | create_fixtures() should always return a listAaron Patterson2011-02-111-5/+5
| | | |
| | * | refactor fixtures to do less work in the constructorAaron Patterson2011-02-111-1/+1
| | | |
| | * | favor composition over inheritence. use AS::OrderedHash rather than omapAaron Patterson2011-02-111-1/+1
| | | |
| | * | fixing tests on 1.8, using a list of lists because order is importantAaron Patterson2011-02-101-1/+1
| | | |
| | * | simplify bind parameter loggingAaron Patterson2011-02-101-1/+1
| | | |
| | * | bind parameters are logged to debug logAaron Patterson2011-02-101-2/+36
| | | |
| | * | test cases for bind parameter loggingAaron Patterson2011-02-101-0/+56
| | | |
| | * | rawr, mysql, mysql2, why do you hate me. :'(Aaron Patterson2011-02-091-2/+4
| | | |
| | * | The optimistic lock column should be increased when calling touchFranck Verrot2011-02-092-0/+9
| | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com>
| | * | use parenthesis so limit works on all dbsAaron Patterson2011-02-091-6/+4
| | | |
| | * | bugfix for serialized_attributes to be class specificRaimonds Simanovskis2011-02-091-0/+5
| | | | | | | | | | | | | | | | previously serialized_attributes were kept as class attribute of ActiveRecord::Base - if some attribute was defined as serialized in one subclass then it was serialized in all other subclasses as well (if it had the same name)
| | * | Allow limit values to accept an ARel SQL literal.Ken Collins2011-02-091-2/+8
| | | |
| | * | comma limits do not make sense on oracle or pgAaron Patterson2011-02-081-3/+5
| | | |
| | * | primary keys should not be cleared on cache clear, fixing oracle testsAaron Patterson2011-02-082-3/+6
| | | |
| | * | limit() should sanitize limit valuesAaron Patterson2011-02-081-0/+34
| | | | | | | | | | | | | | | | This fixes CVE-2011-0448
| | * | ignore max identifier length queries from pgAaron Patterson2011-02-081-1/+1
| | | |
| | * | this test requires the job model, so we should require itAaron Patterson2011-02-081-0/+1
| | | |