persistent-postgresql 0.5.0 → 0.6.0

raw patch · 2 files changed

+14/−14 lines, 2 filesdep ~HDBCdep ~HDBC-postgresqldep ~persistent

Dependency ranges changed: HDBC, HDBC-postgresql, persistent

Files

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

@@ -7,9 +7,9 @@     , module Database.Persist.GenericSql     ) where -import Database.Persist+import Database.Persist hiding (Update) import Database.Persist.Base hiding (Add, Update)-import Database.Persist.GenericSql+import Database.Persist.GenericSql hiding (Key(..)) import Database.Persist.GenericSql.Internal  import qualified Database.HDBC as H@@ -52,8 +52,8 @@         , close = H.disconnect conn         , migrateSql = migrate'         , begin = const $ return ()-        , commit = const $ H.commit conn-        , rollback = const $ H.rollback conn+        , commitC = const $ H.commit conn+        , rollbackC = const $ H.rollback conn         , escapeName = escape         , noLimit = "LIMIT ALL"         }@@ -105,7 +105,7 @@ pToSql PersistNull = H.SqlNull pToSql (PersistList _) = error "Refusing to serialize a PersistList to a PostgreSQL value" pToSql (PersistMap _) = error "Refusing to serialize a PersistMap to a PostgreSQL value"-pToSql (PersistForeignKey _) = error "Refusing to serialize a PersistForeignKey to a PostgreSQL value"+pToSql (PersistObjectId _) = error "Refusing to serialize a PersistObjectId to a PostgreSQL value"  pFromSql :: H.SqlValue -> PersistValue pFromSql (H.SqlString s) = PersistText $ pack s@@ -170,7 +170,7 @@  -- | Returns all of the columns in the given table currently in the database. getColumns :: (Text -> IO Statement)-           -> RawName -> IO [Either Text (Either Column UniqueDef)]+           -> RawName -> IO [Either Text (Either Column UniqueDef')] getColumns getter name = do     stmt <- getter "SELECT column_name,is_nullable,udt_name,column_default FROM information_schema.columns WHERE table_name=? AND column_name <> 'id'"     cs <- withStmt stmt [PersistText $ pack $ unRawName name] helper@@ -202,8 +202,8 @@                 cols <- helper pop                 return $ col' : cols -getAlters :: ([Column], [UniqueDef])-          -> ([Column], [UniqueDef])+getAlters :: ([Column], [UniqueDef'])+          -> ([Column], [UniqueDef'])           -> ([AlterColumn'], [AlterTable]) getAlters (c1, u1) (c2, u2) =     (getAltersC c1 c2, getAltersU u1 u2)

@@ -1,5 +1,5 @@ name:            persistent-postgresql-version:         0.5.0+version:         0.6.0 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -10,14 +10,14 @@ stability:       Stable cabal-version:   >= 1.6 build-type:      Simple-homepage:        http://docs.yesodweb.com/persistent/+homepage:        http://www.yesodweb.com/book/persistent  library     build-depends:   base                  >= 4        && < 5-                   , HDBC                  >= 2.2.6    && < 2.3+                   , HDBC                  >= 2.2.6    && < 2.4                    , transformers          >= 0.2.1    && < 0.3-                   , HDBC-postgresql       >= 2.2.3.1  && < 2.3-                   , persistent            >= 0.5      && < 0.6+                   , HDBC-postgresql       >= 2.2.3.1  && < 2.4+                   , persistent            >= 0.6      && < 0.7                    , containers            >= 0.2      && < 0.5                    , bytestring            >= 0.9      && < 0.10                    , text                  >= 0.7      && < 0.12@@ -28,4 +28,4 @@  source-repository head   type:     git-  location: git://github.com/snoyberg/persistent.git+  location: git://github.com/yesodweb/persistent.git