no-op

hasura · Sep 25, 2019 · ba8f465 · ba8f465
1 parent 6443125
commit ba8f465
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 27 deletions.
diff --git a/server/src-lib/Hasura/RQL/DDL/RemoteRelationship.hs b/server/src-lib/Hasura/RQL/DDL/RemoteRelationship.hs
@@ -12,8 +12,6 @@ import           Hasura.RQL.DDL.RemoteRelationship.Validate
 import           Hasura.RQL.Types
 
 import qualified Data.HashMap.Strict                        as Map
-import qualified Data.Text                                  as T
-import           Instances.TH.Lift                          ()
 
 runCreateRemoteRelationship ::
      (MonadTx m, CacheRWM m, UserInfoM m) => RemoteRelationship -> m EncJSON
@@ -31,9 +29,8 @@ runCreateRemoteRelationshipP1 remoteRel@RemoteRelationship{..}= do
          (scRemoteSchemas sc) of
     Just rsCtx -> do
       tableInfo <- onNothing (Map.lookup rrTable $ scTables sc) $ throw400 NotFound "table not found"
-      validation <-
-        getCreateRemoteRelationshipValidation remoteRel rsCtx tableInfo
-      case validation of
-        Left err          -> throw400 RemoteSchemaError (T.pack (show err))
+      let remoteFieldE  = validateRelationship remoteRel (rscGCtx rsCtx) tableInfo
+      case remoteFieldE of
+        Left err          -> fromValidationError err
         Right remoteField -> pure remoteField
-    Nothing -> throw400 RemoteSchemaError "No such remote schema"
+    Nothing -> throw400 NotFound ("no such remote schema: " <> remoteSchemaNameToTxt rrRemoteSchema)
diff --git a/server/src-lib/Hasura/RQL/DDL/RemoteRelationship/Validate.hs b/server/src-lib/Hasura/RQL/DDL/RemoteRelationship/Validate.hs
@@ -5,10 +5,8 @@
 -- | Validate input queries against remote schemas.
 
 module Hasura.RQL.DDL.RemoteRelationship.Validate
-  ( getCreateRemoteRelationshipValidation
-  , validateRelationship
-  , validateRemoteArguments
-  , ValidationError(..)
+  ( validateRelationship
+  , fromValidationError
   ) where
 
 import           Data.Bifunctor
@@ -46,22 +44,10 @@ data ValidationError
   | UnsupportedEnum
   deriving (Show, Eq)
 
--- Get a validation for the remote relationship proposal.
--- Success returns (RemoteField, TypeMap) where TypeMap is a map of additional types needed for the RemoteField
-getCreateRemoteRelationshipValidation ::
-     (QErrM m)
-  => RemoteRelationship
-  -> RemoteSchemaCtx
-  -> TableInfo PGColumnInfo
-  -> m (Either (NonEmpty ValidationError) RemoteField)
-getCreateRemoteRelationshipValidation remoteRel rsCtx tableInfo = do
-  pure
-    (validateRelationship
-       remoteRel
-       (rscGCtx rsCtx)
-       tableInfo)
+fromValidationError :: (QErrM m) => NonEmpty ValidationError -> m a
+fromValidationError err = throw400 RemoteSchemaError (T.pack (show err))
 
--- | Validate a remote relationship given a context.
+-- | Validate a remote relationship given a context and return a RemoteField
 validateRelationship ::
      RemoteRelationship
   -> GC.RemoteGCtx

diff --git a/server/src-lib/Hasura/RQL/Types/RemoteSchema.hs b/server/src-lib/Hasura/RQL/Types/RemoteSchema.hs
@@ -1,7 +1,7 @@
 module Hasura.RQL.Types.RemoteSchema where
 
 import           Hasura.Prelude
-import           Hasura.RQL.Types.Common    (NonEmptyText)
+import           Hasura.RQL.Types.Common    (NonEmptyText (..))
 import           Language.Haskell.TH.Syntax (Lift)
 import           System.Environment         (lookupEnv)
 
@@ -25,6 +25,9 @@ newtype RemoteSchemaName
            , J.FromJSON, Q.ToPrepArg, Q.FromCol, DQuote
            )
 
+remoteSchemaNameToTxt :: RemoteSchemaName -> Text
+remoteSchemaNameToTxt = unNonEmptyText . unRemoteSchemaName
+
 data RemoteSchemaInfo
   = RemoteSchemaInfo
   { rsUrl              :: !N.URI