1601 default vals

IHP/IDE/SchemaDesigner/SchemaOperations.hs

@@ -10,23 +10,15 @@ import IHP.IDE.SchemaDesigner.Types
 import Data.Maybe (fromJust)
 import qualified Data.List as List
 import qualified Data.Text as Text
+import IHP.IDE.Defaults.TableColumnDefaults
 
 -- | 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
-    { name = tableName
-    , columns =
-        [Column
-            { name = "id"
-            , columnType = PUUID
-            , defaultValue = Just (CallExpression "uuid_generate_v4" [])
-            , notNull = True
-            , isUnique = False
-            , generator = Nothing
-            }]
+addTable tableName list = list <> [StatementCreateTable (defCreateTable tableName)
+    { columns = [colUUID]
     , primaryKeyConstraint = PrimaryKeyConstraint ["id"]
     , constraints = []
     , unlogged = False

IHP/PGListener.hs

@@ -37,7 +37,6 @@ import qualified Data.Aeson as Aeson
 import qualified IHP.Log as Log
 import qualified Control.Exception as Exception
 import qualified Control.Concurrent.Chan.Unagi as Queue
-import qualified Control.Concurrent
 
 -- TODO: How to deal with timeout of the connection?
 
@@ -232,38 +231,18 @@ notifyLoop listeningToVar listenToVar subscriptions = do
                             let inChan = get #inChan subscription
                             Queue.writeChan inChan notification
 
-    -- Initial delay (in microseconds)
-    let initialDelay = 500 * 1000
-    -- Max delay (in microseconds)
-    let maxDelay = 60 * 1000 * 1000
     -- This outer loop restarts the listeners if the database connection dies (e.g. due to a timeout)
-    let retryLoop delay isFirstError = do
-            result <- Exception.try innerLoop
-            case result of
-                Left (error :: SomeException) -> do
-                    case fromException error of
-                        Just (error :: AsyncCancelled) -> throw error
-                        notification -> do
-                            let ?context = ?modelContext -- Log onto the modelContext logger
-                            if isFirstError then do
-                                Log.info ("PGListener is going to restart, loop failed with exception: " <> (displayException error) <> ". Retrying immediately.")
-                                retryLoop delay False -- Retry with no delay interval on first error, but will increase delay interval in subsequent retries 
-                            else do
-                                let increasedDelay = delay * 2 -- Double current delay
-                                let nextDelay = min increasedDelay maxDelay -- Picks whichever delay is lowest of increasedDelay * 2 or maxDelay
-                                Log.info ("PGListener is going to restart, loop failed with exception: " <> (displayException error) <> ". Retrying in " <> cs (printTimeToNextRetry delay) <> ".")
-                                Control.Concurrent.threadDelay delay -- Sleep for the current delay
-                                retryLoop nextDelay False -- Retry with longer interval
-                Right _ -> 
-                    retryLoop initialDelay True -- If all went well, re-run with no sleeping and reset current delay to the initial value
-    retryLoop initialDelay True
-
-printTimeToNextRetry :: Int -> Text
-printTimeToNextRetry microseconds
-    | microseconds >= 1000000000 =  show (microseconds `div` 1000000000) <> " min"
-    | microseconds >= 1000000 =  show (microseconds `div` 1000000) <> " s"
-    | microseconds >= 1000 = show (microseconds `div` 1000) <> " ms"
-    | otherwise = show microseconds <> " µs"
+    forever do
+        result <- Exception.try innerLoop
+        case result of
+            Left (error :: SomeException) -> do
+                case fromException error of
+                    Just (error :: AsyncCancelled) -> throw error
+                    notification -> do
+                        let ?context = ?modelContext -- Log onto the modelContext logger
+                        Log.info ("PGListener is going to restart, loop failed with exception: " <> displayException error)
+            Right _ -> pure ()
+
 
 listenToChannel :: PG.Connection -> Channel -> IO ()
 listenToChannel databaseConnection channel = do

README.md

@@ -169,25 +169,16 @@ If you just want to improve docs, [you can find the markdown files in the Guide
 
 ### Bounties
 
-We use algora.io for bounties on IHP issues. Check out the open bounties below:
-
 <a href="https://console.algora.io/org/digitallyinduced/bounties?status=open">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://console.algora.io/api/og/digitallyinduced/bounties.png?p=0&status=open&theme=dark">
     <img alt="Bounties of digitallyinduced" src="https://console.algora.io/api/og/digitallyinduced/bounties.png?p=0&status=open&theme=light">
   </picture>
 </a>
 
-<a href="https://console.algora.io/org/digitallyinduced/leaderboard">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://console.algora.io/api/og/digitallyinduced/leaderboard.png?p=0&theme=dark">
-    <img alt="Leaderboard of digitallyinduced" src="https://console.algora.io/api/og/digitallyinduced/leaderboard.png?p=0&theme=light">
-  </picture>
-</a>
-
 ## Releases
 
-You can find information on IHP releases in the GitHub [releases section](https://github.com/digitallyinduced/ihp/releases).
+During beta, there is a new release every two weeks on Friday. You can find steps to update to the latest version [in the release notes](https://github.com/digitallyinduced/ihp/releases).
 
 [📧 Subscribe to the IHP release emails to stay in the loop.](https://ihp.digitallyinduced.com/MailingList)
 

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 IHP.IDE.Defaults.TableColumnDefaults
 
 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

Test/IDE/CodeGeneration/MailGenerator.hs

@@ -1,5 +1,5 @@
 {-|
-Module: Test.IDE.CodeGeneration.MailGenerator
+Module: Test.IDE.CodeGeneration.MailGenerator/ID
 Copyright: (c) digitally induced GmbH, 2020
 -}
 module Test.IDE.CodeGeneration.MailGenerator where
@@ -12,27 +12,12 @@ import qualified Text.Megaparsec as Megaparsec
 import IHP.IDE.CodeGen.Types
 import IHP.IDE.SchemaDesigner.Types
 import IHP.NameSupport
-
+import IHP.IDE.Defaults.TableColumnDefaults
 
 tests = do
     describe "Mail Generator Tests:" do
         let schema = [
-                    StatementCreateTable CreateTable {
-                        name = "users"
-                        , 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 mailTable
                     ]
         it "should build a mail with name \"PurchaseConfirmationMail\"" do
             let mailName = "PurchaseConfirmationMail"

Test/IDE/CodeGeneration/ViewGenerator.hs

@@ -12,27 +12,13 @@ import qualified Text.Megaparsec as Megaparsec
 import IHP.IDE.CodeGen.Types
 import IHP.IDE.SchemaDesigner.Types
 import IHP.NameSupport
+import IHP.IDE.Defaults.TableColumnDefaults (compilerSpecTable)
 
 
 tests = do
     describe "View 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 compilerSpecTable
                     ]
         it "should build a view with name \"EditView\"" do
             let viewName = "EditView"