Merge branch 'master' of git://github.com/meteficha/esqueleto

This commit is contained in:
Sam Anklesaria 2013-07-02 19:40:28 +09:00
commit 024537b592
2 changed files with 13 additions and 10 deletions

View File

@ -1,5 +1,5 @@
name: esqueleto name: esqueleto
version: 1.2.2 version: 1.2.3
synopsis: Bare bones, type-safe EDSL for SQL queries on persistent backends. synopsis: Bare bones, type-safe EDSL for SQL queries on persistent backends.
homepage: https://github.com/meteficha/esqueleto homepage: https://github.com/meteficha/esqueleto
license: BSD3 license: BSD3
@ -81,7 +81,7 @@ test-suite test
-- Test-only dependencies -- Test-only dependencies
, HUnit , HUnit
, QuickCheck , QuickCheck
, hspec >= 1.3 && < 1.6 , hspec >= 1.3 && < 1.7
, persistent-sqlite == 1.2.* , persistent-sqlite == 1.2.*
, persistent-template == 1.2.* , persistent-template == 1.2.*
, monad-control , monad-control

View File

@ -343,12 +343,15 @@ import qualified Database.Persist
-- --
-- Individual insertions can be performed through Persistent's -- Individual insertions can be performed through Persistent's
-- 'insert' function, reexported for convenience. -- 'insert' function, reexported for convenience.
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- $reexports -- $reexports
-- --
-- We re-export many symbols from @persistent@ for convenince -- We re-export many symbols from @persistent@ for convenince:
--
-- * \"Store functions\" from "Database.Persist". -- * \"Store functions\" from "Database.Persist".
-- --
-- * Everything from "Database.Persist.Class" except for -- * Everything from "Database.Persist.Class" except for