X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-oracle%2Foracle-sql.lisp;h=3598dc93f628953edad15e9c753d83d6eaa5dd16;hb=981c14d37d3c6b4037df4a2e43a4a2be5f8b358a;hp=d5fdb8797d3f529ff8ebca8de76ea0a06e125ffc;hpb=ca8b8ab72493dfe86309bf489d4a7ccf897adf08;p=clsql.git

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index d5fdb87..3598dc9 100644
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -15,8 +15,7 @@
 
 (in-package #:clsql-oracle)
 
-(defmethod database-initialize-database-type
-    ((database-type (eql :oracle)))
+(defmethod database-initialize-database-type ((database-type (eql :oracle)))
   t)
 
 ;;;; arbitrary parameters, tunable for performance or other reasons
@@ -104,12 +103,24 @@ the length of that format.")
     :reader server-version
     :documentation
     "Version string of Oracle server.")
-   (major-version-number
+   (major-server-version
     :type (or null fixnum)
-    :initarg :major-version-number
-    :reader major-version-number
+    :initarg :major-server-version
+    :reader major-server-version
     :documentation
-    "The major version number of Oracle, should be 8, 9, or 10")))
+    "The major version number of the Oracle server, should be 8, 9, or 10")
+   (client-version 
+    :type string
+    :initarg :client-version
+    :reader client-version
+    :documentation
+    "Version string of Oracle client.")
+   (major-client-version
+    :type (or null fixnum)
+    :initarg :major-client-version
+    :reader major-client-version
+    :documentation
+    "The major version number of the Oracle client, should be 8, 9, or 10")))
 
 
 ;;; Handle the messy case of return code=+oci-error+, querying the
@@ -193,7 +204,7 @@ the length of that format.")
 (uffi:def-type string-array (:array :unsigned-char))
 
 (defun deref-oci-string (arrayptr string-index size)
-  (declare (type string-array arrayptr))
+;;  (declare (type string-array arrayptr))
   (declare (type (mod #.+n-buf-rows+) string-index))
   (declare (type (and unsigned-byte fixnum) size))
   (let* ((raw (uffi:convert-from-foreign-string 
@@ -403,7 +414,7 @@ the length of that format.")
 		    (value
 		     (let* ((arb (foreign-resource-buffer (cd-indicators cd)))
 			    (indicator (uffi:deref-array arb '(:array :short) irow)))
-		       (declare (type short-array arb))
+		       ;; b(declare (type short-array arb))
 		       (unless (= indicator -1)
 			 (ecase (cd-oci-data-type cd)
 			   (#.SQLT-STR  
@@ -780,26 +791,38 @@ the length of that format.")
 	)
       ;; Actually, oci-server-version returns the client version, not the server versions
       ;; will use "SELECT VERSION FROM V$INSTANCE" to get actual server version.
-      (let (db server-version)
+      (let (db server-version client-version)
+	(declare (ignorable server-version))
 	(uffi:with-foreign-object (buf '(:array :unsigned-char #.+errbuf-len+))
 	  (oci-server-version (deref-vp svchp)
 			      (deref-vp errhp)
 			      (uffi:char-array-to-pointer buf)
 			      +errbuf-len+ +oci-htype-svcctx+)
+	  (setf client-version (uffi:convert-from-foreign-string buf))
+	  ;; This returns the client version, not the server version, so diable it
+	  #+ignore
+	  (oci-server-version (deref-vp srvhp)
+			      (deref-vp errhp)
+			      (uffi:char-array-to-pointer buf)
+			      +errbuf-len+ +oci-htype-server+)
+	  #+ignore
 	  (setf server-version (uffi:convert-from-foreign-string buf)))
 	(setq db (make-instance 'oracle-database
 				:name (database-name-from-spec connection-spec
 							       database-type)
+				:connection-spec connection-spec
 				:envhp envhp
 				:errhp errhp
 				:database-type :oracle
 				:svchp svchp
 				:dsn data-source-name
 				:user user
+				:client-version client-version
 				:server-version server-version
-				:major-version-number (major-version-from-string
+				:major-client-version (major-client-version-from-string
+						       client-version)
+				:major-server-version (major-client-version-from-string
 						       server-version)))
-
 	(oci-logon (deref-vp envhp)
 		   (deref-vp errhp) 
 		   svchp
@@ -810,16 +833,32 @@ the length of that format.")
 	;; :date-format-length (1+ (length date-format)))))
 	(setf (slot-value db 'clsql-sys::state) :open)
         (database-execute-command
-	 (format nil "alter session set NLS_DATE_FORMAT='~A'" (date-format db)) db)
+	 (format nil "ALTER SESSION SET NLS_DATE_FORMAT='~A'" (date-format db)) db)
+	(let ((server-version (caar (database-query "SELECT BANNER FROM V$VERSION WHERE BANNER LIKE '%Oracle%'" db nil nil))))
+	  (setf (slot-value db 'server-version) server-version
+		(slot-value db 'major-server-version) (major-client-version-from-string
+						       server-version)))
         db))))
 
 
-(defun major-version-from-string (str)
+(defun major-client-version-from-string (str)
   (cond 
     ((search " 10g " str)
      10)
-    ((search "Oracle9i  " str)
-     10)))
+    ((search "Oracle9i " str)
+     9)
+    ((search "Oracle8" str)
+     8)))
+
+(defun major-server-version-from-string (str)
+  (when (> (length str) 2)
+    (cond 
+      ((string= "10." (subseq str 0 3))
+       10)
+      ((string= "9." (subseq str 0 2))
+       9)
+      ((string= "8." (subseq str 0 2))
+       8))))
 
 
 ;; Close a database connection.