mysql 0.1.5 → 0.1.6

raw patch · 5 files changed

+21/−1 lines, 5 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

- Database.MySQL.Base: instance GHC.Exception.Exception Database.MySQL.Base.MySQLError

- Database.MySQL.Base.Types: instance Data.Semigroup.Semigroup Database.MySQL.Base.Types.FieldFlags

+ Database.MySQL.Base: instance GHC.Exception.Type.Exception Database.MySQL.Base.MySQLError

+ Database.MySQL.Base.Types: instance GHC.Base.Semigroup Database.MySQL.Base.Types.FieldFlags

Files

ChangeLog.md +4/−0
Database/MySQL/Base/C.hsc +6/−0
Database/MySQL/Base/Types.hsc +6/−0
include/mysql_signals.h +4/−0
mysql.cabal +1/−1

ChangeLog.md view

@@ -1,3 +1,7 @@+## 0.1.6++* Fix build for mysql 8+ ## 0.1.5  * Add Semigroup instance for FieldFlags

Database/MySQL/Base/C.hsc view

@@ -117,6 +117,8 @@         withIntegral secs $ go (#const MYSQL_OPT_READ_TIMEOUT)       WriteTimeout secs ->         withIntegral secs $ go (#const MYSQL_OPT_WRITE_TIMEOUT)+#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000+#else       UseRemoteConnection ->         go (#const MYSQL_OPT_USE_REMOTE_CONNECTION) nullPtr       UseEmbeddedConnection ->@@ -127,12 +129,16 @@         useAsCString ip $ go (#const MYSQL_SET_CLIENT_IP)       SecureAuth b ->         withBool b $ go (#const MYSQL_SECURE_AUTH)+#endif       ReportDataTruncation b ->         withBool b $ go (#const MYSQL_REPORT_DATA_TRUNCATION)       Reconnect b ->         withBool b $ go (#const MYSQL_OPT_RECONNECT)+#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000+#else       SSLVerifyServerCert b ->         withBool b $ go (#const MYSQL_OPT_SSL_VERIFY_SERVER_CERT)+#endif       -- Other options are accepted by mysql_real_connect, so ignore them.       _ -> return 0   where

Database/MySQL/Base/Types.hsc view

@@ -259,14 +259,20 @@             | SharedMemoryBaseName ByteString             | ReadTimeout Seconds             | WriteTimeout Seconds+#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000+#else             | UseRemoteConnection             | UseEmbeddedConnection             | GuessConnection             | ClientIP ByteString+#endif             | SecureAuth Bool             | ReportDataTruncation Bool             | Reconnect Bool+#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000+#else             | SSLVerifyServerCert Bool+#endif             -- Flags accepted by mysql_real_connect.             | FoundRows             | IgnoreSIGPIPE

include/mysql_signals.h view

@@ -8,6 +8,10 @@  #include "mysql.h" +#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000+typedef char my_bool;+#endif+ MYSQL *STDCALL _hs_mysql_real_connect(MYSQL *mysql, const char *host, 				      const char *user, 				      const char *passwd,

mysql.cabal view

@@ -1,5 +1,5 @@ name:           mysql-version:        0.1.5+version:        0.1.6 homepage:       https://github.com/paul-rouse/mysql bug-reports:    https://github.com/paul-rouse/mysql/issues synopsis:       A low-level MySQL client library.