| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | | Fix expected queries in relation tests. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Don't shadow outer local variable. | 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 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Remove identity map from benchmark script. | Emilio Tagua | 2011-02-15 | 1 | -7/+0 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 158 | -3075/+5503 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | remove accidental raise! | Aaron Patterson | 2011-02-14 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removing irrelevant test | Aaron Patterson | 2011-02-14 | 2 | -18/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge branch 'fixtures' | Aaron Patterson | 2011-02-14 | 1 | -28/+28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixtures: remove unused methods extract database activity out of Fixtures instances extract rows that should be inserted to a method fixtures will return a list of tables that may be effected, delete existing fixtures will delete those tables | |||||
| | | * | | | | | | | | | | | | | remove unused methods | Aaron Patterson | 2011-02-14 | 2 | -40/+0 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | extract database activity out of Fixtures instances | Aaron Patterson | 2011-02-14 | 1 | -7/+23 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | extract rows that should be inserted to a method | Aaron Patterson | 2011-02-14 | 1 | -12/+12 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | fixtures will return a list of tables that may be effected, delete existing ↵ | Aaron Patterson | 2011-02-14 | 2 | -6/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixtures will delete those tables | |||||
| | * | | | | | | | | | | | | | | Merge remote branch 'jonleighton/association_fixes' | Aaron Patterson | 2011-02-14 | 23 | -117/+171 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jonleighton/association_fixes: Add a transaction wrapper in add_to_target. This means that #build will now also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create. Inline ensure_owner_is_persisted! as it is only called from one place @target should always be an array Rename add_record_to_target_with_callbacks to add_to_target Don't pass the block through build_record Move create and create! next to build Get rid of create_record as it is not only used in one place Get rid of AssociationCollection#save_record Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db Add interpolation of association conditions back in, in the form of proc { ... } rather than instance_eval-ing strings | |||||
| | | * | | | | | | | | | | | | | Add a transaction wrapper in add_to_target. This means that #build will now ↵ | Jon Leighton | 2011-02-14 | 1 | -27/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create. | |||||
| | | * | | | | | | | | | | | | | Inline ensure_owner_is_persisted! as it is only called from one place | Jon Leighton | 2011-02-14 | 1 | -8/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | @target should always be an array | Jon Leighton | 2011-02-14 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Rename add_record_to_target_with_callbacks to add_to_target | Jon Leighton | 2011-02-14 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Don't pass the block through build_record | Jon Leighton | 2011-02-14 | 1 | -10/+8 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Move create and create! next to build | Jon Leighton | 2011-02-14 | 1 | -21/+21 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Get rid of create_record as it is not only used in one place | Jon Leighton | 2011-02-14 | 1 | -8/+7 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Get rid of AssociationCollection#save_record | Jon Leighton | 2011-02-14 | 5 | -26/+26 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | 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 | 18 | -47/+97 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... } rather than instance_eval-ing strings | |||||
| | * | | | | | | | | | | | | | | HabtmFixtures class is no longer needed | Aaron Patterson | 2011-02-14 | 1 | -31/+22 | |
| | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Add missing require | Santiago Pastorino | 2011-02-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Remove Relation#& alias for Relation#merge | Ernie Miller | 2011-02-12 | 6 | -14/+12 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | switch over to Mysql2::Client#ping for the mysql2 connection check | Brian Lopez | 2011-02-12 | 1 | -4/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fix table name collision due to incorrect alias count on certain joins. | Ernie Miller | 2011-02-12 | 2 | -4/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6423 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | key habtm fixtures off table name | Aaron Patterson | 2011-02-11 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fixture class no longer needs a reference to the database connection | Aaron Patterson | 2011-02-11 | 1 | -16/+4 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | convert fixtures to a list of hashes to insert | Aaron Patterson | 2011-02-11 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixture should quack like a hash | Aaron Patterson | 2011-02-11 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fixtures class constantizes this value, so no need to do it twice | Aaron Patterson | 2011-02-11 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | database quoting should take care of this, no need to gsub | Aaron Patterson | 2011-02-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | calculate model class on construction | Aaron Patterson | 2011-02-11 | 1 | -16/+11 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | clear cache for all connections when resetting | Aaron Patterson | 2011-02-11 | 1 | -4/+3 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | avoid side effects from method calls, localize ivar assignment | Aaron Patterson | 2011-02-11 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | create fixtures always returns a list, so build a hash from the list | Aaron Patterson | 2011-02-11 | 1 | -10/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | create_fixtures() should always return a list | Aaron Patterson | 2011-02-11 | 2 | -9/+9 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing variable names | Aaron Patterson | 2011-02-11 | 1 | -4/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | use hash defaults to dry up ||= calls | Aaron Patterson | 2011-02-11 | 1 | -27/+22 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | refactor fixtures to do less work in the constructor | Aaron Patterson | 2011-02-11 | 2 | -11/+24 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | favor composition over inheritence. use AS::OrderedHash rather than omap | Aaron Patterson | 2011-02-11 | 2 | -20/+25 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing tests on 1.8, using a list of lists because order is important | Aaron Patterson | 2011-02-10 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | simplify bind parameter logging | Aaron Patterson | 2011-02-10 | 2 | -4/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | bind parameters are logged to debug log | Aaron Patterson | 2011-02-10 | 2 | -6/+48 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | test cases for bind parameter logging | Aaron Patterson | 2011-02-10 | 1 | -0/+56 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | log method takes an option list of bind values | Aaron Patterson | 2011-02-09 | 4 | -8/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | rawr, mysql, mysql2, why do you hate me. :'( | Aaron Patterson | 2011-02-09 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Eilertsens Kodeknekkeri |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/activerecord