Commit Graph

438 Commits

Author SHA1 Message Date
Chris Allen
78eaf83859 Whitespace cleanup 2017-05-25 12:00:00 -05:00
Chris Allen
ee4d0d5e35 Merge pull request #28 from bitemyapp/fix-group-by-composite-key
Fixing composite key support for group by
2017-05-25 11:51:56 -05:00
Chris Allen
96cc3a546b Merge pull request #20 from ncaq/master
use persistent-sqlite >= 2.1.3
2017-05-25 11:21:18 -05:00
Chris Allen
7488003444 Merge pull request #26 from psibi/persistent-version
Allow persistent 2.7.0
2017-05-25 11:21:01 -05:00
Chris Allen
14a28ab32d Cleanup 2017-05-25 11:19:41 -05:00
Chris Allen
5609d78de4 Helps if you vary the primary key 2017-05-04 21:45:35 -05:00
Chris Allen
43813cdfe2 Test suite still broken 2017-04-28 00:08:05 -05:00
Chris Allen
5a78c156c2 Fixing composite key support for group by 2017-04-27 22:49:48 -05:00
Sibi Prabakaran
52a442fb98
Allow persistent 2.7.0 2017-04-15 18:14:13 +05:30
Chris Allen
60a6a394aa Merge pull request #24 from hvr/patch-1
Tighten version bound on base
2017-03-23 16:04:41 -05:00
Herbert Valerio Riedel
3e1d3deede Tighten version bound on base
Given that CI only seems to test against GHC 7.10 & GHC 8.0 it's safe to say that only
`base >= 4.8` is officially supported. And empirically, GHC 7.8.4 runs into the compile error below

