diff --git a/src/Database/SednaDB/Sedna.hs b/src/Database/SednaDB/Sedna.hs deleted file mode 100644 index fb4105c..0000000 --- a/src/Database/SednaDB/Sedna.hs +++ /dev/null @@ -1,47 +0,0 @@ -module Database.SednaDB.Sedna - ( sednaGetResultString - , sednaQueryFromString - , sednaQueryFromFile - ) where - --------------------------------------------------------------------------------- -import Control.Exception -import Control.Monad.Trans -import Data.ByteString as BS -import Data.ByteString.Char8 as C (pack,unpack,concat,append, empty) -import Data.Maybe -import Foreign -import Prelude hiding (replicate,concat) - -import Data.Iteratee as I hiding (mapM_, peek) -import Data.Iteratee.IO - -import Database.SednaDB.SednaBindings -import Database.SednaDB.SednaExceptions -import Database.SednaDB.SednaTypes -import Database.SednaDB.Internal.SednaResponseCodes - --------------------------------------------------------------------------------- -sednaGetQueryResult :: Transaction (IO QueryResult) -sednaGetQueryResult = do TransactionEnv conn _ _ <- getTransactionEnv - return $ sednaGetResultString conn - - --------------------------------------------------------------------------------- -sednaQuery :: Query -> Transaction () -sednaQuery query = do - TransactionEnv conn _ _ <- getTransactionEnv - response <- liftIO $ sednaExecute conn query - case response of - QueryFailed -> throw SednaQueryFailedException - QuerySucceeded -> return () - _ -> throw SednaFailedException - - --------------------------------------------------------------------------------- -sednaQueryFromFile :: FilePath -> Transaction () -sednaQueryFromFile pathToFile = sednaQuery pathToFile - -sednaQueryFromString :: Query -> Transaction () -sednaQueryFromString queryString = sednaQuery queryString - diff --git a/src/Database/SednaDB/SednaBindings.hs b/src/Database/SednaDB/SednaBindings.hs index 330d0b6..1c8cc05 100644 --- a/src/Database/SednaDB/SednaBindings.hs +++ b/src/Database/SednaDB/SednaBindings.hs @@ -20,10 +20,7 @@ module Database.SednaDB.SednaBindings , sednaShowTime , sednaTransactionStatus , sednaLoadFile - , sednaLoadData - - ) where -------------------------------------------------------------------------------- diff --git a/test/suite/Integration/SednaBindingTests.hs b/test/suite/Integration/SednaBindingTests.hs index dfaea4e..69d2a02 100644 --- a/test/suite/Integration/SednaBindingTests.hs +++ b/test/suite/Integration/SednaBindingTests.hs @@ -112,21 +112,19 @@ testGetConnectionAttr = result) "Testing inspection of connection attributes" --- -------------------------------------------------------------------------------- +--------------------------------------------------------------------------------- testLoadData :: Test -testLoadData = - testCaseFMsg "Test loading of XML Data" $ sednaDBTest - connectionTest (conn -> do - sednaBegin conn - sednaLoadData conn - (pack "") - "testdoc" - "testcollection" - sednaEndLoadData conn) +testLoadData = + connectionTest (\conn -> do + sednaBegin conn + sednaLoadData conn + (pack "") + "testdoc" + "testcollection" + sednaEndLoadData conn + sednaCommit conn) "Testing proper loading of chunk data" - - -- -------------------------------------------------------------------------------- -- -- testLoadFile = sednaDBTest $ -- -- (\(_,conn) -> do @@ -202,15 +200,16 @@ controlTests = testGroup "Control Tests" [ testGetConnectionAttr ] -- -------------------------------------------------------------------------------- --- transactionTests :: Test --- transactionTests = testGroup "Transaction Tests" [ testBeginTransaction --- , testLoadData --- , testExecuteQuery --- , testLoadRetrieveData --- ] +transactionTests :: Test +transactionTests = testGroup "Transaction Tests" [ testBeginTransaction + , testLoadData + --, testExecuteQuery + --, testLoadRetrieveData + ] -------------------------------------------------------------------------------- integrationTests :: Test integrationTests = testGroup "Sedna C API Integration Tests" [ connectionTests , controlTests + , transactionTests ] \ No newline at end of file