revisions of unpublished nodes lose their body field on upgrade

Yikes, I suspect this was my fault.

I don't have the time to think about it carefully at the moment, but I did at least notice that I think we're computing $total['sandbox'] wrong too:

    $query = db_select('node', 'n');
    $query->join('node_revision', 'nr', 'n.vid = nr.vid');
    $sandbox['total'] = $query->countQuery()->execute()->fetchField();

That will count only the number of nodes, not the number of node revisions, so the progress bar will be displayed incorrectly.

That's one easy fix!

Well, ksenzee fixed the bug and barry's is a different issue but i guess it belongs here,yes.

sub

Added fix for progress per barry's note.

I'm reviewing.

Patch looks good to me except I found a problem in the new Simpletest: in the upgrade simpletest database there are some revisions that legitimately do have empty bodies- the poll nodes. So I just adjusted the test to avoid the poll nodes. All other nodes have bodies.

Nice catch. Ready to fly.

Lift off!!

Committed to HEAD. NICE catch. That would've been highly unfortunate to have been found after beta. :)

Edit: Sorry, janky wifi.

It seems to me the test should have been updated to check whether the original node had an empty body and then verify the new body based on whether it did, instead of hard-coding that in the current test data poll nodes have no body. I guess it will be fine until it causes some other test to fail, at which point it will be fixed.

Aw, crap.

This (or something like it) resurfaced on the drupal.org D7 upgrade with project nodes. :( One last beta blocker...

Sergeant ksenzee is on the case!