1601 default vals

IHP/IDE/SchemaDesigner/Parser.hs

@@ -16,6 +16,7 @@ module IHP.IDE.SchemaDesigner.Parser
 
 import IHP.Prelude
 import IHP.IDE.SchemaDesigner.Types
+import Test.DefaultValues.CreateTableDefaults
 import qualified Prelude
 import qualified Data.Text.IO as Text
 import Text.Megaparsec
@@ -116,7 +117,7 @@ createTable = do
             _ -> Prelude.fail ("Primary key defined in both column and table constraints on table " <> cs name)
         _ -> Prelude.fail "Multiple columns with PRIMARY KEY constraint"
 
-    pure CreateTable { name, columns, primaryKeyConstraint, constraints, unlogged }
+    pure defCreateTable { name, columns, primaryKeyConstraint, constraints, unlogged }
 
 createEnumType = do
     lexeme "CREATE"

IHP/IDE/SchemaDesigner/SchemaOperations.hs

@@ -10,23 +10,17 @@ import IHP.IDE.SchemaDesigner.Types
 import Data.Maybe (fromJust)
 import qualified Data.List as List
 import qualified Data.Text as Text
+import Test.DefaultValues.CreateTableDefaults
+import Test.IDE.CodeGeneration.Defaults.CodeGeneratorDefaults
 
 -- | A Schema.sql basically is just a list of sql DDL statements
 type Schema = [Statement]
 
 -- | Creates a new tables with a 'id' columns as the primary key
 addTable :: Text -> Schema -> Schema
-addTable tableName list = list <> [StatementCreateTable CreateTable
+addTable tableName list = list <> [StatementCreateTable defCreateTable
     { name = tableName
-    , columns =
-        [Column
-            { name = "id"
-            , columnType = PUUID
-            , defaultValue = Just (CallExpression "uuid_generate_v4" [])
-            , notNull = True
-            , isUnique = False
-            , generator = Nothing
-            }]
+    , columns = [colUUID]
     , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
     , constraints = []
     , unlogged = False

Test/DefaultValues/CreateTableDefaults.hs

@@ -0,0 +1,84 @@
+{-# OPTIONS_GHC -Wno-ambiguous-fields #-}
+module Test.DefaultValues.CreateTableDefaults where
+{- | This module aims to create some default tables and columns for tables for use 
+elsewhere and make it easier to add fields elsewhere whenever necessary.
+-}
+import IHP.Prelude
+import IHP.IDE.SchemaDesigner.Types
+
+
+{- | Creates a default column where all values are empty lists/text, 
+'Nothing' or 'False'; and for 'ColumnType', the default is 'PUUID'.
+
+Add a new field to the 'Column' type in the 
+"IHP.IDE.SchemaDesigner.Types" file and then 
+set its default value here
+
+Defined as:
+
+@
+defColumn :: Column
+defColumn = Column { 
+                 name = ""
+               , columnType = PUUID 
+               , defaultValue = Nothing
+               , notNull = False 
+               , isUnique = False
+               , generator = Nothing
+               }
+@
+
+If you want a different 'PostgresType' you will need to 
+specify with like so by either using a function:
+
+@setColumnType pgt = defColumn {columnType = pgt}@
+
+Or
+
+Just as part of where you're calling it:
+
+@someDefaultColumnType = defColumn {columnType = PDate}@
+-}
+defColumn :: Column
+defColumn = Column { 
+                 name = ""
+               , columnType = PUUID 
+               , defaultValue = Nothing
+               , notNull = False 
+               , isUnique = False
+               , generator = Nothing
+               }
+
+
+{- | Creates a table where all values are empty lists, including columns. @unlogged@ is set to 'False'.
+
+Defined as such:
+
+@
+defCreateTable :: CreateTable
+defCreateTable = CreateTable {
+                        name = ""
+                        , columns = []
+                        , primaryKeyConstraint = PrimaryKeyConstraint []
+                        , constraints = []
+                        , unlogged = False
+                        }
+@
+
+-}
+defCreateTable :: CreateTable
+defCreateTable = CreateTable {
+                        name = ""
+                        , columns = []
+                        , primaryKeyConstraint = PrimaryKeyConstraint []
+                        , constraints = []
+                        , unlogged = False
+                        }
+
+-- | Takes a list of column and adds it to our default table.
+defCreateTableWCol :: [Column] -> CreateTable
+defCreateTableWCol cols = defCreateTable {columns = cols}
+
+-- | Creates one default table with a singleton list of one 'defColumn' .
+defCreateTableWDefCol :: CreateTable
+defCreateTableWDefCol = defCreateTableWCol (pure defColumn)

Test/IDE/CodeGeneration/ControllerGenerator.hs

@@ -12,61 +12,14 @@ import qualified Text.Megaparsec as Megaparsec
 import IHP.IDE.CodeGen.Types
 import IHP.IDE.SchemaDesigner.Types
 import IHP.NameSupport
+import Test.IDE.CodeGeneration.Defaults.CodeGeneratorDefaults
 
 tests = do
     describe "Controller Generator Tests:" do
         let schema = [
-                    StatementCreateTable CreateTable {
-                        name = "pages"
-                        , columns = [
-                            Column
-                                { name = "id"
-                                , columnType = PUUID
-                                , defaultValue = Just (CallExpression "uuid_generate_v4" [])
-                                , notNull = True
-                                , isUnique = False
-                                , generator = Nothing
-                                }
-                        ]
-                        , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
-                        , constraints = []
-                        , unlogged = False
-                    },
-                    StatementCreateTable CreateTable {
-                        name = "people"
-                        , columns = [
-                            Column
-                                { name = "id"
-                                , columnType = PUUID
-                                , defaultValue = Just (CallExpression "uuid_generate_v4" [])
-                                , notNull = True
-                                , isUnique = False
-                                , generator = Nothing
-                                }
-                                ,
-                            Column
-                                { name = "name"
-                                , columnType = PText
-                                , defaultValue = Nothing
-                                , notNull = True
-                                , isUnique = False
-                                , generator = Nothing
-                                }
-                                ,
-                            Column
-                                { name = "email"
-                                , columnType = PText
-                                , defaultValue = Nothing
-                                , notNull = True
-                                , isUnique = False
-                                , generator = Nothing
-                                }
-                        ]
-                        , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
-                        , constraints = []
-                        , unlogged = False
-                    }
-                ]
+                    StatementCreateTable pagesTable
+                  , StatementCreateTable peopleTable
+                  ]
         it "should build a controller with name \"pages\"" do
             let rawControllerName = "pages"
             let controllerName = tableNameToControllerName rawControllerName