modified build

Author: thierry-b

.travis.yml

@@ -28,19 +28,11 @@ install:
 - ci/install-instantclient.sh
 - ci/install-ocilib.sh
 
-#before_script:
-#- docker --version
-#- docker pull alexeiled/docker-oracle-xe-11g
-#- docker run -d --name oracle -p 1521:1521 -v $(pwd)/sql:/etc/entrypoint-initdb.d alexeiled/docker-oracle-xe-11g
-
-
 # This line does all of the work: installs GHC if necessary, build the library,
 # executables, and test suites, and runs the test suites. --no-terminal works
 # around some quirks in Travis's terminal implementation.
 script:
-- stack --no-terminal --install-ghc build --test --no-run-tests
-- LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH .stack-work/dist/x86_64-linux/Cabal-1.22.5.0/build/test/test
-- cat /etc/ld.so.conf
+- stack --no-terminal --install-ghc build --test
 
 # Caching so the next build will be fast too.
 cache:

ci/install-instantclient.sh

@@ -2,11 +2,13 @@
 
 set -ex
 
-cd ~
-wget https://storage.googleapis.com/oracle.fpinsight.com/instantClient/instantclient-basiclite-linux.x64-12.1.0.2.0.zip
-wget https://storage.googleapis.com/oracle.fpinsight.com/instantClient/instantclient-sdk-linux.x64-12.1.0.2.0.zip
-unzip instantclient-basiclite-linux.x64-12.1.0.2.0.zip
-sudo cp instantclient_12_1/lib* /usr/local/lib/
-sudo ln -s /usr/local/lib/libclntsh.so.12.1 /usr/local/lib/libclntsh.so
-ln -s $HOME/instantclient_12_1/libclntsh.so.12.1 $HOME/instantclient_12_1/libclntsh.so
-unzip instantclient-sdk-linux.x64-12.1.0.2.0.zip
+cd /tmp
+
+wget https://storage.googleapis.com/oracle.fpinsight.com/instantClient/oracle-instantclient12.1-basiclite_12.1.0.2.0-2_amd64.deb
+sudo dpkg -i oracle-instantclient12.1-basiclite_12.1.0.2.0-2_amd64.deb
+rm -f oracle-instantclient12.1-basiclite_12.1.0.2.0-2_amd64.deb
+wget https://storage.googleapis.com/oracle.fpinsight.com/instantClient/oracle-instantclient12.1-devel_12.1.0.2.0-2_amd64.deb
+sudo dpkg -i oracle-instantclient12.1-devel_12.1.0.2.0-2_amd64.deb
+rm -f oracle-instantclient12.1-devel_12.1.0.2.0-2_amd64.deb
+sudo echo "/usr/lib/oracle/12.1/client64/lib" > /etc/ld.so.conf.d/oracle-client.conf
+sudo ldconfig

ci/install-ocilib.sh

@@ -1,13 +1,17 @@
 #!/bin/sh
 set -ex
 
-cd ~
-wget https://storage.googleapis.com/oracle.fpinsight.com/instantClient/ocilib-4.2.1.tar.gz
-tar xvf ocilib-4.2.1.tar.gz
-cd ocilib-4.2.1 \
-    && ./configure --with-oracle-import=linkage \
-                   --with-oracle-charset=ansi \
-                   --with-oracle-headers-path=$HOME/instantclient_12_1/sdk/include \
-                   --with-oracle-lib-path=$HOME/instantclient_12_1 \
-    && make \
-    && sudo make install
+wget https://github.com/vrogier/ocilib/archive/v4.2.1.tar.gz
+tar xvf v4.2.1.tar.gz
+cd /tmp/ocilib-4.2.1
+
+./configure --with-oracle-import=linkage \
+            --with-oracle-charset=ansi \
+            --with-oracle-headers-path=/usr/include/oracle/12.1/client64 \
+            --with-oracle-lib-path=/usr/lib/oracle/12.1/client64/lib \
+make
+sudo make install
+cd
+rm -rf /tmp/ocilib-4.2.1
+sudo echo "/usr/local/lib" > /etc/ld.so.conf.d/usr-local.conf
+sudo ldconfig

docker.sh

@@ -1,5 +1,3 @@
 #!/bin/sh
 
 docker run -d --name oracle --shm-size=2g -p 1521:1521 -v $(pwd)/sql:/etc/entrypoint-initdb.d alexeiled/docker-oracle-xe-11g
-
-# user: system/oracle@localhost:1521/xe

hocilib.cabal

@@ -62,6 +62,7 @@ library
 
   cc-options:       -Wall
   extra-libraries:  ocilib
+  extra-lib-dirs:   /usr/local/lib
 
   build-depends: base             >= 4.8 && < 5
                , containers       >= 0.5 && < 1
@@ -79,6 +80,9 @@ test-suite test
 
   default-language: Haskell2010
 
+  extra-libraries: ocilib
+  extra-lib-dirs: /usr/local/lib
+
   build-depends: base
                , bytestring
                , hocilib

src/Database/Ocilib/Statement.hs

@@ -54,6 +54,7 @@ import           Foreign.Ptr
 import qualified Language.C.Inline as C
 import           Database.Ocilib.Oci
 import           Database.Ocilib.Enums
+import           Database.Ocilib.Internal
 
 C.context (C.baseCtx <> C.funCtx <> ociCtx)
 
@@ -62,8 +63,8 @@ C.include "<ocilib.h>"
 -- Executing Statements
 
 -- | Create a statement object and return its handle.
-ociStatementCreate :: Ptr OCI_Connection -> IO (Ptr OCI_Statement)
-ociStatementCreate c = [C.exp| OCI_Statement* { OCI_StatementCreate($(OCI_Connection *c)) } |]
+ociStatementCreate :: Ptr OCI_Connection -> IO (Maybe (Ptr OCI_Statement))
+ociStatementCreate c = fmap toMaybePtr [C.exp| OCI_Statement* { OCI_StatementCreate($(OCI_Connection *c)) } |]
 
 -- | Free a statement and all resources associated to it (resultsets ...)
 ociStatementFree :: Ptr OCI_Statement -> IO Bool

stack.yaml

@@ -1,8 +1,11 @@
-resolver: lts-6.12
+resolver: lts-6.13
 packages:
 - '.'
 extra-deps: []
 flags: {}
 extra-package-dbs: []
 extra-include-dirs: []
 extra-lib-dirs: []
+docker:
+  enable: false
+  repo: mystack:latest

tests/Tests.hs

@@ -35,7 +35,7 @@ fetchTest = do
     case maybeC of
         Nothing -> assertFailure "failed to create connection"
         Just c -> do
-            st <- ociStatementCreate c
+            Just st <- ociStatementCreate c
             b <- ociExecuteStmt st "select * from test_fetch"
             assertBool "ociExecuteStatement" b
 
@@ -113,7 +113,7 @@ testStringBinding = do
     case maybeC of
         Nothing -> assertFailure "unable to connect"
         Just c -> do
-            st <- ociStatementCreate c
+            Just st <- ociStatementCreate c
             ociSetBindAllocation st OCI_BAM_INTERNAL
             b <- ociPrepare st "select * from test_fetch where article=(:article)"
             assertBool "prepared" b