| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | oops, no need for puts! | Aaron Patterson | 2011-02-18 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | AR::AttributeMethods does not need to be included in an AR::Base class. | Aaron Patterson | 2011-02-18 | 1 | -0/+62 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | fixes a merge conflict | Xavier Noria | 2011-02-19 | 1 | -10/+0 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | merges docrails | Xavier Noria | 2011-02-18 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Fix Typos: remove several occurences of the the | Nicholas Rowe | 2011-02-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -8/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Remove test which was broken on 1.8. This test is now irrelevant since ↵ | Jon Leighton | 2011-02-18 | 1 | -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.8 | Emilio Tagua | 2011-02-18 | 2 | -8/+4 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Should use "=" instead "replace" after this commit: ↵ | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1644663ba7f678d178deab2bf1629dc05626f85b | |||||
| * | | | | | | | | | | | | | | No need to test agaisnt target. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Use to_a instead :load in test, since :load changed. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | No need to test against target anymore. | Emilio Tagua | 2011-02-18 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 16 | -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 Leighton | 2011-02-18 | 10 | -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 Leighton | 2011-02-18 | 4 | -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 Leighton | 2011-02-18 | 2 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved] | |||||
| | * | | | | | | | | | | | | | explicitly allowing lolqueries | Aaron Patterson | 2011-02-16 | 1 | -3/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing whitespace problems | Aaron Patterson | 2011-02-16 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removed an unnecessary second query when passing an ActiveRecord::Relation ↵ | Steven Fenigstein | 2011-02-16 | 1 | -1/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses. | |||||
| | * | | | | | | | | | | | | | fixture methods can be overridden and super() is useful | Aaron Patterson | 2011-02-15 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing variable names, removing FixtureFile instances from test ivars | Aaron Patterson | 2011-02-15 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix expected queries in relation tests. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Run tests without IdentityMap when IM=false is given. | Emilio Tagua | 2011-02-15 | 6 | -15/+23 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 90 | -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 bad | Aaron Patterson | 2011-02-14 | 1 | -18/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removing irrelevant test | Aaron Patterson | 2011-02-14 | 1 | -18/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db | Jon Leighton | 2011-02-14 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Add interpolation of association conditions back in, in the form of proc { ↵ | Jon Leighton | 2011-02-14 | 10 | -25/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... } rather than instance_eval-ing strings | |||||
| | * | | | | | | | | | | | | | Add missing require | Santiago Pastorino | 2011-02-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Remove Relation#& alias for Relation#merge | Ernie Miller | 2011-02-12 | 3 | -10/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fix table name collision due to incorrect alias count on certain joins. | Ernie Miller | 2011-02-12 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6423 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | create_fixtures() should always return a list | Aaron Patterson | 2011-02-11 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | refactor fixtures to do less work in the constructor | Aaron Patterson | 2011-02-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | favor composition over inheritence. use AS::OrderedHash rather than omap | Aaron Patterson | 2011-02-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing tests on 1.8, using a list of lists because order is important | Aaron Patterson | 2011-02-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | simplify bind parameter logging | Aaron Patterson | 2011-02-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | bind parameters are logged to debug log | Aaron Patterson | 2011-02-10 | 1 | -2/+36 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | test cases for bind parameter logging | Aaron Patterson | 2011-02-10 | 1 | -0/+56 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | rawr, mysql, mysql2, why do you hate me. :'( | Aaron Patterson | 2011-02-09 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | The optimistic lock column should be increased when calling touch | Franck Verrot | 2011-02-09 | 2 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | use parenthesis so limit works on all dbs | Aaron Patterson | 2011-02-09 | 1 | -6/+4 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | bugfix for serialized_attributes to be class specific | Raimonds Simanovskis | 2011-02-09 | 1 | -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 Collins | 2011-02-09 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | comma limits do not make sense on oracle or pg | Aaron Patterson | 2011-02-08 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | primary keys should not be cleared on cache clear, fixing oracle tests | Aaron Patterson | 2011-02-08 | 2 | -3/+6 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | limit() should sanitize limit values | Aaron Patterson | 2011-02-08 | 1 | -0/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes CVE-2011-0448 | |||||
| | * | | | | | | | | | | | | | ignore max identifier length queries from pg | Aaron Patterson | 2011-02-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | this test requires the job model, so we should require it | Aaron Patterson | 2011-02-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | make set_table_name take effect immediately | Jan | 2011-02-08 | 3 | -0/+19 | |
| | | | | | | | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Eilertsens Kodeknekkeri |
| aboutsummaryrefslogtreecommitdiffstats |