Fix issue where unwrapped migration code was being validated (and fai…

…led) after DB operations
wintercms · Sep 9, 2024 · 80f3889 · 80f3889
1 parent ac6afd6
commit 80f3889
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/behaviors/IndexDatabaseTableOperations.php b/behaviors/IndexDatabaseTableOperations.php
@@ -82,7 +82,10 @@ public function onDatabaseTableMigrationApply()
         $model = new MigrationModel();
         $model->setPluginCodeObj($pluginCode);
 
-        $model->fill($_POST);
+        $model->fill([
+            'version' => Request::input('version'),
+            'description' => Request::input('description'),
+        ]);
 
         $operation = Input::get('operation');
         $table = Input::get('table');
@@ -91,12 +94,11 @@ public function onDatabaseTableMigrationApply()
         $model->makeScriptFileNameUnique();
 
         $codeGenerator = new TableMigrationCodeGenerator();
-        $model->code = $codeGenerator->wrapMigrationCode($model->scriptFileName, $model->code, $pluginCode);
+        $model->code = $codeGenerator->wrapMigrationCode($model->scriptFileName, Request::input('code'), $pluginCode);
 
         try {
             $model->save();
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             throw new ApplicationException($ex->getMessage());
         }
 

diff --git a/classes/TableMigrationCodeGenerator.php b/classes/TableMigrationCodeGenerator.php
@@ -79,7 +79,7 @@ public function createOrUpdateTable($updatedTable, $existingTable, $newTableName
      * @param string $scriptFilename Specifies the migration script file name
      * @param string $code Specifies the migration code
      * @param PluginCode $pluginCodeObj The plugin code object
-     * @return TextParser
+     * @return string
      */
     public function wrapMigrationCode($scriptFilename, $code, $pluginCodeObj)
     {