persistent 1.0.0 → 1.0.1

raw patch · 2 files changed

+25/−2 lines, 2 filesnew-uploader

Files

• Database/Persist/GenericSql.hs +24/−1
• persistent.cabal +1/−1

@@ -24,6 +24,7 @@     , rawSql     , Entity(..)     , Single(..)+    , RawSql      -- * Migrations     , Migration@@ -58,6 +59,7 @@ import qualified Data.Text as T import Web.PathPieces (PathPiece (..)) import qualified Data.Text.Read+import Data.Maybe (fromMaybe) import Data.Monoid (Monoid, mappend) import Database.Persist.EntityDef import qualified Data.Conduit as C@@ -535,7 +537,7 @@     rawSqlProcessRow _     = Left "RawSql (Single a): wrong number of columns."  instance PersistEntity a => RawSql (Entity a) where-    rawSqlCols escape = ((+1).length.entityFields &&& process) . entityDef . entityVal+    rawSqlCols escape = ((+1) . length . entityFields &&& process) . entityDef . entityVal         where           process ed = (:[]) $                        T.intercalate ", " $@@ -552,6 +554,27 @@     rawSqlProcessRow (idCol:ent) = Entity <$> fromPersistValue idCol                                           <*> fromPersistValues ent     rawSqlProcessRow _ = Left "RawSql (Entity a): wrong number of columns."++-- | Since 1.0.1.+instance RawSql a => RawSql (Maybe a) where+    rawSqlCols e = rawSqlCols e . extractMaybe+    rawSqlColCountReason = rawSqlColCountReason . extractMaybe+    rawSqlProcessRow cols+      | all isNull cols = return Nothing+      | otherwise       =+        case rawSqlProcessRow cols of+          Right v  -> Right (Just v)+          Left msg -> Left $ "RawSql (Maybe a): not all columns were Null " +++                             "but the inner parser has failed.  Its message " +++                             "was \"" ++ msg ++ "\".  Did you apply Maybe " +++                             "to a tuple, perhaps?  The main use case for " +++                             "Maybe is to allow OUTER JOINs to be written, " +++                             "in which case 'Maybe (Entity v)' is used."+      where isNull PersistNull = True+            isNull _           = False++extractMaybe :: Maybe a -> a+extractMaybe = fromMaybe (error "Database.Persist.GenericSql.extractMaybe")  instance (RawSql a, RawSql b) => RawSql (a, b) where     rawSqlCols e x = rawSqlCols e (fst x) # rawSqlCols e (snd x)

@@ -1,5 +1,5 @@ name:            persistent-version:         1.0.0+version:         1.0.1 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>