The Drupal 6 table dumps need to be moved into another folder to allow dumps from more than one version of Drupal.

Adjusting the tests to allow more versions of Drupal will probably also be needed.

CommentFileSizeAuthor
#26 2413759-26.patch130.2 KBbenjy
#24 interdiff.txt1.16 KBbenjy
#24 2413759-24.patch130.74 KBbenjy
#22 interdiff.txt894 bytesbenjy
#22 2413759-22.patch129.57 KBbenjy
#20 2413759-20.patch128.7 KBbenjy
#15 interdiff.txt769 bytesbenjy
#15 2413759-15.patch133.39 KBbenjy
#13 interdiff.txt894 bytesbenjy
#13 2413759-13.patch132.64 KBbenjy
#11 2413759-11.patch131.77 KBbenjy
#9 2413759-9.patch67.29 KBbenjy
#7 2413759-6.patch60.54 KBbenjy
#5 2413759-5.patch49.69 KBbenjy
#4 tmp_13163-move_d6_dumps-2413759-4-585223470.patch1.11 MBhosef
#1 tmp_8978-move_d6_dumps-2413759-1-585223470.patch1.11 MBhosef

Comments

hosef’s picture

hosef commented
Status: Active » Needs review
StatusFileSize
new tmp_8978-move_d6_dumps-2413759-1-585223470.patch1.11 MB

Here is the initial patch.
I moved all of the dumps, changed the namespaces, and edited 
migrate-dump-d6.sh, so that they now live in 
\Drupal\migrate_drupal\Tests\Table\d6.

Naturally, this broke all of the tests. To fix that, I made a new class 
at \Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase 
that overrides getDumpDirectory() with 
parent::getDumpDirectory() . '/d6'; and made all of the 
tests extend this one instead of 
\Drupal\migrate_drupal\Tests\MigrateDrupalTestBase.

I also renamed 
\Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase to 
\Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase because 
there isn't actually anything Drupal 6 specific in it.

hosef’s picture

hosef commented

Sorry about the weird filename. I posted this from my phone and it's messing with my attachments. -_-

Status: Needs review » Needs work

The last submitted patch, 1: tmp_8978-move_d6_dumps-2413759-1-585223470.patch, failed testing.

hosef’s picture

hosef commented
Status: Needs work » Needs review
StatusFileSize
new tmp_13163-move_d6_dumps-2413759-4-585223470.patch1.11 MB

Updated patch.

benjy’s picture

benjy commented
StatusFileSize
new 2413759-5.patch49.69 KB

hosef, You should be able to use Git to show the filenames, see the attached patch which is only 49KB. I simple reproduced the patch from what you mentioned, hopefully I didn't miss anything.

Status: Needs review » Needs work

The last submitted patch, 5: 2413759-5.patch, failed testing.

benjy’s picture

benjy commented
Status: Needs work » Needs review
StatusFileSize
new 2413759-6.patch60.54 KB

Lets try that again.

Status: Needs review » Needs work

The last submitted patch, 7: 2413759-6.patch, failed testing.

benjy’s picture

benjy commented
Status: Needs work » Needs review
StatusFileSize
new 2413759-9.patch67.29 KB

Doh!

Status: Needs review » Needs work

The last submitted patch, 9: 2413759-9.patch, failed testing.

benjy’s picture

benjy commented
Status: Needs work » Needs review
StatusFileSize
new 2413759-11.patch131.77 KB

Updated the tests.

Status: Needs review » Needs work

The last submitted patch, 11: 2413759-11.patch, failed testing.

benjy’s picture

benjy commented
Status: Needs work » Needs review
StatusFileSize
new 2413759-13.patch132.64 KB
new interdiff.txt894 bytes

This should be green.

Status: Needs review » Needs work

The last submitted patch, 13: 2413759-13.patch, failed testing.

benjy’s picture

benjy commented
Status: Needs work » Needs review
StatusFileSize
new 2413759-15.patch133.39 KB
new interdiff.txt769 bytes

And again.

I thought it was going to be easy enough to reproduce using the steps in #4. Turns out I was wrong, I should have figured out how to get Git to just work out the renames from the last patch!

chx’s picture

chx commented
Status: Needs review » Reviewed & tested by the community

That looks good. "Simple" search - replace beyond the moves. Thanks.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Needs work

Needs a reroll.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented

The dump has changed so it will need to be recopied.

benjy’s picture

benjy commented
Status: Needs work » Needs review
StatusFileSize
new 2413759-20.patch128.7 KB

Re-rolled.

Status: Needs review » Needs work

The last submitted patch, 20: 2413759-20.patch, failed testing.

benjy’s picture

benjy commented
Status: Needs work » Needs review
StatusFileSize
new 2413759-22.patch129.57 KB
new interdiff.txt894 bytes

Fixed.

Status: Needs review » Needs work

The last submitted patch, 22: 2413759-22.patch, failed testing.

benjy’s picture

benjy commented
Status: Needs work » Needs review
StatusFileSize
new 2413759-24.patch130.74 KB
new interdiff.txt1.16 KB

Fiddly little issue this.

Status: Needs review » Needs work

The last submitted patch, 24: 2413759-24.patch, failed testing.

benjy’s picture

benjy commented
Status: Needs work » Needs review
StatusFileSize
new 2413759-26.patch130.2 KB
chx’s picture

chx commented
Status: Needs review » Needs work

Hope this gets in quick.

chx’s picture

chx commented
Status: Needs work » Reviewed & tested by the community

Sorry. Misclicked.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
commented
Status: Reviewed & tested by the community » Fixed

Migrate is not frozen in beta. Committed 0e1fe4c and pushed to 8.0.x. Thanks!

  • alexpott committed 0e1fe4c on 8.0.x 
    Issue #2413759 by benjy, hosef: Move D6 dumps to avoid collisions with...

Status: Fixed » Closed (fixed)

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