aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix expected queries in relation tests.Emilio Tagua2011-02-151-2/+2
|
* Don't shadow outer local variable.Emilio Tagua2011-02-151-2/+2
|
* Run tests without IdentityMap when IM=false is given.Emilio Tagua2011-02-156-15/+23
|
* Remove identity map from benchmark script.Emilio Tagua2011-02-151-7/+0
|
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-15430-9198/+12029
|\ | | | | | | | | | | | | | | | | | | | | | | 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 test to prevent regression on namespace root nested in a resourceAndrew White2011-02-141-0/+9
| | | | | | | | | | | | [#6389 state:resolved]
| * | Fix named route helper for routes nested inside deeply nested resourcesAndrew White2011-02-142-2/+10
| |/ | | | | | | [#6416 state:resolved]
| * Add notes on how to override the default :id constraint [#5994 state:resolved]Andrew White2011-02-142-1/+12
| |
| * Remove incorrect assert_recognizes exampleAndrew White2011-02-141-6/+0
| |
| * Remove incorrect assert_recognizes exampleAndrew White2011-02-131-3/+0
| |
| * Fix assert_recognizes with block constraints [#5805 state:resolved]Andrew White2011-02-134-6/+116
| |
| * Add missing requireSantiago Pastorino2011-02-131-0/+1
| |
| * Add Date#rfc3339 and Date#iso8601 to ASSantiago Pastorino2011-02-133-0/+17
| |
| * 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
| |
| * Make gem "ruby-debug19" require ruby-debugSantiago Pastorino2011-02-121-1/+1
| |
| * added proper require for ruby-debug19 gem to generated GemfileWojciech Wnętrzak2011-02-121-1/+1
| | | | | | | | | | | | [#6419 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Allow for the format of time_tag in AP to be changed via an option argument.Josh Kalderimis2011-02-122-8/+16
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Added time_tag helper to AP for HTML5 time tag [#5919 state:resolved]Sjoerd Andringa2011-02-123-2/+41
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * 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>
| * Applied changes to stylesheet_link_tag from javascript_include_tag which ↵Josh Kalderimis2011-02-133-14/+38
| | | | | | | | corrects issues with ordering and duplicates.
| * This corrects two issues with javascript_include_tag, the order at which ↵Josh Kalderimis2011-02-132-5/+47
| | | | | | | | | | | | | | | | they are expanded, and removing duplicates. When individual js assets are specified, they will override the order of the same asset specified in an expansion. [#5938 state:resolved]
| * Remove duplicated action pack tests added to fix issue with fields_for, ↵Carlos Antonio da Silva2011-02-121-42/+0
| | | | | | | | | | | | nested attributes and erb Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Add block support to button_tag helperTom Stuart2011-02-122-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the HTML 4.01 spec: Buttons created with the BUTTON element function just like buttons created with the INPUT element, but they offer richer rendering possibilities: the BUTTON element may have content. For example, a BUTTON element that contains an image functions like and may resemble an INPUT element whose type is set to "image", but the BUTTON element type allows content. Since rich content is the main purpose of the <button> element, it makes sense for the button_tag helper to accept a block. http://www.w3.org/TR/html401/interact/forms.html#edef-BUTTON http://dev.w3.org/html5/spec/the-button-element.html#the-button-element Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>
| * Make type="submit" the default for button_tag helperTom Stuart2011-02-122-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | "submit" is the default value of the <button> element's type attribute according to the HTML 4.01 and the HTML5 draft specs, so if button_tag is going to have a default, type="submit" is a more sensible choice than type="button". http://www.w3.org/TR/html401/interact/forms.html#adef-type-BUTTON http://dev.w3.org/html5/spec/the-button-element.html#attr-button-type Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>
| * Updated the json date regex to recognize xmlschema formatted date times ↵Josh Kalderimis2011-02-122-1/+5
| | | | | | | | | | | | during json decoding. [#3031 state:resolved] Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:36:07 +0000