r9512: Avoid use of OCIServerAttach since CLSQL

        uses OCILogon and does not the more complex session management.

diff --git a/ChangeLog b/ChangeLog
index 4c774340e26962a4f6dea7c4a4d8cc8fd6c3bce3..eb6b98ba3c648c7f431d09db7fb3f7c086a1a790 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,8 @@
        with its MOP usage
        * db-oracle/oracle-sql.lisp: By default, use OCIEnvCreate as 
        introduced in Oracle8. Leave older code selectable by a reader macro
        with its MOP usage
        * db-oracle/oracle-sql.lisp: By default, use OCIEnvCreate as 
        introduced in Oracle8. Leave older code selectable by a reader macro

-       for Oracle7 and prior.
+       for Oracle7 and prior. Avoid use of OCIServerAttach since CLSQL
+       uses OCILogon and does not the more complex session management.

        
 26 May 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * sql/oodml.lisp: Commit universal-time typo patch from Edi Weitz
        
 26 May 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * sql/oodml.lisp: Commit universal-time typo patch from Edi Weitz

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index 6d3211362a3e1cc19acf2b86f24cafa612fad28a..0250a34357bbf3c017d624198e29e0c1343ff6f9 100644 (file)
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -118,19 +118,7 @@ the length of that format.")
     :initarg :major-server-version
     :reader major-server-version
     :documentation
     :initarg :major-server-version
     :reader major-server-version
     :documentation

-    "The major version number of the Oracle server, should be 8, 9, or 10")
-   (client-version 
-    :type (or null 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")))
+    "The major version number of the Oracle server, should be 8, 9, or 10")))

 
 
 ;;; Handle the messy case of return code=+oci-error+, querying the
 
 
 ;;; Handle the messy case of return code=+oci-error+, querying the


@@ -748,11 +736,14 @@ the length of that format.")
                        +oci-htype-error+ 0 +null-void-pointer-pointer+)
       (oci-handle-alloc (deref-vp envhp) srvhp
                        +oci-htype-server+ 0 +null-void-pointer-pointer+)
                        +oci-htype-error+ 0 +null-void-pointer-pointer+)
       (oci-handle-alloc (deref-vp envhp) srvhp
                        +oci-htype-server+ 0 +null-void-pointer-pointer+)

+
+      #+ignore ;; not used since CLSQL uses the OCILogon function instead

       (uffi:with-cstring (dblink nil)
        (oci-server-attach (deref-vp srvhp)
                           (deref-vp errhp)
                           dblink 
                           0 +oci-default+))
       (uffi:with-cstring (dblink nil)
        (oci-server-attach (deref-vp srvhp)
                           (deref-vp errhp)
                           dblink 
                           0 +oci-default+))

+      

       (oci-handle-alloc (deref-vp envhp) svchp
                        +oci-htype-svcctx+ 0 +null-void-pointer-pointer+)
       (oci-attr-set (deref-vp svchp)
       (oci-handle-alloc (deref-vp envhp) svchp
                        +oci-htype-svcctx+ 0 +null-void-pointer-pointer+)
       (oci-attr-set (deref-vp svchp)


@@ -761,40 +752,17 @@ the length of that format.")
                    (deref-vp errhp))
       ;; oci-handle-alloc((dvoid *)encvhp, (dvoid **)&stmthp, OCI_HTYPE_STMT, 0, 0);
       ;;#+nil
                    (deref-vp errhp))
       ;; oci-handle-alloc((dvoid *)encvhp, (dvoid **)&stmthp, OCI_HTYPE_STMT, 0, 0);
       ;;#+nil

-      ;; 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 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-client-version (major-client-version-from-string
-                                                      client-version)
-                               :major-server-version (major-client-version-from-string
-                                                      server-version)))
+
+      (let ((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)))

        (oci-logon (deref-vp envhp)
                   (deref-vp errhp) 
                   svchp
        (oci-logon (deref-vp envhp)
                   (deref-vp errhp) 
                   svchp