(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
(defmacro deref-vp (foreign-object)
- `(uffi:deref-pointer ,foreign-object void-pointer))
+ `(uffi:deref-pointer ,foreign-object :pointer-void))
;; constants - from OCI?
+(defvar +unsigned-char-null-pointer+
+ (uffi:make-null-pointer :unsigned-char))
+(defvar +unsigned-short-null-pointer+
+ (uffi:make-null-pointer :unsigned-short))
+(defvar +unsigned-int-null-pointer+
+ (uffi:make-null-pointer :unsigned-int))
+
(defconstant +var-not-in-list+ 1007)
(defconstant +no-data-found+ 1403)
(defconstant +null-value-returned+ 1405)
: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 the Oracle server, should be 8, 9, or 10")
+ (client-version
+ :type string
+ :initarg :client-version
+ :reader client-version
:documentation
- "The major version number of Oracle, should be 8, 9, or 10")))
+ "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
(uffi:ensure-char-storable (code-char 0)))
(setf (uffi:deref-pointer errcode :long) 0)
- (oci-error-get (uffi:deref-pointer errhp void-pointer) 1
+ (oci-error-get (deref-vp errhp) 1
(uffi:make-null-pointer :unsigned-char)
errcode errbuf +errbuf-len+ +oci-htype-error+)
(let ((subcode (uffi:deref-pointer errcode :long)))
(defun osucc (code)
(declare (type fixnum code))
(unless (= code +oci-success+)
- (error 'dbi-error
- :format-control "unexpected OCI failure, code=~S"
- :format-arguments (list code))))
+ (error 'sql-database-error
+ :message (format nil "unexpected OCI failure, code=~S" code))))
;;; Enabling this can be handy for low-level debugging.
;; In order to map the "same string" property above onto Lisp equality,
;; we drop trailing spaces in all cases:
-(uffi:def-type string-pointer (* :unsigned-char))
+(uffi:def-type string-array (:array :unsigned-char))
(defun deref-oci-string (arrayptr string-index size)
- (declare (type string-pointer 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
(flet (;; a character from OCI-DATE, interpreted as an unsigned byte
(ub (i)
(declare (type (mod #.+oci-date-bytes+) i))
- (mod (uffi:deref-array oci-date string-pointer i) 256)))
+ (mod (uffi:deref-array oci-date string-array i) 256)))
(let* ((century (* (- (ub 0) 100) 100))
(year (+ century (- (ub 1) 100)))
(month (ub 2))
(second (1- (ub 6))))
(encode-universal-time second minute hour day month year))))
-(defmethod database-list-tables ((database oracle-database) &key owner)
- (mapcar #'car
- (database-query "select table_name from user_tables"
- database nil nil))
- #+nil
- (values (database-query "select TABLE_NAME from all_catalog
- where owner not in ('PUBLIC','SYSTEM','SYS','WMSYS','EXFSYS','CTXSYS','WKSYS','WK_TEST','MDSYS','DMSYS','OLAPSYS','ORDSYS','XDB')"
- db nil nil)))
-
-
-(defmethod database-list-views ((database oracle-database)
- &key owner)
- ;; (database-query "select table_name from all_catalog" database nil nil)
- (mapcar #'car
- (database-query "select view_name from user_views" database nil nil)))
+(defmethod database-list-tables ((database oracle-database) &key owner)
+ (let ((query
+ (if owner
+ (format nil
+ "select user_tables.table_name from user_tables,all_tables where user_tables.table_name=all_tables.table_name and all_tables.owner='~:@(~A~)'"
+ owner)
+ "select table_name from user_tables")))
+ (mapcar #'car (database-query query database nil nil))))
+
+
+(defmethod database-list-views ((database oracle-database) &key owner)
+ (let ((query
+ (if owner
+ (format nil
+ "select user_views.view_name from user_views,all_views where user_views.view_name=all_views.view_name and all_views.owner='~:@(~A~)'"
+ owner)
+ "select view_name from user_views")))
+ (mapcar #'car
+ (database-query query database nil nil))))
(defmethod database-list-indexes ((database oracle-database)
&key (owner nil))
- (mapcar #'car
- (database-query "select index_name from user_indexes" database nil nil)))
+ (let ((query
+ (if owner
+ (format nil
+ "select user_indexes.index_name from user_indexes,all_indexes where user_indexes.index_name=all_indexes.index_name and all_indexes.owner='~:@(~A~)'"
+ owner)
+ "select index_name from user_indexes")))
+ (mapcar #'car (database-query query database nil nil))))
+
+(defmethod database-list-table-indexes (table (database oracle-database)
+ &key (owner nil))
+ (let ((query
+ (if owner
+ (format nil
+ "select user_indexes.index_name from user_indexes,all_indexes where user_indexes.table_name='~A' and user_indexes.index_name=all_indexes.index_name and all_indexes.owner='~:@(~A~)'"
+ table owner)
+ (format nil "select index_name from user_indexes where table_name='~A'"
+ table))))
+ (mapcar #'car (database-query query database nil nil))))
(defmethod list-all-table-columns (table (db oracle-database))
(declare (string table))
1))) ; string
preresult))
-
(defmethod database-list-attributes (table (database oracle-database) &key owner)
- (mapcar #'car
- (database-query
- (format nil
- "select column_name from user_tab_columns where table_name='~A'"
- table)
- database nil nil)))
+ (let ((query
+ (if owner
+ (format nil
+ "select user_tab_columns.column_name from user_tab_columns,all_tables where user_tab_columns.table_name='~A' and all_tables.table_name=user_tab_columns.table_name and all_tables.owner='~:@(~A~)'"
+ table owner)
+ (format nil
+ "select column_name from user_tab_columns where table_name='~A'"
+ table))))
+ (mapcar #'car (database-query query database nil nil))))
(defmethod database-attribute-type (attribute (table string)
(database oracle-database)
&key (owner nil))
- (let ((rows
- (database-query
- (format nil
- "select data_type,data_length,data_precision,data_scale,nullable from user_tab_columns where table_name='~A' and column_name='~A'"
- table attribute)
- database :auto nil)))
- (destructuring-bind (type length precision scale nullable) (car rows)
- (values (ensure-keyword type) length precision scale
+ (let ((query
+ (if owner
+ (format nil
+ "select data_type,data_length,data_scale,nullable from user_tab_columns,all_tables where user_tab_columns.table_name='~A' and column_name='~A' and all_tables.table_name=user_tab_columns.table_name and all_tables.owner='~:@(~A~)'"
+ table attribute owner)
+ (format nil
+ "select data_type,data_length,data_scale,nullable from user_tab_columns where table_name='~A' and column_name='~A'"
+ table attribute))))
+ (destructuring-bind (type length scale nullable) (car (database-query query database :auto nil))
+ (values (ensure-keyword type) length scale
(if (char-equal #\Y (schar nullable 0)) 1 0)))))
;; Return one row of the table referred to by QC, represented as a
(defstruct (oracle-result-set (:print-function print-query-cursor)
(:conc-name qc-)
(:constructor %make-query-cursor))
- (db (error "missing DB") ; db conn. this table is associated with
+ (db (error "missing DB") ; db conn. this table is associated with
:type oracle-database
:read-only t)
(stmthp (error "missing STMTHP") ; the statement handle used to create
;;(declare (optimize (speed 3)))
(cond ((zerop (qc-n-from-oci qc))
(if eof-errorp
- (error 'clsql-error :message
+ (error 'sql-database-error :message
(format nil "no more rows available in ~S" qc))
eof-value))
((>= (qc-n-to-dbi qc)
(value
(let* ((arb (foreign-resource-buffer (cd-indicators cd)))
(indicator (uffi:deref-array arb '(:array :short) irow)))
- (declare (type short-array arb))
+ ;;(declare (type short-array arb))
(unless (= indicator -1)
(ecase (cd-oci-data-type cd)
(#.SQLT-STR
(deref-oci-string b irow (cd-sizeof cd)))
(#.SQLT-FLT
- (uffi:deref-array bd '(:array :double) irow))
+ (uffi:deref-array b '(:array :double) irow))
(#.SQLT-INT
- (uffi:deref-array bi '(:array :int) irow))
+ (uffi:deref-array b '(:array :int) irow))
(#.SQLT-DATE
(deref-oci-string b irow (cd-sizeof cd))))))))
(when (and (eq :string (cd-result-type cd))
(oci-attr-get (deref-vp (qc-stmthp qc))
+oci-htype-stmt+
rowcount
- (uffi:make-null-pointer :unsigned-long)
+ +unsigned-int-null-pointer+
+oci-attr-row-count+
(deref-vp errhp))
(setf (qc-n-from-oci qc)
(defun sql-stmt-exec (sql-stmt-string db result-types field-names)
(with-slots (envhp svchp errhp)
db
- (let ((stmthp (uffi:allocate-foreign-object void-pointer)))
+ (let ((stmthp (uffi:allocate-foreign-object :pointer-void)))
(uffi:with-foreign-object (stmttype :unsigned-short)
(oci-handle-alloc (deref-vp envhp)
(oci-attr-get (deref-vp stmthp)
+oci-htype-stmt+
stmttype
- (uffi:make-null-pointer :unsigned-int)
+ +unsigned-int-null-pointer+
+oci-attr-stmt-type+
(deref-vp errhp)
:database db)
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
dtype-foreign
- (uffi:make-null-pointer :int)
+ +unsigned-int-null-pointer+
+oci-attr-data-type+
(deref-vp errhp))
(let ((dtype (uffi:deref-pointer dtype-foreign :unsigned-short)))
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
precision
- (uffi:make-null-pointer :int)
+ +unsigned-int-null-pointer+
+oci-attr-precision+
(deref-vp errhp))
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
scale
- (uffi:make-null-pointer :int)
+ +unsigned-int-null-pointer+
+oci-attr-scale+
(deref-vp errhp))
(let ((*scale (uffi:deref-pointer scale :byte))
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
colsize
- (uffi:make-null-pointer :int) ;; (uffi:pointer-address colsizesize)
+ +unsigned-int-null-pointer+
+oci-attr-data-size+
(deref-vp errhp))
(let ((colsize-including-null (1+ (uffi:deref-pointer colsize :unsigned-long))))
(setf buffer (acquire-foreign-resource
:unsigned-char (* +n-buf-rows+ colsize-including-null)))
(setf sizeof colsize-including-null))))
- (let ((retcodes (acquire-foreign-resource :short +n-buf-rows+))
+ (let ((retcodes (acquire-foreign-resource :unsigned-short +n-buf-rows+))
(indicators (acquire-foreign-resource :short +n-buf-rows+))
(colname-string ""))
(when field-names
sizeof
dtype
(foreign-resource-buffer indicators)
- (uffi:make-null-pointer :unsigned-short)
+ +unsigned-short-null-pointer+
(foreign-resource-buffer retcodes)
+oci-default+))))))))
;; oci-handle-alloc((dvoid *)encvhp, (dvoid **)&stmthp, OCI_HTYPE_STMT, 0, 0);
;;#+nil
)
- (let (db server-version)
+ ;; 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-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
;; :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 " 9g " 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.
(defmethod database-sequence-next (sequence-name (database oracle-database))
(caar
- (query
+ (database-query
(concatenate 'string "SELECT "
(sql-escape sequence-name)
".NEXTVAL FROM dual"
- ) :database database)))
+ )
+ database :auto nil)))
+
+(defmethod database-set-sequence-position (name position database)
+ (let* ((next (database-sequence-next name database))
+ (incr (- position next)))
+ (database-execute-command
+ (format nil "ALTER SEQUENCE ~A INCREMENT BY ~D" name incr)
+ database)
+ (database-sequence-next name database)
+ (database-execute-command
+ (format nil "ALTER SEQUENCE ~A INCREMENT BY 1" name)
+ database)))
(defmethod database-list-sequences ((database oracle-database) &key owner)
- (mapcar #'car (database-query "select sequence_name from user_sequences"
- database nil nil)))
+ (let ((query
+ (if owner
+ (format nil
+ "select user_sequences.sequence_name from user_sequences,all_sequences where user_sequences.sequence_name=all_sequences.sequence_name and all_sequences.sequence_owner='~:@(~A~)'"
+ owner)
+ "select sequence_name from user_sequences")))
+ (mapcar #'car (database-query query database nil nil))))
(defmethod database-execute-command (sql-expression (database oracle-database))
(database-query sql-expression database nil nil)
projects / clsql.git / blobdiff