looks like somebody forgot to remove the field operations for the node title in node_update_7006() after node titles as fields was rolled back, which breaks the upgrade path hard. attached patch should fix the issue.

i also removed an unnecessary line from the node_revision update query -- we're pulling the node revision to update based on the vid, so no reason to update the vid to itself... ;)

p.s. -- you'll need the latest patch from #211182: Updates run in unpredictable order if it hasn't already been committed in order to test the upgrade path before/after this patch.

CommentFileSizeAuthor
node_update_7006_fix.patch1.56 KBhunmonk

Comments

webchick’s picture

Status: Needs review » Fixed

I didn't test this, but our upgrade path can't possibly be more broken than it is right now, so any little thing helps. :) It makes sense that this was overlooked during the revert of node titles as fields.

Committed to HEAD.

yched’s picture

+++ modules/node/node.install	14 Jan 2010 01:09:41 -0000
@@ -518,13 +516,12 @@ function node_update_7006(&$context) {
         db_update('node_revision')
           ->fields(array(
-            'vid' => $revision->vid,
             'status' => $revision->status,
             'comment' => $revision->comment,
             'promote' => $revision->promote,

Just wondering: why was this needed ? I fail to see how that's related to the revert of 'title as field'.
Is it a consequence of the changes in #261258: Fix node_save() insertion logic ?

Powered by Dreditor.

hunmonk’s picture

@yched: read the entire original issue description for an explanation of why i took that line out.

yched’s picture

@hunmonk: Ah, right. Thx :-)

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.