From 124be9af3e0d243a4b59f369ecdc0d38814785f2 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 25 Jun 2013 09:03:11 +0300 Subject: [PATCH 1/4] Allow hspec 1.6 --- esqueleto.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esqueleto.cabal b/esqueleto.cabal index 07e732b..08e9ab6 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -81,7 +81,7 @@ test-suite test -- Test-only dependencies , HUnit , QuickCheck - , hspec >= 1.3 && < 1.6 + , hspec >= 1.3 && < 1.7 , persistent-sqlite == 1.2.* , persistent-template == 1.2.* , monad-control From 29ece85b5f5daf750879d3c2b1f5e2c45975292d Mon Sep 17 00:00:00 2001 From: Felipe Lessa Date: Tue, 25 Jun 2013 13:37:24 -0300 Subject: [PATCH 2/4] Bump version to 1.2.2.1. --- esqueleto.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esqueleto.cabal b/esqueleto.cabal index 08e9ab6..afd9957 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -1,5 +1,5 @@ name: esqueleto -version: 1.2.2 +version: 1.2.2.1 synopsis: Bare bones, type-safe EDSL for SQL queries on persistent backends. homepage: https://github.com/meteficha/esqueleto license: BSD3 From 66e67e1cff93a34ffa1ccccec23a7ec2192dc15c Mon Sep 17 00:00:00 2001 From: Felipe Lessa Date: Mon, 1 Jul 2013 11:06:53 -0300 Subject: [PATCH 3/4] Final touchs on docs. --- src/Database/Esqueleto.hs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Database/Esqueleto.hs b/src/Database/Esqueleto.hs index 59830de..cb62206 100644 --- a/src/Database/Esqueleto.hs +++ b/src/Database/Esqueleto.hs @@ -322,32 +322,35 @@ import qualified Database.Persist -- from $ \\p -> do -- where_ (p ^. PersonAge <. just (val 14)) -- @ --- +-- -- The results of queries can also be used for insertions. -- In @SQL@, we might write the following, inserting a new blog -- post for every user: --- +-- -- @ -- INSERT INTO BlogPost -- SELECT ('Group Blog Post', id) -- FROM Person -- @ --- +-- -- In @esqueleto@, we may write the same query above as: --- +-- -- @ -- insertSelect $ from $ \p-> -- return $ BlogPost \<# \"Group Blog Post\" \<&\> (p ^. PersonId) -- @ --- --- Individual insertions can be performed through Persistent's --- 'insert' function, reexported for convenience. +-- +-- Individual insertions can be performed through Persistent's +-- 'insert' function, reexported for convenience. + + ---------------------------------------------------------------------- -- $reexports -- --- We re-export many symbols from @persistent@ for convenince +-- We re-export many symbols from @persistent@ for convenince: +-- -- * \"Store functions\" from "Database.Persist". -- -- * Everything from "Database.Persist.Class" except for From c4240a0839a8d81abf4e7594a8afb509a519c520 Mon Sep 17 00:00:00 2001 From: Felipe Lessa Date: Mon, 1 Jul 2013 11:07:11 -0300 Subject: [PATCH 4/4] Bump version to 1.2.3. --- esqueleto.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esqueleto.cabal b/esqueleto.cabal index 061af10..80a2a2d 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -1,5 +1,5 @@ name: esqueleto -version: 1.2.2.1 +version: 1.2.3 synopsis: Bare bones, type-safe EDSL for SQL queries on persistent backends. homepage: https://github.com/meteficha/esqueleto license: BSD3