HDBC-mysql 0.6 → 0.6.1

raw patch · 4 files changed

+14/−16 lines, 4 filessetup-changedPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Database/HDBC/MySQL.hs +1/−1
• Database/HDBC/MySQL/Connection.hsc +8/−8
• HDBC-mysql.cabal +2/−2
• Setup.lhs +3/−5

@@ -37,6 +37,6 @@  -} module Database.HDBC.MySQL-    (connectMySQL, MySQLConnectInfo(..), defaultMySQLConnectInfo)+    (connectMySQL, MySQLConnectInfo(..), defaultMySQLConnectInfo, Connection) where import Database.HDBC.MySQL.Connection

@@ -2,7 +2,7 @@ {-# OPTIONS -fglasgow-exts #-}  module Database.HDBC.MySQL.Connection-    (connectMySQL, MySQLConnectInfo(..), defaultMySQLConnectInfo)+    (connectMySQL, MySQLConnectInfo(..), defaultMySQLConnectInfo, Connection) where  import Control.Exception@@ -23,22 +23,22 @@  {- | Connection information to use with connectMySQL. -     You must either supply a host and port, or the name of a Unix-     socket.+     You must either supply a host and port, or the full path to a+     Unix socket.  -} data MySQLConnectInfo = MySQLConnectInfo-    { -- | e.g., @\"db1.example.com\"@+    { -- | The server's hostname; e.g., @\"db1.example.com\"@       mysqlHost       :: String-      -- | e.g., @\"scott\"@+      -- | The MySQL username to use for login; e.g., @\"scott\"@     , mysqlUser       :: String-      -- | e.g., @\"tiger\"@+      -- | The MySQL password to use for login; e.g., @\"tiger\"@     , mysqlPassword   :: String       -- | the \"default\" database name; e.g., @\"emp\"@     , mysqlDatabase   :: String-      -- | e.g., @3306@+      -- | The port on which to connect to the server; e.g., @3306@     , mysqlPort       :: Int-      -- | e.g., @\"\/var\/lib\/mysql.sock\"@+      -- | The absolute path of the server's Unix socket; e.g., @\"\/var\/lib\/mysql.sock\"@     , mysqlUnixSocket :: String     } 

@@ -1,12 +1,12 @@ Name:             HDBC-mysql Category:         Database Synopsis:         MySQL driver for HDBC-Version:          0.6+Version:          0.6.1 Description:      This package provides a MySQL driver for HDBC. Stability:        Experimental Maintainer:       Chris Waterson <waterson@maubi.net> Author:           Chris Waterson-Copyright:        Copyright (c) 2009 Chris Waterson+Copyright:        Copyright (c) 2009-2010 Chris Waterson License:          LGPL License-file:     COPYING Homepage:         http://www.maubi.net/~waterson/hacks/hdbc-mysql.html

@@ -23,21 +23,19 @@     return lbi {       localPkgDescr = updatePackageDescription                         (Just bi, []) (localPkgDescr lbi)-    } +    } }  mysqlConfigProgram = (simpleProgram "mysql_config") {     programFindLocation = \verbosity -> do-      mysql_config  <- findProgramOnPath "mysql_config"  verbosity +      mysql_config  <- findProgramOnPath "mysql_config"  verbosity       mysql_config5 <- findProgramOnPath "mysql_config5" verbosity       return (mysql_config `mplus` mysql_config5)   }  mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo mysqlBuildInfo lbi = do-  (mysqlConfigProg, _) <- requireProgram verbosity-                          mysqlConfigProgram AnyVersion (withPrograms lbi)-  let mysqlConfig = rawSystemProgramStdout verbosity mysqlConfigProg+  let mysqlConfig = rawSystemProgramStdoutConf verbosity mysqlConfigProgram (withPrograms lbi)       ws = " \n\r\t"    includeDirs <- return . map (drop 2) . split ws =<< mysqlConfig ["--include"]