Support adding values to a enum in the auto-migration

digitallyinduced · Oct 19, 2021 · 7f34cac · 7f34cac
1 parent 68780a6
commit 7f34cac
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/IHP/IDE/SchemaDesigner/Controller/EnumValues.hs b/IHP/IDE/SchemaDesigner/Controller/EnumValues.hs
@@ -11,6 +11,9 @@ import IHP.IDE.SchemaDesigner.View.Layout (findStatementByName, replace, schemaD
 import IHP.IDE.SchemaDesigner.Controller.Helper
 import IHP.IDE.SchemaDesigner.Controller.Validation
 
+import qualified IHP.IDE.SchemaDesigner.SchemaOperations as SchemaOperations
+import qualified IHP.IDE.SchemaDesigner.MigrationChangeTracker as MigrationChangeTracker
+
 instance Controller EnumValuesController where
     beforeAction = setLayout schemaDesignerLayout
 
@@ -26,8 +29,9 @@ instance Controller EnumValuesController where
         case validationResult of
             Failure message ->
                 setErrorMessage message
-            Success ->
-                updateSchema (map (addValueToEnum enumName enumValueName))
+            Success -> do
+                updateSchema $ SchemaOperations.addValueToEnum enumName enumValueName
+                MigrationChangeTracker.addValueToEnum enumName enumValueName
 
         -- The form to save an enum has two save buttons:
         --
@@ -70,11 +74,6 @@ instance Controller EnumValuesController where
         updateSchema (map (deleteValueInEnum enumName valueId))
         redirectTo ShowEnumAction { .. }
 
-addValueToEnum :: Text -> Text -> Statement -> Statement
-addValueToEnum enumName enumValueName (table@CreateEnumType { name, values }) | name == enumName =
-    table { values = values <> [enumValueName] }
-addValueToEnum enumName enumValueName statement = statement
-
 updateValueInEnum :: Text -> Text -> Int -> Statement -> Statement
 updateValueInEnum enumName value valueId (table@CreateEnumType { name, values }) | name == enumName =
     table { values = (replace valueId value values) }

diff --git a/IHP/IDE/SchemaDesigner/Controller/Enums.hs b/IHP/IDE/SchemaDesigner/Controller/Enums.hs
@@ -13,6 +13,7 @@ import IHP.IDE.SchemaDesigner.Controller.Helper
 import IHP.IDE.SchemaDesigner.Controller.Validation
 
 import qualified IHP.IDE.SchemaDesigner.SchemaOperations as SchemaOperations
+import qualified IHP.IDE.SchemaDesigner.MigrationChangeTracker as MigrationChangeTracker
 
 instance Controller EnumsController where
     beforeAction = setLayout schemaDesignerLayout
@@ -36,6 +37,7 @@ instance Controller EnumsController where
                 redirectTo TablesAction
             Success -> do
                 updateSchema $ SchemaOperations.addEnum enumName
+                MigrationChangeTracker.addEnum enumName
                 redirectTo ShowEnumAction { .. }
 
     action EditEnumAction { .. } = do

diff --git a/IHP/IDE/SchemaDesigner/MigrationChangeTracker.hs b/IHP/IDE/SchemaDesigner/MigrationChangeTracker.hs
@@ -97,6 +97,12 @@ doesTableExists tableName statements =
     |> null
     |> not
 
+addEnum :: Text -> IO ()
+addEnum enumName = withUnmigratedChanges $ SchemaOperations.addEnum enumName
+
+addValueToEnum :: Text -> Text -> IO ()
+addValueToEnum enumName enumValueName = withUnmigratedChanges $ SchemaOperations.addValueToEnum enumName enumValueName
+
 ensureMigrationDirectory :: IO ()
 ensureMigrationDirectory = Directory.createDirectoryIfMissing False "Application/Migration"
 

diff --git a/IHP/IDE/SchemaDesigner/SchemaOperations.hs b/IHP/IDE/SchemaDesigner/SchemaOperations.hs
@@ -131,4 +131,10 @@ addEnum enumName statements = a <> enum <> b
         findInsertionIndex (x:xs) !i = i
         findInsertionIndex [] !i = i
 
+addValueToEnum :: Text -> Text -> Schema -> Schema
+addValueToEnum enumName enumValueName statements = map addValueToEnum' statements
+    where
+        addValueToEnum' (table@CreateEnumType { name, values }) | name == enumName =
+            table { values = values <> [enumValueName] }
+        addValueToEnum' statement = statement