XF 2.0 Upgrading 1.5.15 > 2.04, plus official addons

[Marcel]

I've posted this in here rather then the respective XFMG and XFRM forums separately as I believe it's all connected to the main XF2 upgrade.
Just updated from 1.5.15 to 2.0.4, no problem. I'm using a local test installation via a XF1 backup (both files and db).

I've copied XFRM2 files over, and XFMG2 files over, yet running

php cmd.php xf:addon-upgrade XFMG --verbose

Gives the following error

Upgrading .XenForo Media Gallery from 1.1.14 to 2.0.3...
Confirm upgrade? (y/n)y

  [Symfony\Component\Process\Exception\ProcessFailedException]
  The command "'/usr/bin/php' '/Volumes/Data/Development/127/xentwo/cmd.php' 'xf:addon-sub-action' 'XFMG' 'upgrade' '--k=ae8f1f55cf0fff0445306d33a6632e9898c4836e'
  " failed.

  Exit Code: 1(General error)

  Working directory: /Volumes/Data/Development/127/xentwo

  Output:
  ================
  Upgrading

    [XF\Db\Exception]
    MySQL statement prepare error [1054]: Unknown column 'view_user_groups' in 'field list'


  Exception trace:
   () at /Volumes/Data/Development/127/xentwo/src/XF/Db/AbstractStatement.php:212
   XF\Db\AbstractStatement->getException() at /Volumes/Data/Development/127/xentwo/src/XF/Db/Mysqli/Statement.php:196
   XF\Db\Mysqli\Statement->getException() at /Volumes/Data/Development/127/xentwo/src/XF/Db/Mysqli/Statement.php:39
   XF\Db\Mysqli\Statement->prepare() at /Volumes/Data/Development/127/xentwo/src/XF/Db/Mysqli/Statement.php:54
   XF\Db\Mysqli\Statement->execute() at /Volumes/Data/Development/127/xentwo/src/XF/Db/AbstractAdapter.php:79
   XF\Db\AbstractAdapter->query() at /Volumes/Data/Development/127/xentwo/src/XF/Db/AbstractAdapter.php:106
   XF\Db\AbstractAdapter->fetchAllKeyed() at /Volumes/Data/Development/127/xentwo/src/addons/XFMG/Setup.php:648
   XFMG\Setup->upgrade902000010Step3() at /Volumes/Data/Development/127/xentwo/src/XF/AddOn/StepRunnerUpgradeTrait.php:122
   XFMG\Setup->upgradeStepRunner() at /Volumes/Data/Development/127/xentwo/src/XF/AddOn/StepRunnerUpgradeTrait.php:71
   XFMG\Setup->upgrade() at /Volumes/Data/Development/127/xentwo/src/XF/Cli/Command/AddOnActionTrait.php:106
   XF\Cli\Command\AddOnSubAction->performAddOnAction() at /Volumes/Data/Development/127/xentwo/src/XF/Cli/Command/AddOnSubAction.php:75
   XF\Cli\Command\AddOnSubAction->execute() at /Volumes/Data/Development/127/xentwo/src/vendor/symfony/console/Command/Command.php:242
   Symfony\Component\Console\Command\Command->run() at /Volumes/Data/Development/127/xentwo/src/vendor/symfony/console/Application.php:843
   Symfony\Component\Console\Application->doRunCommand() at /Volumes/Data/Development/127/xentwo/src/vendor/symfony/console/Application.php:193
   Symfony\Component\Console\Application->doRun() at /Volumes/Data/Development/127/xentwo/src/vendor/symfony/console/Application.php:117
   Symfony\Component\Console\Application->run() at /Volumes/Data/Development/127/xentwo/src/XF/Cli/Runner.php:63
   XF\Cli\Runner->run() at /Volumes/Data/Development/127/xentwo/cmd.php:15

  xf:addon-sub-action [--k K] [--] <id> <action>


  Error Output:
  ================

The same command with XFMG2, gives a similar error (the field is 'is_fileless').

I've read this is due to a previous attempt at an upgrade to 2. I'm pretty sure this is not the case. The database copy came from our live site which has never had any XF2 code run through it....

I've rolled back and reinstalled this test copy a couple of times, starting afresh each time.
These are test runs for the live upgrade, so I need to iron out any upgrading issues if I can.
Any thoughts would be appreciated