refactor: Split up Types.hs and logically organize modules (#1793)

2021-04-11 18:28:01 +02:00
parent 8c44410ce0
commit f99fd6cbad
37 changed files with 1496 additions and 1008 deletions
@@ -30,17 +30,18 @@ import System.CPUTime           (getCPUTime)
 import System.IO                (BufferMode (..), hSetBuffering)
 import Text.Printf              (hPrintf)

-import PostgREST.App         (postgrest)
+import PostgREST.App                   (postgrest)
 import PostgREST.Config
-import PostgREST.DbStructure (getDbStructure, getPgVersion)
-import PostgREST.Error       (PgError (PgError), checkIsFatal,
-                              errorPayload)
-import PostgREST.Statements  (dbSettingsStatement)
-import PostgREST.Types       (ConnectionStatus (..), DbStructure,
-                              PgVersion (..), SCacheStatus (..),
-                              minimumPgVersion)
-import Protolude             hiding (hPutStrLn, head, toS)
-import Protolude.Conv        (toS)
+import PostgREST.DbStructure           (DbStructure, getDbStructure,
+                                        getPgVersion)
+import PostgREST.DbStructure.PgVersion (PgVersion (..),
+                                        minimumPgVersion)
+import PostgREST.Error                 (PgError (PgError),
+                                        checkIsFatal, errorPayload)
+import PostgREST.Query.Statements      (dbSettingsStatement)
+
+import Protolude      hiding (hPutStrLn, head, toS)
+import Protolude.Conv (toS)


 #ifndef mingw32_HOST_OS
@@ -48,6 +49,20 @@ import System.Posix.Signals
 import UnixSocket
 #endif

+
+-- | Current database connection status data ConnectionStatus
+data ConnectionStatus
+  = NotConnected
+  | Connected PgVersion
+  | FatalConnectionError Text
+  deriving (Eq)
+
+-- | Schema cache status
+data SCacheStatus
+  = SCLoaded
+  | SCOnRetry
+  | SCFatalFail
+
 -- | This is where everything starts.
 main :: IO ()
 main = do