r9430: correctly obtain server and client versions of oracle.

diff --git a/ChangeLog b/ChangeLog
index 38ae4f6587708f7db1eea0f358a86c2b0d6850d5..71b2c0bb40b8535d444afa9e35c6735057322513 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
        * sql/sql.lisp: Ensure recyclebin is purged for oracle in 
        TRUNCATE-DATABASE
        * db-oracle/oracle-sql.lisp: Add sequence functions, fix use of
-       of owner phrases
+       of owner phrases. Obtain server and client versions.
        * db-oracle/oracle-objects.lisp: Fix type specifiers
        * tests/test-fddl.lisp: Allow :varchar2 and :number as data types
        * tests/test-init.lisp: Properly get username from Oracle connection-spec

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index d5fdb8797d3f529ff8ebca8de76ea0a06e125ffc..a86a5615796ace3b3fbbf07949dcba949c41639a 100644 (file)
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -104,12 +104,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
@@ -780,13 +792,13 @@ 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 client-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 server-version (uffi:convert-from-foreign-string buf)))
+         (setf client-version (uffi:convert-from-foreign-string buf)))
        (setq db (make-instance 'oracle-database
                                :name (database-name-from-spec connection-spec
                                                               database-type)
@@ -796,10 +808,9 @@ the length of that format.")
                                :svchp svchp
                                :dsn data-source-name
                                :user user
-                               :server-version server-version
-                               :major-version-number (major-version-from-string
-                                                      server-version)))
-
+                               :client-version client-version
+                               :major-client-version (major-client-version-from-string
+                                                      client-version)))
        (oci-logon (deref-vp envhp)
                   (deref-vp errhp) 
                   svchp
@@ -810,16 +821,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 VERSION FROM V$INSTANCE" db nil nil))))
+         (setf (slot-value db 'server-version) server-version
+               (slot-value db 'major-server-version) (major-server-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.

diff --git a/sql/table.lisp b/sql/table.lisp
index 67b474d2a2f1c65a0e42ff982bd7351c7a5380b6..a49ed2adb6d405d0b1e4c0c868f0bd0b57f6a3cf 100644 (file)
--- a/sql/table.lisp
+++ b/sql/table.lisp
@@ -72,9 +72,9 @@ an error is signalled if IF-DOES-NOT-EXIST is :error."
     (let ((expr (concatenate 'string "DROP TABLE " table-name)))
       (when (and (find-package 'clsql-oracle)
                 (eq :oracle (database-type database))
-                (eql 9 (slot-value database 
-                                   (intern (symbol-name '#:major-version-number)
-                                           (symbol-name '#:clsql-oracle)))))
+                (eql 10 (slot-value database 
+                                    (intern (symbol-name '#:major-server-version)
+                                            (symbol-name '#:clsql-oracle)))))
        (setq expr (concatenate 'string expr " PURGE")))
 
       (execute-command expr :database database))))

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index d78e64ae978c4cdbf8359e83c2b43a46b32028b1..543ab871f6bfefebd69093f8cadeb4478cfeb3df 100644 (file)
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -579,7 +579,8 @@
   (when *default-database*
       (disconnect :database *default-database*))
   (test-connect-to-database type (car (db-type-spec type (read-specs))))
-  (test-initialise-database))
+  (test-initialise-database)
+  *default-database*)
 
 (defun rl ()
   (rapid-load :postgresql))