refactor: Remove GHC.Show instances from QualifiedIdentifier and Config

src/PostgREST/Config.hs

@@ -35,8 +35,6 @@ import qualified Data.Configurator      as C
 import qualified Data.Map.Strict        as M
 import qualified Data.Text              as T
 
-import qualified GHC.Show (show)
-
 import Control.Lens            (preview)
 import Control.Monad           (fail)
 import Crypto.JWT              (JWK, JWKSet, StringOrURI, stringOrUri)
@@ -55,7 +53,8 @@ import PostgREST.Config.JSPath           (JSPath, JSPathExp (..),
                                           pRoleClaimKey)
 import PostgREST.Config.Proxy            (Proxy (..),
                                           isMalformedProxyUri, toURI)
-import PostgREST.DbStructure.Identifiers (QualifiedIdentifier, toQi)
+import PostgREST.DbStructure.Identifiers (QualifiedIdentifier, dumpQi,
+                                          toQi)
 import PostgREST.Request.Types           (JoinType (..))
 
 import Protolude      hiding (Proxy, toList, toS)
@@ -99,19 +98,21 @@ data AppConfig = AppConfig
 
 data LogLevel = LogCrit | LogError | LogWarn | LogInfo
 
-instance Show LogLevel where
+dumpLogLevel :: LogLevel -> Text
-  show LogCrit  = "crit"
+dumpLogLevel = \case
-  show LogError = "error"
+  LogCrit -> "crit"
-  show LogWarn  = "warn"
+  LogError -> "error"
-  show LogInfo  = "info"
+  LogWarn -> "warn"
+  LogInfo -> "info"
 
 data OpenAPIMode = OAFollowPriv | OAIgnorePriv | OADisabled
   deriving Eq
 
-instance Show OpenAPIMode where
+dumpOpenApiMode :: OpenAPIMode -> Text
-  show OAFollowPriv = "follow-privileges"
+dumpOpenApiMode = \case
-  show OAIgnorePriv = "ignore-privileges"
+  OAFollowPriv -> "follow-privileges"
-  show OADisabled   = "disabled"
+  OAIgnorePriv -> "ignore-privileges"
+  OADisabled   -> "disabled"
 
 -- | Dump the config
 toText :: AppConfig -> Text
@@ -127,21 +128,21 @@ toText conf =
       ,("db-max-rows",                   maybe "\"\"" show . configDbMaxRows)
       ,("db-pool",                       show . configDbPoolSize)
       ,("db-pool-timeout",               show . floor . configDbPoolTimeout)
-      ,("db-pre-request",            q . maybe mempty show . configDbPreRequest)
+      ,("db-pre-request",            q . maybe mempty dumpQi . configDbPreRequest)
       ,("db-prepared-statements",        T.toLower . show . configDbPreparedStatements)
-      ,("db-root-spec",              q . maybe mempty show . configDbRootSpec)
+      ,("db-root-spec",              q . maybe mempty dumpQi . configDbRootSpec)
       ,("db-schemas",                q . T.intercalate "," . toList . configDbSchemas)
       ,("db-config",                 q . T.toLower . show . configDbConfig)
       ,("db-tx-end",                 q . showTxEnd)
       ,("db-uri",                    q . configDbUri)
-      ,("db-embed-default-join",     q . innerJoin . configDbEmbedDefaultJoin)
+      ,("db-embed-default-join",     q . dumpJoin . configDbEmbedDefaultJoin)
       ,("db-use-legacy-gucs",            T.toLower . show . configDbUseLegacyGucs)
       ,("jwt-aud",                       toS . encode . maybe "" toJSON . configJwtAudience)
       ,("jwt-role-claim-key",        q . T.intercalate mempty . fmap show . configJwtRoleClaimKey)
       ,("jwt-secret",                q . toS . showJwtSecret)
       ,("jwt-secret-is-base64",          T.toLower . show . configJwtSecretIsBase64)
-      ,("log-level",                 q . show . configLogLevel)
+      ,("log-level",                 q . dumpLogLevel . configLogLevel)
-      ,("openapi-mode",              q . show . configOpenApiMode)
+      ,("openapi-mode",              q . dumpOpenApiMode . configOpenApiMode)
       ,("openapi-server-proxy-uri",  q . fromMaybe mempty . configOpenApiServerProxyUri)
       ,("raw-media-types",           q . toS . BS.intercalate "," . configRawMediaTypes)
       ,("server-host",               q . configServerHost)
@@ -168,8 +169,8 @@ toText conf =
         secret = fromMaybe mempty $ configJwtSecret c
     showSocketMode c = showOct (configServerUnixSocketMode c) mempty
 
-    innerJoin JTInner = "inner"
+    dumpJoin JTInner = "inner"
-    innerJoin JTLeft = "left"
+    dumpJoin JTLeft  = "left"
 
 -- This class is needed for the polymorphism of overrideFromDbOrEnvironment
 -- because C.required and C.optional have different signatures

src/PostgREST/DbStructure/Identifiers.hs

@@ -6,12 +6,12 @@ module PostgREST.DbStructure.Identifiers
   , Schema
   , TableName
   , FieldName
+  , dumpQi
   , toQi
   ) where
 
 import qualified Data.Aeson as JSON
 import qualified Data.Text  as T
-import qualified GHC.Show
 
 import Protolude
 
@@ -26,9 +26,9 @@ data QualifiedIdentifier = QualifiedIdentifier
 
 instance Hashable QualifiedIdentifier
 
-instance Show QualifiedIdentifier where
+dumpQi :: QualifiedIdentifier -> Text
-  show (QualifiedIdentifier s i) =
+dumpQi (QualifiedIdentifier s i) =
-    (if T.null s then mempty else toS s <> ".") <> toS i
+  (if T.null s then mempty else s <> ".") <> i
 
 -- TODO: Handle a case where the QI comes like this: "my.fav.schema"."my.identifier"
 -- Right now it only handles the schema.identifier case

src/PostgREST/Query/SqlFragment.hs

@@ -52,12 +52,15 @@ import PostgREST.DbStructure.Identifiers (FieldName,
 import PostgREST.RangeQuery              (NonnegRange, allRange,
                                           rangeLimit, rangeOffset)
 import PostgREST.Request.Types           (Alias, Field, Filter (..),
-                                          OrderNulls(..), OrderDirection(..), LogicOperator(..),
                                           JoinCondition (..),
                                           JsonOperand (..),
                                           JsonOperation (..),
-                                          JsonPath, LogicTree (..),
+                                          JsonPath,
-                                          OpExpr (..), Operation (..),
+                                          LogicOperator (..),
+                                          LogicTree (..), OpExpr (..),
+                                          Operation (..),
+                                          OrderDirection (..),
+                                          OrderNulls (..),
                                           OrderTerm (..), SelectItem)
 
 import Protolude      hiding (cast, toS)

src/PostgREST/Request/Preferences.hs

@@ -10,8 +10,8 @@ module PostgREST.Request.Preferences
   ) where
 
 import qualified Data.ByteString           as BS
-import qualified Network.HTTP.Types.Header as HTTP
 import qualified Data.Map                  as Map
+import qualified Network.HTTP.Types.Header as HTTP
 
 import Protolude