X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-db2%2Fdb2-api.lisp;h=880f360351a2605d796708c97d9b56f109fca7d8;hp=99e7245aef95d85d4f2146d08634ae7fb5709985;hb=44cd3f817f6f59ffe495db4cf2b9ea4637a57f75;hpb=2f1b6b521b5c68e249428209a7da57f75e55da47

diff --git a/db-db2/db2-api.lisp b/db-db2/db2-api.lisp
index 99e7245..880f360 100644
--- a/db-db2/db2-api.lisp
+++ b/db-db2/db2-api.lisp
@@ -52,32 +52,21 @@
 			     :returning ,c-return)))
        (defun ,lisp-cli-fn (,@ll &key database nulls-ok)
 	 (let ((result (funcall %lisp-cli-fn ,@ll)))
-	   #+ignore
 	   (case result
-	     (#.+oci-success+
-	      +oci-success+)
-	     (#.+oci-error+
-	      (handle-oci-error :database database :nulls-ok nulls-ok))
-	     (#.+oci-no-data+
-	      (error 'sql-database-error :message "OCI No Data Found"))
-	     (#.+oci-success-with-info+
-	      (error 'sql-database-error :message "internal error: unexpected +oci-success-with-info"))
-	     (#.+oci-no-data+
-	      (error 'sql-database-error :message "OCI No Data"))
-	     (#.+oci-invalid-handle+
-	      (error 'sql-database-error :message "OCI Invalid Handle"))
-	     (#.+oci-need-data+
-	      (error 'sql-database-error :message "OCI Need Data"))
-	     (#.+oci-still-executing+
-	      (error 'sql-temporary-error :message "OCI Still Executing"))
-	     (#.+oci-continue+
-	      (error 'sql-database-error :message "OCI Continue"))
-	     (1804
-	      (error 'sql-database-error :message "Check CLI_HOME and NLS settings."))
+	     (#.SQL_SUCCESS
+	      SQL_SUCCESS)
+	     (#.SQL_SUCCESS_WITH_INFO
+	      (format *standard-output* "sucess with info")
+	      SQL_SUCCESS)
+	     (#.SQL_ERROR
+	      (error 'sql-database-error
+		     :error-id result
+		     :message
+		     (format nil "DB2 error" result)))
 	     (t
 	      (error 'sql-database-error
 		     :message
-		     (format nil "OCI unknown error, code=~A" result)))))))))
+		     (format nil "DB2 unknown error, code=~A" result)))))))))
   
 
 (defmacro def-raw-cli-routine
@@ -90,12 +79,22 @@
 	 (funcall %lisp-cli-fn ,@ll)))))
 
 
-(def-cli-routine ("SQLAllocHandle" sql-allocate-handle)
+(def-cli-routine ("SQLAllocHandle" sql-alloc-handle)
     :int
   (fHandleType cli-smallint)
   (hInput cli-handle)
   (phOuput (* cli-handle)))
 
+(def-cli-routine ("SQLConnect" sql-connect)
+    :int
+  (hDb cli-handle)
+  (server :cstring)
+  (server-len cli-smallint)
+  (user :cstring)
+  (user-len cli-smallint)
+  (password :cstring)
+  (passwd-len cli-smallint))
+
 
 ;;; CLI Functions needed
 ;;;   SQLBindParameter