takusen-oracle 0.9.4.1 → 0.10.0.0
raw patch · 11 files changed
+79/−13 lines, 11 filesbuild-type:CustomPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
- Database.Enumerator: instance Control.Monad.Fix.MonadFix (Database.Enumerator.DBM mark sess)
- Database.Enumerator: instance GHC.Base.Applicative (Database.Enumerator.DBM mark sess)
- Database.Enumerator: instance GHC.Base.Functor (Database.Enumerator.DBM mark sess)
- Database.Enumerator: instance GHC.Base.Monad (Database.Enumerator.DBM mark sess)
- Database.Oracle.Enumerator: instance (GHC.Show.Show a, GHC.Read.Read a) => Database.InternalEnumerator.DBType (GHC.Base.Maybe a) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.Command GHC.Base.String Database.Oracle.Enumerator.Session
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Base.Maybe Data.Time.Clock.UTC.UTCTime)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Base.Maybe Database.Oracle.OCIFunctions.StmtHandle)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Base.Maybe GHC.Base.String)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Base.Maybe GHC.Types.Double)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Base.Maybe GHC.Types.Int)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Base.Maybe a)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj => Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out a) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Base.Maybe Data.Time.Clock.UTC.UTCTime) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Base.Maybe GHC.Base.String) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Base.Maybe GHC.Types.Double) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Base.Maybe GHC.Types.Int) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Base.Maybe System.Time.CalendarTime) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Base.Maybe a) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj => Database.InternalEnumerator.DBBind a Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Base.Maybe Data.Time.Clock.UTC.UTCTime) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Base.Maybe GHC.Base.String) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Base.Maybe GHC.Types.Double) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Base.Maybe GHC.Types.Int) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Base.Maybe System.Time.CalendarTime) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Base.Maybe a) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer => Database.InternalEnumerator.DBType a Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
- Database.Oracle.Enumerator: instance Database.InternalEnumerator.Statement GHC.Base.String Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.Query
- Database.Oracle.Enumerator: instance Database.Oracle.Enumerator.OracleBind Data.Time.Clock.UTC.UTCTime
- Database.Oracle.Enumerator: instance Database.Oracle.Enumerator.OracleBind GHC.Base.String
- Database.Oracle.Enumerator: instance Database.Oracle.Enumerator.OracleBind a => Database.Oracle.Enumerator.OracleBind (GHC.Base.Maybe a)
- Database.Oracle.Enumerator: instance GHC.Show.Show a => Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Base.Maybe a)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.Enumerator: instance GHC.Show.Show a => Database.InternalEnumerator.DBBind (GHC.Base.Maybe a) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
- Database.Oracle.OCIFunctions: instance GHC.Exception.Exception Database.Oracle.OCIFunctions.OCIException
- Database.Oracle.OCIFunctions: instance GHC.Show.Show Database.Oracle.OCIFunctions.OCIException
- Database.Util: instance Database.Util.MyShow GHC.Base.String
- Database.Util: instance GHC.Show.Show a => Database.Util.MyShow a
+ Database.Enumerator: instance GHC.Internal.Base.Applicative (Database.Enumerator.DBM mark sess)
+ Database.Enumerator: instance GHC.Internal.Base.Functor (Database.Enumerator.DBM mark sess)
+ Database.Enumerator: instance GHC.Internal.Base.Monad (Database.Enumerator.DBM mark sess)
+ Database.Enumerator: instance GHC.Internal.Control.Monad.Fix.MonadFix (Database.Enumerator.DBM mark sess)
+ Database.Oracle.Enumerator: instance (GHC.Internal.Show.Show a, GHC.Internal.Read.Read a) => Database.InternalEnumerator.DBType (GHC.Internal.Maybe.Maybe a) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.Command GHC.Internal.Base.String Database.Oracle.Enumerator.Session
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Internal.Maybe.Maybe Data.Time.Clock.Internal.UTCTime.UTCTime)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Internal.Maybe.Maybe Database.Oracle.OCIFunctions.StmtHandle)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Internal.Maybe.Maybe GHC.Internal.Base.String)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Internal.Maybe.Maybe GHC.Types.Double)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Internal.Maybe.Maybe GHC.Types.Int)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Internal.Maybe.Maybe a)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj => Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out a) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Internal.Maybe.Maybe Data.Time.Clock.Internal.UTCTime.UTCTime) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Internal.Maybe.Maybe GHC.Internal.Base.String) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Internal.Maybe.Maybe GHC.Types.Double) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Internal.Maybe.Maybe GHC.Types.Int) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Internal.Maybe.Maybe System.Time.CalendarTime) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBBind (GHC.Internal.Maybe.Maybe a) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj => Database.InternalEnumerator.DBBind a Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Internal.Maybe.Maybe Data.Time.Clock.Internal.UTCTime.UTCTime) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Internal.Maybe.Maybe GHC.Internal.Base.String) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Internal.Maybe.Maybe GHC.Types.Double) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Internal.Maybe.Maybe GHC.Types.Int) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Internal.Maybe.Maybe System.Time.CalendarTime) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.DBType (GHC.Internal.Maybe.Maybe a) Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer => Database.InternalEnumerator.DBType a Database.Oracle.Enumerator.Query Database.Oracle.Enumerator.ColumnBuffer
+ Database.Oracle.Enumerator: instance Database.InternalEnumerator.Statement GHC.Internal.Base.String Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.Query
+ Database.Oracle.Enumerator: instance Database.Oracle.Enumerator.OracleBind Data.Time.Clock.Internal.UTCTime.UTCTime
+ Database.Oracle.Enumerator: instance Database.Oracle.Enumerator.OracleBind GHC.Internal.Base.String
+ Database.Oracle.Enumerator: instance Database.Oracle.Enumerator.OracleBind a => Database.Oracle.Enumerator.OracleBind (GHC.Internal.Maybe.Maybe a)
+ Database.Oracle.Enumerator: instance GHC.Internal.Show.Show a => Database.InternalEnumerator.DBBind (Database.Oracle.Enumerator.Out (GHC.Internal.Maybe.Maybe a)) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.Enumerator: instance GHC.Internal.Show.Show a => Database.InternalEnumerator.DBBind (GHC.Internal.Maybe.Maybe a) Database.Oracle.Enumerator.Session Database.Oracle.Enumerator.PreparedStmtObj Database.Oracle.Enumerator.BindObj
+ Database.Oracle.OCIFunctions: instance GHC.Internal.Exception.Type.Exception Database.Oracle.OCIFunctions.OCIException
+ Database.Oracle.OCIFunctions: instance GHC.Internal.Show.Show Database.Oracle.OCIFunctions.OCIException
+ Database.Util: instance Database.Util.MyShow GHC.Internal.Base.String
+ Database.Util: instance GHC.Internal.Show.Show a => Database.Util.MyShow a
- Control.Exception.MonadIO: class MonadIO m => CaughtMonadIO m
+ Control.Exception.MonadIO: class MonadIO m => CaughtMonadIO (m :: Type -> Type)
- Control.Exception.MonadIO: gbracket :: (CaughtMonadIO m) => m t -> (t -> m a) -> (t -> m b) -> m b
+ Control.Exception.MonadIO: gbracket :: CaughtMonadIO m => m t -> (t -> m a) -> (t -> m b) -> m b
- Control.Exception.MonadIO: gfinally :: (CaughtMonadIO m) => m t -> m a -> m t
+ Control.Exception.MonadIO: gfinally :: CaughtMonadIO m => m t -> m a -> m t
- Database.Enumerator: NextResultSet :: (PreparedStmt mark stmt) -> NextResultSet mark stmt
+ Database.Enumerator: NextResultSet :: PreparedStmt mark stmt -> NextResultSet mark stmt
- Database.Enumerator: catchDBError :: (CaughtMonadIO m) => Int -> m a -> (DBException -> m a) -> m a
+ Database.Enumerator: catchDBError :: CaughtMonadIO m => Int -> m a -> (DBException -> m a) -> m a
- Database.Enumerator: ignoreDBError :: (CaughtMonadIO m) => Int -> m a -> m a
+ Database.Enumerator: ignoreDBError :: CaughtMonadIO m => Int -> m a -> m a
- Database.Enumerator: result :: (Monad m) => IterAct m a
+ Database.Enumerator: result :: Monad m => IterAct m a
- Database.Enumerator: result' :: (Monad m) => IterAct m a
+ Database.Enumerator: result' :: Monad m => IterAct m a
- Database.Enumerator: type IterAct m seedType = seedType -> m (IterResult seedType)
+ Database.Enumerator: type IterAct (m :: Type -> Type) seedType = seedType -> m IterResult seedType
- Database.Enumerator: withContinuedSession :: (Typeable a, ISession sess) => ConnectA sess -> (forall mark. DBM mark sess a) -> IO (a, ConnectA sess)
+ Database.Enumerator: withContinuedSession :: (Typeable a, ISession sess) => ConnectA sess -> (forall mark. () => DBM mark sess a) -> IO (a, ConnectA sess)
- Database.Enumerator: withSession :: (Typeable a, ISession sess) => ConnectA sess -> (forall mark. DBM mark sess a) -> IO a
+ Database.Enumerator: withSession :: (Typeable a, ISession sess) => ConnectA sess -> (forall mark. () => DBM mark sess a) -> IO a
- Database.Enumerator: withTransaction :: (ISession s) => IsolationLevel -> DBM mark s a -> DBM mark s a
+ Database.Enumerator: withTransaction :: ISession s => IsolationLevel -> DBM mark s a -> DBM mark s a
- Database.Oracle.OCIFunctions: bufferPeekValue :: (Storable a) => BufferFPtr -> IO a
+ Database.Oracle.OCIFunctions: bufferPeekValue :: Storable a => BufferFPtr -> IO a
- Database.Oracle.OCIFunctions: bufferToA :: (Storable a) => ForeignPtr CShort -> BufferFPtr -> IO (Maybe a)
+ Database.Oracle.OCIFunctions: bufferToA :: Storable a => ForeignPtr CShort -> BufferFPtr -> IO (Maybe a)
- Database.Oracle.OCIFunctions: getHandleAttr :: (Storable a) => ErrorHandle -> OCIHandle -> CInt -> CInt -> IO a
+ Database.Oracle.OCIFunctions: getHandleAttr :: Storable a => ErrorHandle -> OCIHandle -> CInt -> CInt -> IO a
- Database.Oracle.OCIFunctions: type OCICallbackOutBind = ContextPtr -> BindHandle -> CInt -> CInt -> Ptr BufferPtr -> Ptr CInt -> Ptr Word8 -> Ptr CShort -> Ptr (Ptr CShort) -> IO CInt
+ Database.Oracle.OCIFunctions: type OCICallbackOutBind = ContextPtr -> BindHandle -> CInt -> CInt -> Ptr BufferPtr -> Ptr CInt -> Ptr Word8 -> Ptr CShort -> Ptr Ptr CShort -> IO CInt
- Database.Util: zeroPad :: (Show a, Ord a, Num a) => Int -> a -> [Char]
+ Database.Util: zeroPad :: (Ord a, Num a, Show a) => Int -> a -> [Char]
Files
- CHANGELOG.md +53/−0
- Control/Exception/MonadIO.hs +1/−0
- Database/Enumerator.hs +1/−1
- Database/Oracle/Enumerator.hs +1/−1
- Database/Oracle/OCIFunctions.hs +1/−1
- Database/Oracle/Test/Enumerator.hs +2/−0
- Database/Test/Enumerator.hs +1/−1
- Database/Test/Performance.hs +1/−1
- Database/Util.hs +1/−1
- Test/MiniUnitTest.hs +3/−1
- takusen-oracle.cabal +14/−6
+ CHANGELOG.md view
@@ -0,0 +1,53 @@+# Changelog++Notable changes to takusen-oracle. Entries for versions before 0.10.0.0 were+reconstructed from git history and Hackage release metadata.++## 0.10.0.0 (unreleased)++### Compatibility++- Buildable with GHC 9.10.3 and cabal-install 3.16 (previous release targeted+ GHC 7-8):+ - added missing imports (`liftM` in `Control.Exception.MonadIO` and+ `Database.Enumerator`; `when`, `void` in `Database.Enumerator`)+ - resolved the `Sunday` constructor ambiguity between `System.Time`+ (old-time) and `time >= 1.12` (`Database.Util`,+ `Database.Oracle.OCIFunctions`)+ - added `FlexibleContexts` and `NondecreasingIndentation` pragmas required+ by modern GHC in the library and test modules+ - `Test.MiniUnitTest` imports `catch` from `Control.Exception` explicitly+ (it used to come from `Prelude` in pre-base-4 GHC) with an explicit+ `SomeException` annotation+- Removed the call to `OCITerminate()` when disconnecting from the database+ (#12; merged in 2019 but never included in a Hackage release)++### Build system++- `custom-setup` stanza with explicit `setup-depends` added to the cabal file+ and `cabal-version` raised to `1.24`; without it, modern cabal-install+ cannot resolve the custom `Setup.hs` dependencies+- Oracle Instant Client is expected under `~/instantclient` (see+ `Extra-Lib-Dirs` in the cabal file); create a symlink if your client+ lives elsewhere+- Haskell Language Server 2.14 works out of the box (cabal cradle)+- The test executables are enabled via `flags: +buildtests` (unchanged), e.g.+ through a local `cabal.project`++## 0.9.4.1 (2016-11-08)++- GHC 8 support+- Fix for statement reuse detection (#8)+- Simplified build configuration: the build no longer guesses the Oracle+ home; link against the Instant Client via `Extra-Lib-Dirs`++## 0.9.3 (2015)++- `OCI_THREADED` mode when creating the environment handle (#4)+- Fix for a resource leak in command binding with prepared statements+- Sources converted from literate Haskell (`.lhs`) to `.hs`++## 0.9.0 - 0.9.2++- Initial Oracle-only split from the original Takusen library; support for+ Oracle 11gR2/12c instant client and GHC 7.4+. See git history for details.
Control/Exception/MonadIO.hs view
@@ -6,6 +6,7 @@ ) where import Control.Monad.Trans +import Control.Monad (liftM) import Control.Exception import Control.Monad.Reader
Database/Enumerator.hs view
@@ -117,7 +117,7 @@ import Data.IORef -- import Data.Time import Data.Maybe (fromMaybe, isNothing) --- import Control.Monad (liftM) +import Control.Monad (liftM, when, void) -- import Control.Monad.Trans (liftIO) import Control.Applicative (Applicative) import Control.Exception
Database/Oracle/Enumerator.hs view
@@ -14,6 +14,7 @@ {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE ScopedTypeVariables #-} @@ -298,7 +299,6 @@ logoff err conn dispose err dispose env - OCI.terminate -- |Oracle only supports ReadCommitted and Serialisable.
Database/Oracle/OCIFunctions.hs view
@@ -37,7 +37,7 @@ import Control.Monad import Control.Exception import Data.Dynamic -import Data.Time +import Data.Time hiding (Sunday) import System.Time
Database/Oracle/Test/Enumerator.hs view
@@ -45,6 +45,8 @@ {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE NondecreasingIndentation #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE ScopedTypeVariables #-}
Database/Test/Enumerator.hs view
@@ -20,7 +20,7 @@ -} -{-# LANGUAGE OverlappingInstances, ScopedTypeVariables #-} +{-# LANGUAGE OverlappingInstances, ScopedTypeVariables, FlexibleContexts #-} module Database.Test.Enumerator where
Database/Test/Performance.hs view
@@ -9,7 +9,7 @@ Performance tests. Currently just tests large result sets. -} -{-# LANGUAGE OverlappingInstances #-} +{-# LANGUAGE OverlappingInstances, FlexibleContexts #-} module Database.Test.Performance where
Database/Util.hs view
@@ -22,7 +22,7 @@ import Data.Int import Data.List import Data.Char -import Data.Time +import Data.Time hiding (Sunday) import Data.Word (Word8) import Foreign.Ptr (Ptr, castPtr) import Foreign.Marshal.Array (peekArray)
Test/MiniUnitTest.hs view
@@ -1,10 +1,12 @@ {-# LANGUAGE NoMonomorphismRestriction #-} +{-# LANGUAGE ScopedTypeVariables #-} module Test.MiniUnitTest where import Test.MiniUnit import Data.IORef +import Control.Exception (catch, SomeException) import Control.Exception.MonadIO import Control.Monad.Trans (liftIO) @@ -25,7 +27,7 @@ test__assertFailure = catch (assertFailure "test__assertFailure" >> error "test__assertFailure: failed: exception not thrown.") - (\e -> print_ "test__assertFailure OK") + (\(e :: SomeException) -> print_ "test__assertFailure OK") reportResult name result = do case result of
takusen-oracle.cabal view
@@ -1,5 +1,5 @@ Name: takusen-oracle -Version: 0.9.4.1 +Version: 0.10.0.0 License: BSD3 License-file: LICENSE Author: Alistair Bayley, Oleg Kiselyov, Pavel Ryzhov @@ -9,8 +9,9 @@ Homepage: https://github.com/paulrzcz/takusen-oracle.git Package-url: https://github.com/paulrzcz/takusen-oracle.git Category: Database -Build-type: Simple -Cabal-Version: >= 1.16 +Build-type: Custom +cabal-version: 1.24 + Synopsis: Database library with left-fold interface for Oracle. Description: Takusen-Oracle is a Oracle access library. Like HSQL and HDBC, we support @@ -24,11 +25,18 @@ Database/Oracle/OCIFunctions_stub.c Database/Oracle/OCIFunctions_stub.h +extra-source-files: + CHANGELOG.md + source-repository this type: git location: https://github.com/paulrzcz/takusen-oracle.git - tag: 0.9.4.1 + tag: 0.10.0.0 +custom-setup + setup-depends: base >= 4.5 && < 5 + , Cabal >= 1.24 && < 4 + Flag buildtests Description: Build test executables Default: False @@ -64,7 +72,7 @@ , old-time , QuickCheck ==2.* , random - Extensions: CPP DeriveDataTypeable ScopedTypeVariables + default-extensions: CPP DeriveDataTypeable ScopedTypeVariables Executable miniunit_tests Default-Language: Haskell2010 @@ -97,7 +105,7 @@ Extra-Libraries: clntsh Extra-Lib-Dirs: /Users/paul/instantclient - Build-Depends: base >= 4.5 && < 5 + Build-Depends: base >= 4.5 && < 5 , mtl , time , old-time