aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1564-2162/+3057
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * remove accidental raise!Aaron Patterson2011-02-141-1/+0
| |
| * removing irrelevant testAaron Patterson2011-02-141-0/+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-141-35/+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-141-6/+25
| | | | | | | | | | | | fixtures will delete those tables
| * | Merge remote branch 'jonleighton/association_fixes'Aaron Patterson2011-02-1411-90/+93
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | |
| | * Add interpolation of association conditions back in, in the form of proc { ↵Jon Leighton2011-02-147-20/+29
| | | | | | | | | | | | ... } rather than instance_eval-ing strings
| * | HabtmFixtures class is no longer neededAaron Patterson2011-02-141-31/+22
| |/
| * Remove Relation#& alias for Relation#mergeErnie Miller2011-02-123-4/+2
| |
| * 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-121-4/+4
| | | | | | | | | | | | [#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-111-4/+4
| |
| * 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-111-10/+23
| |
| * favor composition over inheritence. use AS::OrderedHash rather than omapAaron Patterson2011-02-111-19/+24
| |
| * fixing tests on 1.8, using a list of lists because order is importantAaron Patterson2011-02-101-1/+3
| |
| * simplify bind parameter loggingAaron Patterson2011-02-101-3/+1
| |
| * bind parameters are logged to debug logAaron Patterson2011-02-101-4/+12
| |
| * log method takes an option list of bind valuesAaron Patterson2011-02-094-8/+10
| |
| * 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-091-0/+7
| | | | | | | | Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com>
| * bugfix for serialized_attributes to be class specificRaimonds Simanovskis2011-02-091-1/+3
| | | | | | | | 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-3/+7
| |
| * primary keys should not be cleared on cache clear, fixing oracle testsAaron Patterson2011-02-083-3/+9
| |
| * limit() should sanitize limit valuesAaron Patterson2011-02-082-16/+16
| | | | | | | | This fixes CVE-2011-0448
| * make set_table_name take effect immediatelyJan2011-02-081-0/+3
| |
| * just return the record from insert_record, use truthiness for comparisonsAaron Patterson2011-02-072-3/+5
| |
| * Documentation for recent refinements to association deletionJon Leighton2011-02-071-3/+75
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 18:00:40 +0000