aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-15158-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 badAaron Patterson2011-02-141-18/+0
| |
| * remove accidental raise!Aaron Patterson2011-02-141-1/+0
| |
| * removing irrelevant testAaron Patterson2011-02-142-18/+1
| |
| * Merge branch 'fixtures'Aaron Patterson2011-02-141-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 methodsAaron Patterson2011-02-142-40/+0
| | |
| | * extract database activity out of Fixtures instancesAaron Patterson2011-02-141-7/+23
| | |
| | * extract rows that should be inserted to a methodAaron Patterson2011-02-141-12/+12
| | |
| | * fixtures will return a list of tables that may be effected, delete existing ↵Aaron Patterson2011-02-142-6/+30
| | | | | | | | | | | | fixtures will delete those tables
| * | Merge remote branch 'jonleighton/association_fixes'Aaron Patterson2011-02-1423-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 Leighton2011-02-141-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 placeJon Leighton2011-02-141-8/+4
| | |
| | * @target should always be an arrayJon Leighton2011-02-141-1/+2
| | |
| | * Rename add_record_to_target_with_callbacks to add_to_targetJon Leighton2011-02-142-5/+5
| | |
| | * Don't pass the block through build_recordJon Leighton2011-02-141-10/+8
| | |
| | * Move create and create! next to buildJon Leighton2011-02-141-21/+21
| | |
| | * Get rid of create_record as it is not only used in one placeJon Leighton2011-02-141-8/+7
| | |
| | * Get rid of AssociationCollection#save_recordJon Leighton2011-02-145-26/+26
| | |
| | * 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-1418-47/+97
| | | | | | | | | | | | ... } rather than instance_eval-ing strings
| * | HabtmFixtures class is no longer neededAaron Patterson2011-02-141-31/+22
| |/
| * Add missing requireSantiago Pastorino2011-02-131-0/+1
| |
| * Remove Relation#& alias for Relation#mergeErnie Miller2011-02-126-14/+12
| |
| * switch over to Mysql2::Client#ping for the mysql2 connection checkBrian Lopez2011-02-121-4/+1
| |
| * Fix table name collision due to incorrect alias count on certain joins.Ernie Miller2011-02-122-4/+11
| | | | | | | | | | | | [#6423 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * key habtm fixtures off table nameAaron Patterson2011-02-111-5/+5
| |
| * Fixture class no longer needs a reference to the database connectionAaron Patterson2011-02-111-16/+4
| |
| * convert fixtures to a list of hashes to insertAaron Patterson2011-02-111-2/+6
| |
| * fixture should quack like a hashAaron Patterson2011-02-111-1/+9
| |
| * Fixtures class constantizes this value, so no need to do it twiceAaron Patterson2011-02-111-3/+3
| |
| * database quoting should take care of this, no need to gsubAaron Patterson2011-02-111-1/+1
| |
| * calculate model class on constructionAaron Patterson2011-02-111-16/+11
| |
| * clear cache for all connections when resettingAaron Patterson2011-02-111-4/+3
| |
| * avoid side effects from method calls, localize ivar assignmentAaron Patterson2011-02-111-3/+4
| |
| * create fixtures always returns a list, so build a hash from the listAaron Patterson2011-02-111-10/+2
| |
| * create_fixtures() should always return a listAaron Patterson2011-02-112-9/+9
| |
| * fixing variable namesAaron Patterson2011-02-111-4/+10
| |
| * use hash defaults to dry up ||= callsAaron Patterson2011-02-111-27/+22
| |
| * refactor fixtures to do less work in the constructorAaron Patterson2011-02-112-11/+24
| |
| * favor composition over inheritence. use AS::OrderedHash rather than omapAaron Patterson2011-02-112-20/+25
| |
| * fixing tests on 1.8, using a list of lists because order is importantAaron Patterson2011-02-102-2/+4
| |
| * simplify bind parameter loggingAaron Patterson2011-02-102-4/+2
| |
| * bind parameters are logged to debug logAaron Patterson2011-02-102-6/+48
| |
| * test cases for bind parameter loggingAaron Patterson2011-02-101-0/+56
| |
| * log method takes an option list of bind valuesAaron Patterson2011-02-094-8/+10
| |
| * rawr, mysql, mysql2, why do you hate me. :'(Aaron Patterson2011-02-091-2/+4
| |
| * removed some duplication from LH issue 5505 regarding AR touch and ↵Josh Kalderimis2011-02-092-9/+11
| | | | | | | | | | | | optimistic locking [#5505 state:resolved] Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com>
| * The optimistic lock column should be increased when calling touchFranck Verrot2011-02-093-0/+16
| | | | | | | | 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-092-1/+8
| | | | | | | | 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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 08:32:26 +0000