From 30964d950dbae7340f92e7411ed721e1c4fa18c3 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 27 Aug 2014 11:27:36 +0300
Subject: [PATCH] More persistent2 updates

---
 src/Database/Esqueleto.hs                           | 13 -------------
 src/Database/Esqueleto/Internal/PersistentImport.hs |  3 ++-
 src/Database/Esqueleto/Internal/Sql.hs              |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/Database/Esqueleto.hs b/src/Database/Esqueleto.hs
index 4c78a71..22b9826 100644
--- a/src/Database/Esqueleto.hs
+++ b/src/Database/Esqueleto.hs
@@ -79,9 +79,6 @@ module Database.Esqueleto
   , (<#)
   , (<&>)
 
-    -- * Helpers
-  , valkey
-
     -- * Re-exports
     -- $reexports
   , deleteKey
@@ -371,16 +368,6 @@ import qualified Database.Persist
 ----------------------------------------------------------------------
 
 
--- | @valkey i = val (Key (PersistInt64 i))@
--- (<https://github.com/meteficha/esqueleto/issues/9>).
-valkey :: Esqueleto query expr backend =>
-          Int64 -> expr (Value (Key entity))
-valkey = val . Key . PersistInt64
-
-
-----------------------------------------------------------------------
-
-
 -- | Synonym for 'Database.Persist.Store.delete' that does not
 -- clash with @esqueleto@'s 'delete'.
 deleteKey :: ( PersistStore (PersistEntityBackend val)
diff --git a/src/Database/Esqueleto/Internal/PersistentImport.hs b/src/Database/Esqueleto/Internal/PersistentImport.hs
index 3132ff4..ad193e0 100644
--- a/src/Database/Esqueleto/Internal/PersistentImport.hs
+++ b/src/Database/Esqueleto/Internal/PersistentImport.hs
@@ -9,4 +9,5 @@ import Database.Persist.Sql hiding
   , Update(..), delete, deleteWhereCount, updateWhereCount, selectList
   , selectKeysList, deleteCascadeWhere, (=.), (+=.), (-=.), (*=.), (/=.)
   , (==.), (!=.), (<.), (>.), (<=.), (>=.), (<-.), (/<-.), (||.)
-  , listToJSON, mapToJSON, getPersistMap, limitOffsetOrder, selectSource )
+  , listToJSON, mapToJSON, getPersistMap, limitOffsetOrder, selectSource
+  , update )
diff --git a/src/Database/Esqueleto/Internal/Sql.hs b/src/Database/Esqueleto/Internal/Sql.hs
index ad695f6..996e628 100644
--- a/src/Database/Esqueleto/Internal/Sql.hs
+++ b/src/Database/Esqueleto/Internal/Sql.hs
@@ -113,7 +113,7 @@ instance Monoid SideData where
 
 -- | A part of a @FROM@ clause.
 data FromClause =
-    FromStart Ident (EntityDef SqlType)
+    FromStart Ident EntityDef
   | FromJoin FromClause JoinKind FromClause (Maybe (SqlExpr (Value Bool)))
   | OnClause (SqlExpr (Value Bool))