Merge branch 'master' of github.com:sulu/SuluFormBundle into develop

Conflicts: CHANGELOG.md
sulu · Dec 1, 2017 · ca83882 · ca83882
2 parents 0123f37 + e7f7093
commit ca83882
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
  - ENHANCEMENT #105    Add functional api tests
  - FEATURE     #104    Add search to dynamic list
  - ENHANCEMENT #103    Add test setup 
+ - HOTFIX      #120    Fix database update for 0.2 version in UPGRADE.md
 
 ## 0.3.2
 

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -89,6 +89,7 @@ ALTER TABLE fo_dynamics ADD CONSTRAINT FK_EC8AF03030D07CD5 FOREIGN KEY (idUsersC
 CREATE INDEX IDX_EC8AF030DBF11E1D ON fo_dynamics (idUsersCreator);
 CREATE INDEX IDX_EC8AF03030D07CD5 ON fo_dynamics (idUsersChanger);
 ALTER TABLE fo_dynamics ADD typeName VARCHAR(255) DEFAULT NULL;
+UPDATE `fo_dynamics` SET `type` = 'page' WHERE `type` = '';
 ```
 
 or run