insert select statements
This commit is contained in:
parent
d056545c3e
commit
ee8656adf0
@ -71,6 +71,10 @@ module Database.Esqueleto
|
|||||||
, deleteCount
|
, deleteCount
|
||||||
, update
|
, update
|
||||||
, updateCount
|
, updateCount
|
||||||
|
, insertSelect
|
||||||
|
, insertSelectDistinct
|
||||||
|
, (<#)
|
||||||
|
, (<&>)
|
||||||
|
|
||||||
-- * Helpers
|
-- * Helpers
|
||||||
, valkey
|
, valkey
|
||||||
|
|||||||
@ -35,6 +35,10 @@ module Database.Esqueleto.Internal.Sql
|
|||||||
, Mode(..)
|
, Mode(..)
|
||||||
, SqlSelect
|
, SqlSelect
|
||||||
, veryUnsafeCoerceSqlExprValue
|
, veryUnsafeCoerceSqlExprValue
|
||||||
|
, insertSelectDistinct
|
||||||
|
, insertSelect
|
||||||
|
, (<#)
|
||||||
|
, (<&>)
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Applicative (Applicative(..), (<$>), (<$))
|
import Control.Applicative (Applicative(..), (<$>), (<$))
|
||||||
@ -227,6 +231,7 @@ useIdent conn (I ident) = fromDBName conn $ DBName ident
|
|||||||
|
|
||||||
-- | An expression on the SQL backend.
|
-- | An expression on the SQL backend.
|
||||||
data SqlExpr a where
|
data SqlExpr a where
|
||||||
|
EInsert :: Proxy a -> (Connection -> (TLB.Builder, [PersistValue])) -> SqlExpr (Proxy a)
|
||||||
EEntity :: Ident -> SqlExpr (Entity val)
|
EEntity :: Ident -> SqlExpr (Entity val)
|
||||||
EMaybe :: SqlExpr a -> SqlExpr (Maybe a)
|
EMaybe :: SqlExpr a -> SqlExpr (Maybe a)
|
||||||
ERaw :: NeedParens -> (Connection -> (TLB.Builder, [PersistValue])) -> SqlExpr (Value a)
|
ERaw :: NeedParens -> (Connection -> (TLB.Builder, [PersistValue])) -> SqlExpr (Value a)
|
||||||
@ -371,7 +376,7 @@ setAux field mkVal = ESet $ \ent -> unsafeSqlBinOp " = " name (mkVal ent)
|
|||||||
where name = ERaw Never $ \conn -> (fieldName conn field, mempty)
|
where name = ERaw Never $ \conn -> (fieldName conn field, mempty)
|
||||||
|
|
||||||
sub :: PersistField a => Mode -> SqlQuery (SqlExpr (Value a)) -> SqlExpr (Value a)
|
sub :: PersistField a => Mode -> SqlQuery (SqlExpr (Value a)) -> SqlExpr (Value a)
|
||||||
sub mode query = ERaw Parens $ \conn -> toRawSql mode conn query
|
sub mode query = ERaw Parens $ \conn -> toRawSql mode Query conn query
|
||||||
|
|
||||||
fromDBName :: Connection -> DBName -> TLB.Builder
|
fromDBName :: Connection -> DBName -> TLB.Builder
|
||||||
fromDBName conn = TLB.fromText . connEscapeName conn
|
fromDBName conn = TLB.fromText . connEscapeName conn
|
||||||
@ -379,7 +384,7 @@ fromDBName conn = TLB.fromText . connEscapeName conn
|
|||||||
existsHelper :: SqlQuery () -> SqlExpr (Value a)
|
existsHelper :: SqlQuery () -> SqlExpr (Value a)
|
||||||
existsHelper =
|
existsHelper =
|
||||||
ERaw Parens .
|
ERaw Parens .
|
||||||
flip (toRawSql SELECT) .
|
flip (toRawSql SELECT Query) .
|
||||||
(>> return (val True :: SqlExpr (Value Bool)))
|
(>> return (val True :: SqlExpr (Value Bool)))
|
||||||
|
|
||||||
ifNotEmptyList :: SqlExpr (ValueList a) -> Bool -> SqlExpr (Value Bool) -> SqlExpr (Value Bool)
|
ifNotEmptyList :: SqlExpr (ValueList a) -> Bool -> SqlExpr (Value Bool) -> SqlExpr (Value Bool)
|
||||||
@ -488,7 +493,7 @@ rawSelectSource mode query = src
|
|||||||
run conn =
|
run conn =
|
||||||
uncurry rawQuery $
|
uncurry rawQuery $
|
||||||
first builderToText $
|
first builderToText $
|
||||||
toRawSql mode conn query
|
toRawSql mode Query conn query
|
||||||
|
|
||||||
massage = do
|
massage = do
|
||||||
mrow <- C.await
|
mrow <- C.await
|
||||||
@ -600,7 +605,7 @@ rawEsqueleto mode query = do
|
|||||||
conn <- SqlPersistT R.ask
|
conn <- SqlPersistT R.ask
|
||||||
uncurry rawExecuteCount $
|
uncurry rawExecuteCount $
|
||||||
first builderToText $
|
first builderToText $
|
||||||
toRawSql mode conn query
|
toRawSql mode Query conn query
|
||||||
|
|
||||||
|
|
||||||
-- | Execute an @esqueleto@ @DELETE@ query inside @persistent@'s
|
-- | Execute an @esqueleto@ @DELETE@ query inside @persistent@'s
|
||||||
@ -684,14 +689,15 @@ builderToText = TL.toStrict . TLB.toLazyTextWith defaultChunkSize
|
|||||||
-- @esqueleto@, instead of manually using this function (which is
|
-- @esqueleto@, instead of manually using this function (which is
|
||||||
-- possible but tedious), you may just turn on query logging of
|
-- possible but tedious), you may just turn on query logging of
|
||||||
-- @persistent@.
|
-- @persistent@.
|
||||||
toRawSql :: SqlSelect a r => Mode -> Connection -> SqlQuery a -> (TLB.Builder, [PersistValue])
|
toRawSql :: (SqlSelect a r, SqlInsert t a) => Mode -> t -> Connection -> SqlQuery a -> (TLB.Builder, [PersistValue])
|
||||||
toRawSql mode conn query =
|
toRawSql mode t conn query =
|
||||||
let (ret, SideData fromClauses setClauses whereClauses groupByClause havingClause orderByClauses limitClause) =
|
let (ret, SideData fromClauses setClauses whereClauses groupByClause havingClause orderByClauses limitClause) =
|
||||||
flip S.evalState initialIdentState $
|
flip S.evalState initialIdentState $
|
||||||
W.runWriterT $
|
W.runWriterT $
|
||||||
unQ query
|
unQ query
|
||||||
in mconcat
|
in mconcat
|
||||||
[ makeSelect conn mode ret
|
[ makeInsert t ret
|
||||||
|
, makeSelect conn mode ret
|
||||||
, makeFrom conn mode fromClauses
|
, makeFrom conn mode fromClauses
|
||||||
, makeSet conn setClauses
|
, makeSet conn setClauses
|
||||||
, makeWhere conn whereClauses
|
, makeWhere conn whereClauses
|
||||||
@ -704,6 +710,25 @@ toRawSql mode conn query =
|
|||||||
-- | (Internal) Mode of query being converted by 'toRawSql'.
|
-- | (Internal) Mode of query being converted by 'toRawSql'.
|
||||||
data Mode = SELECT | SELECT_DISTINCT | DELETE | UPDATE
|
data Mode = SELECT | SELECT_DISTINCT | DELETE | UPDATE
|
||||||
|
|
||||||
|
data Query = Query
|
||||||
|
data Insertion = Insertion
|
||||||
|
|
||||||
|
class SqlInsert t a where
|
||||||
|
getTable :: t -> a -> TLB.Builder
|
||||||
|
|
||||||
|
instance PersistEntity a => SqlInsert Insertion (SqlExpr (Proxy a)) where
|
||||||
|
getTable _ (EInsert p _) =
|
||||||
|
let def = entityDef p
|
||||||
|
unName = TLB.fromText . unDBName
|
||||||
|
fields = uncommas $ map (unName . fieldDB) (entityFields def)
|
||||||
|
table = unName . entityDB . entityDef $ p
|
||||||
|
in "INSERT INTO " <> table <> parens fields <> "\n"
|
||||||
|
|
||||||
|
instance SqlInsert Query a where
|
||||||
|
getTable _ _ = mempty
|
||||||
|
|
||||||
|
makeInsert :: SqlInsert t a => t -> a -> (TLB.Builder, [PersistValue])
|
||||||
|
makeInsert t a = (getTable t a, [])
|
||||||
|
|
||||||
uncommas :: [TLB.Builder] -> TLB.Builder
|
uncommas :: [TLB.Builder] -> TLB.Builder
|
||||||
uncommas = mconcat . intersperse ", " . filter (/= mempty)
|
uncommas = mconcat . intersperse ", " . filter (/= mempty)
|
||||||
@ -840,6 +865,15 @@ class SqlSelect a r | a -> r, r -> a where
|
|||||||
sqlSelectProcessRow :: [PersistValue] -> Either T.Text r
|
sqlSelectProcessRow :: [PersistValue] -> Either T.Text r
|
||||||
|
|
||||||
|
|
||||||
|
-- | You may return any single value (i.e. a single column) from
|
||||||
|
-- a 'select' query.
|
||||||
|
instance PersistField a => SqlSelect (SqlExpr (Proxy a)) (Proxy a) where
|
||||||
|
sqlSelectCols esc (EInsert _ f) = let (b, vals) = f esc
|
||||||
|
in (b, vals)
|
||||||
|
sqlSelectColCount = const 0
|
||||||
|
sqlSelectProcessRow = const (Right Proxy)
|
||||||
|
|
||||||
|
|
||||||
-- | Not useful for 'select', but used for 'update' and 'delete'.
|
-- | Not useful for 'select', but used for 'update' and 'delete'.
|
||||||
instance SqlSelect () () where
|
instance SqlSelect () () where
|
||||||
sqlSelectCols _ _ = ("1", [])
|
sqlSelectCols _ _ = ("1", [])
|
||||||
@ -1386,3 +1420,30 @@ from16P = const Proxy
|
|||||||
|
|
||||||
to16 :: ((a,b),(c,d),(e,f),(g,h),(i,j),(k,l),(m,n),(o,p)) -> (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p)
|
to16 :: ((a,b),(c,d),(e,f),(g,h),(i,j),(k,l),(m,n),(o,p)) -> (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p)
|
||||||
to16 ((a,b),(c,d),(e,f),(g,h),(i,j),(k,l),(m,n),(o,p)) = (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p)
|
to16 ((a,b),(c,d),(e,f),(g,h),(i,j),(k,l),(m,n),(o,p)) = (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p)
|
||||||
|
|
||||||
|
-- | Apply a PersistField constructor to SqlExpr Value arguments
|
||||||
|
(<#) :: (a -> b) -> SqlExpr (Value a) -> SqlExpr (Proxy b)
|
||||||
|
(<#) _ (ERaw _ f) = EInsert Proxy f
|
||||||
|
|
||||||
|
-- | Pair SqlExpr Value arguments, inserting commas
|
||||||
|
(<&>) :: SqlExpr (Proxy (a -> b)) -> SqlExpr (Value a) -> SqlExpr (Proxy b)
|
||||||
|
(EInsert _ f) <&> (ERaw _ g) = EInsert Proxy $ \x->
|
||||||
|
let (fb, fv) = f x
|
||||||
|
(gb, gv) = g x
|
||||||
|
in (fb <> ", " <> gb, fv ++ gv)
|
||||||
|
|
||||||
|
-- | Insert a PersistField for every selected value
|
||||||
|
insertSelect :: (MonadLogger m, MonadResourceBase m, SqlSelect a r, SqlInsert Insertion a) =>
|
||||||
|
SqlQuery a -> SqlPersistT m ()
|
||||||
|
insertSelect = insertQuery SELECT
|
||||||
|
|
||||||
|
-- | Insert a PersistField for every unique selected value
|
||||||
|
insertSelectDistinct :: (MonadLogger m, MonadResourceBase m, SqlSelect a r, SqlInsert Insertion a) =>
|
||||||
|
SqlQuery a -> SqlPersistT m ()
|
||||||
|
insertSelectDistinct = insertQuery SELECT_DISTINCT
|
||||||
|
|
||||||
|
insertQuery :: (MonadLogger m, MonadResourceBase m, SqlSelect a r, SqlInsert Insertion a) =>
|
||||||
|
Mode -> SqlQuery a -> SqlPersistT m ()
|
||||||
|
insertQuery mode query = do
|
||||||
|
conn <- SqlPersistT R.ask
|
||||||
|
uncurry rawExecute $ first builderToText $ toRawSql mode Insertion conn query
|
||||||
|
|||||||
12
test/Test.hs
12
test/Test.hs
@ -9,6 +9,7 @@
|
|||||||
, Rank2Types
|
, Rank2Types
|
||||||
, TemplateHaskell
|
, TemplateHaskell
|
||||||
, TypeFamilies
|
, TypeFamilies
|
||||||
|
, ScopedTypeVariables
|
||||||
#-}
|
#-}
|
||||||
module Main (main) where
|
module Main (main) where
|
||||||
|
|
||||||
@ -623,6 +624,17 @@ main = do
|
|||||||
return p
|
return p
|
||||||
liftIO $ ret `shouldBe` [ Entity p2k p2 ]
|
liftIO $ ret `shouldBe` [ Entity p2k p2 ]
|
||||||
|
|
||||||
|
describe "inserts by select" $ do
|
||||||
|
it "IN works for insertSelect" $
|
||||||
|
run $ do
|
||||||
|
_ <- insert p1
|
||||||
|
_ <- insert p2
|
||||||
|
_ <- insert p3
|
||||||
|
insertSelect $ from $ \p -> do
|
||||||
|
return $ BlogPost <# val "FakePost" <&> (p ^. PersonId)
|
||||||
|
ret <- select $ from (\(b::(SqlExpr (Entity BlogPost))) -> return countRows)
|
||||||
|
liftIO $ ret `shouldBe` [Value (3::Int)]
|
||||||
|
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user