```
Configuring component lib from esqueleto-2.5.0...
Preprocessing library esqueleto-2.5.0...
[1 of 5] Compiling Database.Esqueleto.Internal.PersistentImport ( src/Database/Esqueleto/Internal/PersistentImport.hs, /tmp/matrix-worker/1485112890/dist-newstyle/build/x86_64-linux/ghc-7.8.4/esqueleto-2.5.0/build/Database/Esqueleto/Internal/PersistentImport.o )

src/Database/Esqueleto/Internal/PersistentImport.hs:7:1: Warning:
    The import item ‘PersistQuery(..)’ suggests that
    ‘PersistQuery’ has (in-scope) constructors or class methods,
    but it has none
[2 of 5] Compiling Database.Esqueleto.Internal.Language ( src/Database/Esqueleto/Internal/Language.hs, /tmp/matrix-worker/1485112890/dist-newstyle/build/x86_64-linux/ghc-7.8.4/esqueleto-2.5.0/build/Database/Esqueleto/Internal/Language.o )

src/Database/Esqueleto/Internal/Language.hs:55:1: Warning:
    The qualified import of ‘Data.ByteString.Lazy’ is redundant
      except perhaps to import instances from ‘Data.ByteString.Lazy’
    To import instances alone, use: import Data.ByteString.Lazy()
[3 of 5] Compiling Database.Esqueleto.Internal.Sql ( src/Database/Esqueleto/Internal/Sql.hs, /tmp/matrix-worker/1485112890/dist-newstyle/build/x86_64-linux/ghc-7.8.4/esqueleto-2.5.0/build/Database/Esqueleto/Internal/Sql.o )

src/Database/Esqueleto/Internal/Sql.hs:761:32:
    Could not deduce (Functor m1) arising from a use of ‘<$>’
    from the context (SqlSelect a r, MonadIO m1, MonadIO m2)
      bound by the type signature for
                 rawSelectSource :: (SqlSelect a r, MonadIO m1, MonadIO m2) =>
                                    Mode -> SqlQuery a -> SqlReadT m1 (Acquire (C.Source m2 r))
      at src/Database/Esqueleto/Internal/Sql.hs:(753,20)-(758,57)
    or from (SqlBackendCanRead backend)
      bound by the type signature for
                 rawSelectSource :: (SqlBackendCanRead backend) =>
                                    Mode
                                    -> SqlQuery a -> R.ReaderT backend m1 (Acquire (C.Source m2 r))
      at src/Database/Esqueleto/Internal/Sql.hs:(759,1)-(778,35)
    Possible fix:
      add (Functor m1) to the context of
        the type signature for
          rawSelectSource :: (SqlBackendCanRead backend) =>
                             Mode
                             -> SqlQuery a -> R.ReaderT backend m1 (Acquire (C.Source m2 r))
        or the type signature for
             rawSelectSource :: (SqlSelect a r, MonadIO m1, MonadIO m2) =>
                                Mode -> SqlQuery a -> SqlReadT m1 (Acquire (C.Source m2 r))
    In a stmt of a 'do' block: conn <- persistBackend <$> R.ask
    In the expression:
      do { conn <- persistBackend <$> R.ask;
           res <- run conn;
           return $ (C.$= massage) `fmap` res }
    In an equation for ‘rawSelectSource’:
        rawSelectSource mode query
          = do { conn <- persistBackend <$> R.ask;
                 res <- run conn;
                 return $ (C.$= massage) `fmap` res }
          where
              run conn
                = uncurry rawQueryRes
                  $ first builderToText
                    $ toRawSql mode (conn, initialIdentState) query
              massage
                = do { mrow <- C.await;
                       .... }
              process = sqlSelectProcessRow

src/Database/Esqueleto/Internal/Sql.hs:882:26:
    Could not deduce (Functor m) arising from a use of ‘<$>’
    from the context (MonadIO m, SqlSelect a r, IsSqlBackend backend)
      bound by the type signature for
                 rawEsqueleto :: (MonadIO m, SqlSelect a r, IsSqlBackend backend) =>
                                 Mode -> SqlQuery a -> R.ReaderT backend m Int64
      at src/Database/Esqueleto/Internal/Sql.hs:(877,17)-(880,39)
    Possible fix:
      add (Functor m) to the context of
        the type signature for
          rawEsqueleto :: (MonadIO m, SqlSelect a r, IsSqlBackend backend) =>
                          Mode -> SqlQuery a -> R.ReaderT backend m Int64
    In a stmt of a 'do' block: conn <- persistBackend <$> R.ask
    In the expression:
      do { conn <- persistBackend <$> R.ask;
           uncurry rawExecuteCount
           $ first builderToText
             $ toRawSql mode (conn, initialIdentState) query }
    In an equation for ‘rawEsqueleto’:
        rawEsqueleto mode query
          = do { conn <- persistBackend <$> R.ask;
                 uncurry rawExecuteCount
                 $ first builderToText
                   $ toRawSql mode (conn, initialIdentState) query }
```
2017-03-21 22:07:03 +01:00
Chris Allen
a28198ed92 Merge pull request #18 from ChrisCoffey/fix-postgres-tests
Fix postgres tests
2017-02-04 15:02:41 -06:00
Chris Coffey
9604b25833 Fix postgres tests 2017-02-04 13:02:09 -05:00
Chris Allen
75bf47936d stack setup for screwdriver 2017-01-25 16:29:53 -06:00
Chris Allen
5b89568833 Testing Screwdriver 2017-01-25 16:16:47 -06:00
Chris Allen
6e2b880488 Makefile, LTS for 8.0, bump version 2017-01-22 12:55:05 -06:00
Chris Allen
fc3549eca6 Merge pull request #14 from pSub/patch-1
Update link in Hackage description
2017-01-16 14:15:43 -06:00
Pascal Wittmann
3658f11a01 Update link in Hackage description 2017-01-16 20:55:16 +01:00
Chris Allen
2390c96122 Merge pull request #12 from mrkkrp/allow-persistent-2.6-and-base-4.9
Allow persistent 2.6 and base 4.9
2017-01-16 00:24:26 -06:00
Chris Allen
7fe984f075 Merge pull request #11 from mrkkrp/master
Update source repository link in Cabal file
2017-01-16 00:23:58 -06:00
Chris Allen
d63a220dc2 Merge pull request #13 from peterstuart/fix-typo
Fix typo in README
2017-01-16 00:23:47 -06:00
Peter Stuart
0d62d163f3
Fix typo. 2017-01-14 09:36:21 -05:00
mrkkrp
eaa7c1057f Allow ‘persistent-2.6’ and ‘base-4.9’ 2017-01-11 03:08:10 +03:00
mrkkrp
42bcb97f41 Update source repository link in Cabal file 2017-01-08 18:48:05 +03:00
Chris Allen
15fc5ca918 Merge pull request #9 from qrilka/patch-1
Use correct `in_` quoting in haddock code block
2017-01-07 13:46:42 -06:00
Chris Allen
6c46604845 Merge pull request #10 from qrilka/patch-2
Correct persistent module name for example imports
2017-01-07 13:46:20 -06:00
Kirill Zaborsky
99da7c333d Correct persistent module name for example imports
Follow-up to https://github.com/prowdsponsor/esqueleto/pull/152
2017-01-07 16:04:25 +03:00
Kirill Zaborsky
39c0fdd02e Use correct in_ quoting in haddock code block
Follow-up on https://github.com/prowdsponsor/esqueleto/pull/154
2017-01-07 16:02:00 +03:00
ncaq
75c3549c86 use persistent-sqlite >= 2.1.3 2016-12-16 15:47:56 +09:00
Chris Allen
bfc8502dbf Make test suite run against PGSQL and MySQL 2016-12-14 19:40:18 -06:00
Chris Allen
7ff70f1e63 Add libgmp 2016-12-14 19:26:50 -06:00
Chris Allen
08067f397a disable test 2016-12-14 19:21:57 -06:00
Chris Allen
ae82ee4826 Getting Travis working 2016-12-14 19:16:07 -06:00
Chris Allen
9cc9479a92 README fixes 2016-12-14 18:58:13 -06:00
Chris Allen
4fd0b47320 Merge pull request #2 from tippenein/update-readme
README port from Haddocks
2016-12-14 18:49:38 -06:00
brady.ouren
28f6a1de03 initial readme port from Haddocks 2016-12-14 14:31:58 -08:00
Eric Easley
a5251302c8 Use released persistent-2.5 2016-04-14 15:20:57 -07:00
Eric Easley
72d2be3e6a Fix test 2016-04-04 11:44:58 -07:00
Eric Easley
a2d504ae7b Use IsSqlBackend synonym 2016-04-04 11:17:47 -07:00
Eric Easley
5d56abd698 Adjust for upcoming split db changes 2016-04-01 18:13:52 -07:00
Felipe Lessa
ab275c599d Merge pull request #133 from bitemyapp/master
Fix update docs to have a slash
2016-03-09 17:52:32 -03:00
Chris Allen
a9bc846f02 fix update docs to have a slash 2016-03-09 13:50:44 -06:00
Felipe Lessa
2797b871c5 Merge pull request #131 from nmk/patch-1
Fix typo in haddock for `in_`
2016-02-17 09:59:35 -02:00
Nickolay Kolev
fc366c5279 Fix typo in haddock for in_ 2016-02-17 11:02:17 +01:00
Felipe Lessa
184f24ffe7 Use LTS 5.1. 2016-02-12 18:48:19 -02:00
Felipe Lessa
c30aa5704d Bump version to 2.4.3. 2016-02-12 18:47:37 -02:00
Felipe Lessa
3c7c311995 Revert "Fix pedantic errors"
This reverts commit a104b30da2.
2016-02-12 18:45:45 -02:00
Felipe Lessa
7166172251 Merge pull request #130 from pseudonom/master
Add `ToBaseId`
2016-02-12 18:44:34 -02:00
Eric Easley
dc72d1bcd8 Export ToBaseId 2016-02-09 12:04:01 -08:00
Eric Easley
a104b30da2 Fix pedantic errors 2016-02-08 10:54:29 -08:00