hsql-mysql 1.8.1 → 1.8.2

raw patch · 3 files changed

+43/−28 lines, 3 filesdep ~hsqlPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: hsql

API changes (from Hackage documentation)

Files

• DB/HSQL/MySQL/Functions.hsc +4/−4
• Database/HSQL/MySQL.hs +2/−2
• hsql-mysql.cabal +37/−22

@@ -1,12 +1,12 @@ module DB.HSQL.MySQL.Functions where  import Foreign((.&.),peekByteOff,nullPtr,peekElemOff)-import Foreign.C(CInt,CString,peekCString)+import Foreign.C(CInt(..),CString,peekCString) import Control.Concurrent.MVar(MVar,newMVar,modifyMVar,readMVar) import Control.Exception (throw) import Control.Monad(when) -import Database.HSQL.Types(FieldDef,Statement(..),Connection(..),SqlError(..))+import Database.HSQL.Types(ColDef,Statement(..),Connection(..),SqlError(..)) import DB.HSQL.MySQL.Type(MYSQL,MYSQL_RES,MYSQL_FIELD,MYSQL_ROW,MYSQL_LENGTHS                          ,mkSqlType) @@ -88,8 +88,8 @@ -- | getColValue :: MVar (MYSQL_ROW, MYSQL_LENGTHS)              -> Int -            -> FieldDef -            -> (FieldDef -> CString -> Int -> IO a) +            -> ColDef +            -> (ColDef -> CString -> Int -> IO a)              -> IO a getColValue currRow colNumber fieldDef f = do   (row, lengths) <- readMVar currRow

@@ -11,7 +11,7 @@ module Database.HSQL.MySQL(connect,module Database.HSQL) where  import Database.HSQL-import Database.HSQL.Types(Connection(..),Statement(stmtGetCol),FieldDef+import Database.HSQL.Types(Connection(..),Statement(stmtGetCol),ColDef                           ,SqlType(SqlVarChar),fromSqlCStringLen) import Foreign(nullPtr,free) import Foreign.C(newCString,withCString)@@ -80,7 +80,7 @@   -- |-mysqlDescribe :: Connection -> MYSQL -> String -> IO [FieldDef]+mysqlDescribe :: Connection -> MYSQL -> String -> IO [ColDef] mysqlDescribe conn pMYSQL table = do   pRes <- withCString table (\table -> mysql_list_fields pMYSQL table nullPtr)   stmt <- withStatement conn pMYSQL pRes

@@ -1,22 +1,37 @@-name: hsql-mysql -version: 1.8.1 -license: BSD3 -author: Krasimir Angelov <kr.a...@gmail.com> -category: Database -description: MySQL driver for HSQL. -synopsis: MySQL driver for HSQL.-ghc-options: -O2 -build-depends: base >=4 && < 5, hsql >= 1.8, Cabal -extensions: ForeignFunctionInterface, CPP -include-dirs: Database/HSQL, /usr/include/mysql -build-type: Simple -extra-source-files: Database/HSQL/HsMySQL.h -extra-libraries: mysqlclient -extra-lib-dirs: /usr/lib,/usr/lib/mysql -exposed-modules: -  Database.HSQL.MySQL-  DB.HSQL.MySQL.Type-  DB.HSQL.MySQL.Functions-maintainer: Chris Done <chrisdone@gmail.com>-license-file: LICENSE-cabal-version: >= 1.6+Name: hsql-mysql +Version: 1.8.2+Cabal-Version: >=1.10+Build-Type: Simple+License: BSD3 +License-File: LICENSE+Author: Krasimir Angelov <kr.a...@gmail.com> +Maintainer: Chris Done <chrisdone@gmail.com>+Category: Database +Synopsis: MySQL driver for HSQL.+Description: MySQL driver for HSQL.++Library {+  Build-Depends: base >=4 && < 5, hsql >= 1.8.2, Cabal +  Exposed-Modules: Database.HSQL.MySQL+                   DB.HSQL.MySQL.Type+                   DB.HSQL.MySQL.Functions+  Exposed: True+  Other-Modules:+  Hs-Source-Dirs: .+  Default-Extensions:+  Other-Extensions: CPP, DeriveDataTypeable, FlexibleInstances, +                    ForeignFunctionInterface, RankNTypes, ScopedTypeVariables+  Buildable: True+  GHC-Options: -O2+  Includes: Database/HSQL/HsMySQL.h +  Install-Includes:+  Include-Dirs: Database/HSQL, /usr/include/mysql +  C-Sources:+  Extra-Libraries: mysqlclient+  Extra-Lib-Dirs: /usr/lib,/usr/lib/mysql +  CC-Options:+  LD-Options:+  PkgConfig-Depends:+  Frameworks:+  Default-Language: Haskell2010+}