diff --git a/esqueleto.cabal b/esqueleto.cabal index 42673ab..54f1283 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -1,5 +1,5 @@ name: esqueleto -version: 2.0.1 +version: 2.0.2 synopsis: Type-safe EDSL for SQL queries on persistent backends. homepage: https://github.com/prowdsponsor/esqueleto license: BSD3 @@ -66,7 +66,7 @@ library build-depends: base >= 4.5 && < 4.8 , text >= 0.11 && < 1.2 - , persistent >= 2.0.2 && < 2.1 + , persistent >= 2.0.5 && < 2.1 , transformers >= 0.2 , unordered-containers >= 0.2 , tagged >= 0.2 diff --git a/src/Database/Esqueleto/Internal/Sql.hs b/src/Database/Esqueleto/Internal/Sql.hs index 894c2f2..5a2dbc4 100644 --- a/src/Database/Esqueleto/Internal/Sql.hs +++ b/src/Database/Esqueleto/Internal/Sql.hs @@ -970,8 +970,8 @@ instance PersistEntity a => SqlSelect (SqlExpr (Entity a)) (Entity a) where where process ed = uncommas $ map ((name <>) . fromDBName info) $ - (sqlIdName ed:) $ map fieldDB $ + entityId ed : entityFields ed -- 'name' is the biggest difference between 'RawSql' and -- 'SqlSelect'. We automatically create names for tables