haskelldb-hdbc-odbc 0.10 → 0.12

raw patch · 3 files changed

+28/−17 lines, 3 filesdep −haskell98dep ~HDBCdep ~HDBC-odbcdep ~haskelldbnew-component:exe:DBDirect-hdbc-odbcnew-uploader

Dependencies removed: haskell98

Dependency ranges changed: HDBC, HDBC-odbc, haskelldb, haskelldb-hdbc

Files

• DBDirect.hs +5/−0
• Database/HaskellDB/HDBC/ODBC.hs +7/−2
• haskelldb-hdbc-odbc.cabal +16/−15

@@ -0,0 +1,5 @@+import Database.HaskellDB.HDBC.ODBC+import Database.HaskellDB.DBDirect++main :: IO ()+main = dbdirect driver

@@ -23,8 +23,13 @@  odbcConnect :: MonadIO m => SqlGenerator -> [(String,String)] -> (Database -> m a) -> m a odbcConnect gen opts = hdbcConnect gen (connectODBC conninfo)-    where conninfo = unwords [ k ++ "=" ++ v | (k,v) <- opts]+    -- strangely enough, mysql+unixodbc want a semicolon terminating connstring+    where conninfo = foldr (\(k,v) z -> k ++ "=" ++ v ++ ";" ++ z) [] opts +options :: [(String, String)]+options =+    []+ odbcConnectOpts :: MonadIO m => [(String,String)] -> (Database -> m a) -> m a odbcConnectOpts opts f =      do gen <- getGenerator opts@@ -33,4 +38,4 @@  -- | This driver passes its options through to HDBC. driver :: DriverInterface-driver = defaultdriver { connect = odbcConnectOpts }+driver = defaultdriver { connect = odbcConnectOpts, requiredOptions = options }

@@ -1,22 +1,23 @@ Name: haskelldb-hdbc-odbc-Version: 0.10+Version: 0.12+Cabal-version: >= 1.2+Build-type: Simple Copyright: The authors Maintainer: haskelldb-users@lists.sourceforge.net Author: Daan Leijen, Conny Andersson, Martin Andersson, Mary Bergman, Victor Blomqvist, Bjorn Bringert, Anders Hockersten, Torbjorn Martin, Jeremy Shaw License: BSD3-build-depends: -  haskell98, -  base, -  mtl, -  haskelldb==0.10, -  haskelldb-hdbc==0.10, -  HDBC==1.0.1, -  HDBC-odbc==1.0.1.0-Extensions: ExistentialQuantification,-            OverlappingInstances,-            UndecidableInstances,-            MultiParamTypeClasses Synopsis: HaskellDB support for the HDBC ODBC driver.-Exposed-Modules:++Library+  Build-depends: +    base, +    mtl, +    haskelldb>=0.12,+    haskelldb-hdbc>=0.12,+    HDBC>=2.0.0 && < 2.2.0,+    HDBC-odbc>=2.0.0 && < 2.2.0+  Exposed-Modules:         Database.HaskellDB.HDBC.ODBC-ghc-options: -O2++Executable DBDirect-hdbc-odbc+  Main-is: DBDirect.hs