: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
;; 21 bytes. See pp. 3-10, 3-26, and 6-13 of OCI documentation
;; for more details.
+;; Mac OS X Note: According to table 6-8 in the Oracle 9i OCI
+;; documentation, PRECISION may actually be an sb2 instead of a
+;; single byte if performing an "implicit describe". Using a
+;; signed short instead of an unsigned byte fixes a Mac OS X bug
+;; where PRECISION is always zero. -- JJB 20040713
+
;; When calling OCI C code to handle the conversion, we have
;; only two numeric types available to pass the return value:
;; double-float and signed-long. It would be possible to
;; below, beware!) try setting this value into COLSIZE, calling OCI,
;; then looking at the value in COLSIZE. (setf colsize #x12345678)
;; debugging only
-
+
+;; Mac OS X Note: This workaround fails on a bigendian platform so
+;; I've changed the data type of COLNAME to :unsigned-short as per
+;; the Oracle 9i OCI documentation. -- JJB 20040713
(uffi:def-type byte-pointer (* :byte))
(uffi:def-type ulong-pointer (* :unsigned-long))
(with-slots (errhp) database
(uffi:with-foreign-objects ((dtype-foreign :unsigned-short)
(parmdp :pointer-void)
- (precision :byte)
+ (precision :short)
(scale :byte)
(colname '(* :unsigned-char))
(colnamelen :unsigned-long)
- (colsize :unsigned-long)
+ (colsize :unsigned-short)
(colsizesize :unsigned-long)
(defnp ':pointer-void))
(let ((buffer nil)
+oci-attr-scale+
(deref-vp errhp))
(let ((*scale (uffi:deref-pointer scale :byte))
- (*precision (uffi:deref-pointer precision :byte)))
+ (*precision (uffi:deref-pointer precision :short)))
;;(format t "scale=~d, precision=~d~%" *scale *precision)
(cond
dtype #.SQLT-FLT)))))
;; Default to SQL-STR
(t
- (setf (uffi:deref-pointer colsize :unsigned-long) 0)
+ (setf (uffi:deref-pointer colsize :unsigned-short) 0)
(setf dtype #.SQLT-STR)
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
+unsigned-int-null-pointer+
+oci-attr-data-size+
(deref-vp errhp))
- (let ((colsize-including-null (1+ (uffi:deref-pointer colsize :unsigned-long))))
+ (let ((colsize-including-null (1+ (uffi:deref-pointer colsize :unsigned-short))))
(setf buffer (acquire-foreign-resource
:unsigned-char (* +n-buf-rows+ colsize-including-null)))
(setf sizeof colsize-including-null))))
;; handle errors very gracefully (since they're part of the
;; error-handling mechanism themselves) so we just assert they
;; work.
+
(setf (deref-vp envhp) +null-void-pointer+)
+
#-oci7
(oci-env-create envhp +oci-default+ +null-void-pointer+
+null-void-pointer+ +null-void-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+))
+
(oci-handle-alloc (deref-vp envhp) svchp
+oci-htype-svcctx+ 0 +null-void-pointer-pointer+)
(oci-attr-set (deref-vp svchp)
(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
projects / clsql.git / blobdiff