Simplified type parameters of the SqlCopy<X> type constructors

Author: LaurentRDC

beam-core/Database/Beam/Backend/SQL/BeamExtensions/Copy/File.hs

@@ -142,15 +142,15 @@ type family BeamSqlBackendCopyFromSyntax be :: Type
 -- 'runCopyTo'. Construct via 'copyTableTo' or 'copySelectTo'; the @table@
 -- and @proj@ phantom parameters track which table the statement applies to
 -- and which columns it projects.
-data SqlCopyTo be (table :: (Type -> Type) -> Type) proj
+data SqlCopyTo be a
   = SqlCopyTo !(BeamSqlBackendCopyToSyntax be)
   | -- | A projection covering zero columns. 'runCopyTo' should treat this as a
     --    no-op rather than emit an empty @COPY tbl () TO ...@ statement.
     SqlCopyToNoColumns
 
 -- | A built file-mode @COPY ... FROM@ statement, ready to be executed by
 -- 'runCopyFrom'. Construct via 'copyTableFrom'.
-data SqlCopyFrom be (table :: (Type -> Type) -> Type) proj
+data SqlCopyFrom be a
   = SqlCopyFrom !(BeamSqlBackendCopyFromSyntax be)
   | -- | A projection covering zero columns. 'runCopyFrom' should treat this as
     --    a no-op rather than emit an empty @COPY tbl () FROM ...@ statement.
@@ -171,7 +171,7 @@ copyTableTo ::
   (table (QField s) -> proj) ->
   -- | Backend-specific options. The output is also determined by this value
   SqlCopyToParams (BeamSqlBackendCopyToSyntax be) ->
-  SqlCopyTo be table proj
+  SqlCopyTo be proj
 copyTableTo (DatabaseEntity dt@(DatabaseTable {})) mkProj options =
   case nonEmpty (projection dt mkProj) of
     Nothing -> SqlCopyToNoColumns
@@ -195,7 +195,7 @@ copySelectTo ::
   SqlSelect be a ->
   -- | Backend-specific options. The format is pinned by this value
   SqlCopyToParams (BeamSqlBackendCopyToSyntax be) ->
-  SqlCopyTo be table proj
+  SqlCopyTo be a
 copySelectTo (SqlSelect selectSyntax) options =
   let source = copySelectToSyntax selectSyntax
    in SqlCopyTo (copyToStmt source options)
@@ -213,7 +213,7 @@ copyTableFrom ::
   (table (QField s) -> proj) ->
   -- | Backend-specific options. The format is pinned by this value
   SqlCopyFromParams (BeamSqlBackendCopyFromSyntax be) ->
-  SqlCopyFrom be table proj
+  SqlCopyFrom be proj
 copyTableFrom (DatabaseEntity dt@(DatabaseTable {})) mkProj options =
   case nonEmpty (projection dt mkProj) of
     Nothing -> SqlCopyFromNoColumns
@@ -254,7 +254,7 @@ projection dt mkProj =
 -- @since 0.11.1.0
 class (MonadBeam be m) => MonadBeamCopyTo be m | m -> be where
   -- | Execute a built @COPY ... TO@ file statement.
-  runCopyTo :: SqlCopyTo be table proj -> m ()
+  runCopyTo :: SqlCopyTo be res -> m ()
 
 instance (MonadBeamCopyTo be m) => MonadBeamCopyTo be (ExceptT e m) where
   runCopyTo = lift . runCopyTo
