fix migration

composer.json

@@ -38,13 +38,11 @@
     "atk4/data": "~2.3.0"
   },
   "require-dev": {
-    "atk4/schema": "dev-develop",
     "friendsofphp/php-cs-fixer": "^2.16",
     "phpunit/phpunit": "*",
     "symfony/contracts": ">=1.1"
   },
   "require-dev-release": {
-    "atk4/schema": "~2.3.0",
     "friendsofphp/php-cs-fixer": "^2.16",
     "phpunit/phpunit": "*",
     "symfony/contracts": ">=1.1"

demos/db.php

@@ -3,4 +3,5 @@
 declare(strict_types=1);
 
 require 'src/App.php';
+require 'src/MigratorConsole.php';
 //require 'src/Acl.php';

demos/src/MigratorConsole.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+use atk4\schema\Migration;
+use atk4\ui\Console;
+
+/**
+ * Makes sure your database is adjusted for one or several models,
+ * that you specify.
+ */
+class MigratorConsole extends Console
+{
+    /** @var string Name of migrator class to use */
+    public $migrator_class = Migration::class;
+
+    /**
+     * Provided with array of models, perform migration for each of them.
+     *
+     * @param array $models
+     */
+    public function migrateModels($models): void
+    {
+        // run inside callback
+        $this->set(function ($console) use ($models) {
+            $console->notice('Preparing to migrate models');
+
+            foreach ($models as $model) {
+                if (!is_object($model)) {
+                    $model = $this->factory((array) $model);
+                    $console->getApp()->db->add($model);
+                }
+
+                (new $this->migrator_class($model))->dropIfExists()->create(); // recreate table
+
+                $console->debug('  ' . get_class($model) . '.. OK');
+            }
+
+            $console->notice('Done with migration');
+        });
+    }
+}

demos/wizard.php

@@ -21,8 +21,7 @@
 use Throwable;
 
 include '../vendor/autoload.php';
-
-//include 'db.php';
+include 'db.php';
 
 // App without authentication to be able to freely import data
 $app = new class(['title' => 'Agile Toolkit - Wizard setup']) extends App {
@@ -32,7 +31,6 @@ public function dbConnectFromWizard()
     {
         $this->readConfig('config.php', 'php');
         $this->db = Persistence::connect($this->config['dsn']);
-        //$this->db->setApp($this);
     }
 };
 $app->initLayout([\atk4\ui\Layout\Centered::class]);
@@ -131,38 +129,11 @@ public function dbConnectFromWizard()
 });
 
 $wizard->addStep('Quickly checking if database is OK', function (View $page) {
-    $console = Console::addTo($page);
-
-    /*
-    $button = $page->add([Button::class, '<< Back', 'huge wide blue'])
-        ->addStyle('display', 'none')
-        ->link(['index']);
-    */
     $page->getApp()->dbConnectFromWizard();
 
-    //@todo migrateModels Is broken and need a fix
-    //$console->migrateModels([User::class, Role::class, AccessRule::class]);
-
-    //@todo imported code from migratedModels function - START
-    $console->getApp()->db = $page->getApp()->db;
-
-    $console->set(function ($console) {
-        $console->notice('Preparing to migrate models');
-
-        $models = [User::class, Role::class, AccessRule::class];
-
-        foreach ($models as $model) {
-            $model = new $model($console->getApp()->db);
-            $m = Migration::of($model);
-            $result = $m->run();
-
-            $console->debug('  ' . get_class($m) . ': ' . $model->table . ' - ' . $result);
-        }
-
-        $console->notice('Done with migration');
-    });
-
-    //@todo imported code from migratedModels function - END
+    // do migration
+    $console = \MigratorConsole::addTo($page);
+    $console->migrateModels([User::class, Role::class, AccessRule::class]);
 });
 
 $wizard->addStep('Populate Sample Data', function (View $page) {
@@ -210,7 +181,6 @@ public function dbConnectFromWizard()
                 'model' => '\\atk4\login\\Model\\Role',
                 'all_visible' => true,
                 'all_editable' => false,
-                // 'editable_fields'=>['a','b']
             ],
         ]);