persistent 0.3.1 → 0.3.1.1

raw patch · 3 files changed

+6/−3 lines, 3 files

Files

• Database/Persist/GenericSql/Internal.hs +2/−1
• Database/Persist/TH.hs +3/−1
• persistent.cabal +1/−1

@@ -25,6 +25,7 @@ import Data.Maybe (fromJust) import Control.Arrow import Control.Monad.Invert (MonadInvertIO, bracket)+import Database.Persist.TH (nullable)  type RowPopper m = m (Maybe [PersistValue]) @@ -74,7 +75,7 @@     t = entityDef val     tn = rawTableName t     go (name, t', as) p =-        Column name ("null" `elem` as) (sqlType p) (def as) (ref name t' as)+        Column name (nullable as) (sqlType p) (def as) (ref name t' as)     def [] = Nothing     def (('d':'e':'f':'a':'u':'l':'t':'=':d):_) = Just d     def (_:rest) = def rest

@@ -8,6 +8,7 @@     , mkSave     , mkDeleteCascade     , derivePersistField+    , nullable     ) where  import Database.Persist.Base@@ -495,8 +496,9 @@  nullable :: [String] -> Bool nullable s+    | "Maybe" `elem` s = True     | "null" `elem` s = deprecate "Please replace null with Maybe" True-    | otherwise = "Maybe" `elem` s+    | otherwise = False  deprecate :: String -> a -> a deprecate s x = unsafePerformIO $ do

@@ -1,5 +1,5 @@ name:            persistent-version:         0.3.1+version:         0.3.1.1 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>