@@ -290,7 +290,7 @@ instance (MonadBeamCopyTo be m, Monoid w) => MonadBeamCopyTo be (Strict.RWST r w
 -- @since 0.11.1.0
 class (MonadBeam be m) => MonadBeamCopyFrom be m | m -> be where
   -- | Execute a built @COPY ... FROM@ file statement.
-  runCopyFrom :: SqlCopyFrom be table proj -> m ()
+  runCopyFrom :: SqlCopyFrom be proj -> m ()
 
 instance (MonadBeamCopyFrom be m) => MonadBeamCopyFrom be (ExceptT e m) where
   runCopyFrom = lift . runCopyFrom

beam-core/Database/Beam/Backend/SQL/BeamExtensions/Copy/Stream.hs

@@ -110,7 +110,7 @@ type family BeamSqlBackendCopyFromStreamSyntax be :: Type
 
 -- | A built streaming-mode @COPY ... TO@ statement, ready to be executed by
 -- 'runCopyToStream'.
-data SqlCopyToStream be (table :: (Type -> Type) -> Type) proj
+data SqlCopyToStream be a
   = SqlCopyToStream !(BeamSqlBackendCopyToStreamSyntax be)
   | -- | A projection covering zero columns. 'runCopyToStream' should treat
     --    this as a no-op (it must still call the sink zero times) rather
@@ -119,7 +119,7 @@ data SqlCopyToStream be (table :: (Type -> Type) -> Type) proj
 
 -- | A built streaming-mode @COPY ... FROM@ statement, ready to be executed
 -- by 'runCopyFromStream'.
-data SqlCopyFromStream be (table :: (Type -> Type) -> Type) proj
+data SqlCopyFromStream be a
   = SqlCopyFromStream !(BeamSqlBackendCopyFromStreamSyntax be)
   | -- | A projection covering zero columns. 'runCopyFromStream' should
     --    treat this as a no-op (it should not pull from the source) rather
@@ -142,7 +142,7 @@ copyTableToStream ::
   (table (QField s) -> proj) ->
   -- | Backend-specific options.
   SqlCopyToStreamParams (BeamSqlBackendCopyToStreamSyntax be) ->
-  SqlCopyToStream be table proj
+  SqlCopyToStream be proj
 copyTableToStream (DatabaseEntity dt@(DatabaseTable {})) mkProj options =
   case nonEmpty (projection dt mkProj) of
     Nothing -> SqlCopyToStreamNoColumns
@@ -163,7 +163,7 @@ copySelectToStream ::
   ) =>
   SqlSelect be a ->
   SqlCopyToStreamParams (BeamSqlBackendCopyToStreamSyntax be) ->
-  SqlCopyToStream be table proj
+  SqlCopyToStream be a
 copySelectToStream (SqlSelect selectSyntax) options =
   let source = copySelectToSyntax selectSyntax
    in SqlCopyToStream (copyToStreamStmt source options)
@@ -183,7 +183,7 @@ copyTableFromStream ::
   -- To copy the stream into the entire table, use 'id'.
   (table (QField s) -> proj) ->
   SqlCopyFromStreamParams (BeamSqlBackendCopyFromStreamSyntax be) ->
-  SqlCopyFromStream be table proj
+  SqlCopyFromStream be proj
 copyTableFromStream (DatabaseEntity dt@(DatabaseTable {})) mkProj options =
   case nonEmpty (projection dt mkProj) of
     Nothing -> SqlCopyFromStreamNoColumns
@@ -207,7 +207,7 @@ class (MonadBeam be m) => MonadBeamCopyToStream be m | m -> be where
   -- is invoked from 'IO' once per chunk emitted by the server, in order;
   -- 'runCopyToStream' returns once the server signals end of stream.
   runCopyToStream ::
-    SqlCopyToStream be table proj ->
+    SqlCopyToStream be a ->
     -- | Sink. Called once for each chunk of bytes the server emits.
     (ByteString -> IO ()) ->
     m ()
@@ -256,7 +256,7 @@ class (MonadBeam be m) => MonadBeamCopyFromStream be m | m -> be where
   -- chunk is forwarded to the server in order. 'runCopyFromStream' returns
   -- once the server has acknowledged the end of stream.
   runCopyFromStream ::
-    SqlCopyFromStream be table proj ->
+    SqlCopyFromStream be a ->
     -- | Source. Called repeatedly. 'Nothing' signals end of data.
     IO (Maybe ByteString) ->
     m ()