persistent-postgresql 1.0.3 → 1.1.0

raw patch · 2 files changed

+5/−10 lines, 2 filesdep ~persistent

Dependency ranges changed: persistent

Files

• Database/Persist/Postgresql.hs +3/−8
• persistent-postgresql.cabal +2/−2

@@ -16,7 +16,7 @@  import Database.Persist hiding (Entity (..)) import Database.Persist.Store-import Database.Persist.GenericSql hiding (Key(..))+import Database.Persist.GenericSql hiding (Key) import Database.Persist.GenericSql.Internal import Database.Persist.EntityDef @@ -32,7 +32,6 @@  import Control.Exception (throw) import Control.Monad.IO.Class (MonadIO (..))-import Control.Monad.Trans.Control (MonadBaseControl) import Data.List (intercalate) import Data.IORef import qualified Data.Map as Map@@ -178,9 +177,8 @@                   LibPQ.TuplesOk -> return ()                   _ -> do                     msg <- LibPQ.resStatus status-                    mmsg <- LibPQ.resultErrorMessage ret                     fail $ "Postgresql.withStmt': bad result status " ++-                           show status ++ " (" ++ (maybe (show msg) (show . (,) msg) mmsg) ++ ")"+                           show status ++ " (" ++ show msg ++ ")"                  -- Get number and type of columns                 cols <- LibPQ.nfields ret@@ -374,7 +372,7 @@     getAltersU :: [(DBName, [DBName])]                -> [(DBName, [DBName])]                -> [AlterTable]-    getAltersU [] old = map DropConstraint $ filter (not . isManual) $ map fst old+    getAltersU [] old = map (DropConstraint . fst) old     getAltersU ((name, cols):news) old =         case lookup name old of             Nothing -> AddUniqueConstraint name cols : getAltersU news old@@ -385,9 +383,6 @@                         else  DropConstraint name                             : AddUniqueConstraint name cols                             : getAltersU news old'--    -- Don't drop constraints which were manually added.-    isManual (DBName x) = "__manual_" `T.isPrefixOf` x  getColumn :: (Text -> IO Statement)           -> DBName -> [PersistValue]

@@ -1,5 +1,5 @@ name:            persistent-postgresql-version:         1.0.3+version:         1.1.0 license:         MIT license-file:    LICENSE author:          Felipe Lessa, Michael Snoyman <michael@snoyman.com>@@ -17,7 +17,7 @@                    , transformers          >= 0.2.1    && < 0.4                    , postgresql-simple     >= 0.2      && < 0.3                    , postgresql-libpq      >= 0.6.1    && < 0.9-                   , persistent            >= 1.0.2    && < 1.1+                   , persistent            >= 1.1      && < 1.2                    , containers            >= 0.2                    , bytestring            >= 0.9                    , text                  >= 0.7      && < 0.12