(defmacro deref-vp (foreign-object)
`(the vp-type (uffi:deref-pointer (the vpp-type ,foreign-object) :pointer-void)))
-(defvar +unsigned-char-null-pointer+
+(uffi:def-pointer-var +unsigned-char-null-pointer+
(uffi:make-null-pointer :unsigned-char))
-(defvar +unsigned-short-null-pointer+
+(uffi:def-pointer-var +unsigned-short-null-pointer+
(uffi:make-null-pointer :unsigned-short))
-(defvar +unsigned-int-null-pointer+
+(uffi:def-pointer-var +unsigned-int-null-pointer+
(uffi:make-null-pointer :unsigned-int))
;; constants - from OCI?
;;; database. Thus, there's no obstacle to having any number of DB
;;; objects referring to the same database.
-(uffi:def-type pointer-pointer-void '(* :pointer-void))
+(uffi:def-type pointer-pointer-void (* :pointer-void))
(defclass oracle-database (database) ; was struct db
((envhp
(date-format
:initarg :date-format
:reader date-format
- :initform "YYYY-MM-DD HH24:MI:SS\"+00\"")
+ :initform "YYYY-MM-DD HH24:MI:SS\".0\"")
(date-format-length
:type number
:documentation
output format. In order to extract date strings from output buffers
holding multiple date strings in fixed-width fields, we need to know
the length of that format.")
- (server-version
+ (server-version
:type (or null string)
:initarg :server-version
:reader server-version
:documentation
"The major version number of the Oracle server, should be 8, 9, or 10")))
+;;; Handle a non-successful result from an OCI function.
+(defun handle-oci-result (result database nulls-ok)
+ (case result
+ (#.+oci-success+
+ +oci-success+)
+ (#.+oci-error+
+ (handle-oci-error :database database :nulls-ok nulls-ok))
+ (#.+oci-no-data+
+ (error 'sql-database-error :message "OCI No Data Found"))
+ (#.+oci-success-with-info+
+ (error 'sql-database-error :message "internal error: unexpected +oci-success-with-info"))
+ (#.+oci-invalid-handle+
+ (error 'sql-database-error :message "OCI Invalid Handle"))
+ (#.+oci-need-data+
+ (error 'sql-database-error :message "OCI Need Data"))
+ (#.+oci-still-executing+
+ (error 'sql-temporary-error :message "OCI Still Executing"))
+ (#.+oci-continue+
+ (error 'sql-database-error :message "OCI Continue"))
+ (1804
+ (error 'sql-database-error :message "Check ORACLE_HOME and NLS settings."))
+ (t
+ (error 'sql-database-error
+ :message
+ (format nil "OCI unknown error, code=~A" result)))))
;;; Handle the messy case of return code=+oci-error+, querying the
;;; system for subcodes and reporting them as appropriate. ERRHP and
;;; NULLS-OK are as in the OERR function.
(defun handle-oci-error (&key database nulls-ok)
- (cond (database
- (with-slots (errhp) database
- (uffi:with-foreign-objects ((errbuf '(:array :unsigned-char
- #.+errbuf-len+))
- (errcode :long))
- ;; ensure errbuf empty string
- (setf (uffi:deref-array errbuf '(:array :unsigned-char) 0)
+ (cond
+ (database
+ (with-slots (errhp) database
+ (let ((errcode (uffi:allocate-foreign-object 'sb4))
+ (errbuf (uffi:allocate-foreign-string #.+errbuf-len+)))
+ ;; ensure errbuf empty string
+ (setf (uffi:deref-array errbuf '(:array :unsigned-char) 0)
(uffi:ensure-char-storable (code-char 0)))
- (setf (uffi:deref-pointer errcode :long) 0)
-
- (uffi:with-cstring (sqlstate nil)
- (oci-error-get (deref-vp errhp) 1
- sqlstate
- errcode
- (uffi:char-array-to-pointer errbuf)
- +errbuf-len+ +oci-htype-error+))
- (let ((subcode (uffi:deref-pointer errcode :long)))
- (unless (and nulls-ok (= subcode +null-value-returned+))
- (error 'sql-database-error
- :database database
- :error-id subcode
- :message (uffi:convert-from-foreign-string errbuf)))))))
- (nulls-ok
- (error 'sql-database-error
- :database database
- :message "can't handle NULLS-OK without ERRHP"))
- (t
- (error 'sql-database-error
- :database database
- :message "OCI Error (and no ERRHP available to find subcode)"))))
+ (setf (uffi:deref-pointer errcode 'sb4) 0)
+
+ (uffi:with-cstring (sqlstate nil)
+ (oci-error-get (deref-vp errhp) 1
+ sqlstate
+ errcode
+ (uffi:char-array-to-pointer errbuf)
+ +errbuf-len+ +oci-htype-error+))
+ (let ((subcode (uffi:deref-pointer errcode 'sb4))
+ (errstr (uffi:convert-from-foreign-string errbuf)))
+ (uffi:free-foreign-object errcode)
+ (uffi:free-foreign-object errbuf)
+ (unless (and nulls-ok (= subcode +null-value-returned+))
+ (error 'sql-database-error
+ :database database
+ :error-id subcode
+ :message errstr))))))
+ (nulls-ok
+ (error 'sql-database-error
+ :database database
+ :message "can't handle NULLS-OK without ERRHP"))
+ (t
+ (error 'sql-database-error
+ :database database
+ :message "OCI Error (and no ERRHP available to find subcode)"))))
;;; Require an OCI success code.
;;;
(declare (type string-pointer arrayptr))
(declare (type (mod #.+n-buf-rows+) string-index))
(declare (type (and unsigned-byte fixnum) size))
- (let ((str (uffi:convert-from-foreign-string
+ (let ((str (uffi:convert-from-foreign-string
(uffi:make-pointer
(+ (uffi:pointer-address arrayptr) (* string-index size))
:unsigned-char))))
#+nil
(defun deref-oci-date (arrayptr index)
- (oci-date->universal-time (uffi:pointer-address
+ (oci-date->universal-time (uffi:pointer-address
(uffi:deref-array arrayptr
'(:array :unsigned-char)
(* index +oci-date-bytes+)))))
(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")))
+ (cond ((null owner)
+ "select table_name from user_tables")
+ ((eq owner :all)
+ "select table_name from all_tables")
+ (t
+ (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)))))
(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")))
+ (cond ((null owner)
+ "select view_name from user_views")
+ ((eq owner :all)
+ "select view_name from all_views")
+ (t
+ (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)))))
(mapcar #'car
- (database-query query database nil nil))))
+ (database-query query database nil nil))))
(defmethod database-list-indexes ((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.index_name=all_indexes.index_name and all_indexes.owner='~:@(~A~)'"
- owner)
- "select index_name from user_indexes")))
+ (cond ((null owner)
+ "select index_name from user_indexes")
+ ((eq owner :all)
+ "select index_name from all_indexes")
+ (t (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)))))
(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))))
+ (cond ((null owner)
+ (format nil "select index_name from user_indexes where table_name='~A'"
+ table))
+ ((eq owner :all)
+ (format nil "select index_name from all_indexes where table_name='~A'"
+ table))
+ (t
+ (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)))))
(mapcar #'car (database-query query database nil nil))))
(defmethod database-list-attributes (table (database oracle-database) &key owner)
(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))))
+ (cond ((null owner)
+ (format nil "select column_name from user_tab_columns where table_name='~A'"
+ table))
+ ((eq owner :all)
+ (format nil "select column_name from all_tab_columns where table_name='~A'"
+ table))
+ (t
+ (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)))))
(mapcar #'car (database-query query database nil nil))))
(defmethod database-attribute-type (attribute (table string)
(database oracle-database)
&key (owner nil))
- (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))))
+ (let ((query
+ (cond ((null 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))
+ ((eq owner :all)
+ (format nil
+ "select data_type,data_length,data_scale,nullable from all_tab_columns where table_name='~A' and column_name='~A'"
+ table attribute))
+ (t
+ (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)))))
(destructuring-bind (type length scale nullable) (car (database-query query database :auto nil))
- (values (ensure-keyword type) length scale
+ (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
;; list; or if there are no more rows, signal an error if EOF-ERRORP,
;; or return EOF-VALUE otherwise.
;; STREAM which has no more data, and QC is not a STREAM, we signal
;; DBI-ERROR instead.
-(uffi:def-type short-array '(:array :short))
-(uffi:def-type int-pointer '(* :int))
-(uffi:def-type double-pointer '(* :double))
+(uffi:def-type short-array (:array :short nil))
+(uffi:def-type int-array (:array :int nil))
+(uffi:def-type double-array (:array :double nil))
+(uffi:def-type int-pointer (* :int))
+(uffi:def-type double-pointer (* :double))
;;; the result of a database query: a cursor through a table
(defstruct (oracle-result-set (:print-function print-query-cursor)
(cds) ; (error "missing CDS") ; column descriptors
; :type (simple-array cd 1)
; :read-only t)
- (n-from-oci
+ (n-from-oci
0 ; buffered rows: number of rows recv'd
:type (integer 0 #.+n-buf-rows+)) ; from the database on the last read
(n-to-dbi
(defun fetch-row (qc &optional (eof-errorp t) eof-value)
- ;;(declare (optimize (speed 3)))
+ (declare (optimize (speed 3)))
(cond ((zerop (qc-n-from-oci qc))
(if eof-errorp
(error 'sql-database-error :message
(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
+ (#.SQLT-STR
(deref-oci-string b irow (cd-sizeof cd)))
- (#.SQLT-FLT
- (uffi:deref-array b '(:array :double) irow))
- (#.SQLT-INT
+ (#.SQLT-FLT
+ (locally
+ (declare (type double-array b))
+ (uffi:deref-array b '(:array :double) irow)))
+ (#.SQLT-INT
(ecase (cd-sizeof cd)
(4
- (uffi:deref-array b '(:array :int) irow))))
- (#.SQLT-DATE
+ (locally
+ (declare (type int-array b))
+ (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))
value
(cond ((qc-oci-end-seen-p qc)
(setf (qc-n-from-oci qc) 0))
(t
- (let ((oci-code (%oci-stmt-fetch
+ (let ((oci-code (%oci-stmt-fetch
(deref-vp (qc-stmthp qc))
(deref-vp errhp)
+n-buf-rows+
(values))
(#.+oci-error+ (handle-oci-error :database (qc-db qc)
:nulls-ok t))))
- (uffi:with-foreign-object (rowcount :long)
+ (uffi:with-foreign-object (rowcount 'ub4)
(oci-attr-get (deref-vp (qc-stmthp qc))
+oci-htype-stmt+
- rowcount
+ rowcount
+unsigned-int-null-pointer+
- +oci-attr-row-count+
+ +oci-attr-row-count+
(deref-vp errhp))
(setf (qc-n-from-oci qc)
- (- (uffi:deref-pointer rowcount :long)
+ (- (uffi:deref-pointer rowcount 'ub4)
(qc-total-n-from-oci qc)))
(when (< (qc-n-from-oci qc) +n-buf-rows+)
(setf (qc-oci-end-seen-p qc) t))
(setf (qc-total-n-from-oci qc)
- (uffi:deref-pointer rowcount :long)))))
+ (uffi:deref-pointer rowcount 'ub4)))))
(values)))
;; the guts of the SQL function
;; freeing the STMTHP when it is no longer needed.
(defun sql-stmt-exec (sql-stmt-string db result-types field-names)
- (with-slots (envhp svchp errhp)
- db
- (let ((stmthp (uffi:allocate-foreign-object :pointer-void)))
- (uffi:with-foreign-object (stmttype :unsigned-short)
-
- (oci-handle-alloc (deref-vp envhp)
- stmthp
- +oci-htype-stmt+ 0 +null-void-pointer-pointer+)
- (oci-stmt-prepare (deref-vp stmthp)
- (deref-vp errhp)
- (uffi:convert-to-cstring sql-stmt-string)
- (length sql-stmt-string)
- +oci-ntv-syntax+ +oci-default+ :database db)
- (oci-attr-get (deref-vp stmthp)
- +oci-htype-stmt+
- stmttype
- +unsigned-int-null-pointer+
- +oci-attr-stmt-type+
- (deref-vp errhp)
- :database db)
- (let* ((select-p (= (uffi:deref-pointer stmttype :unsigned-short) 1))
- (iters (if select-p 0 1)))
-
- (oci-stmt-execute (deref-vp svchp)
- (deref-vp stmthp)
- (deref-vp errhp)
- iters 0 +null-void-pointer+ +null-void-pointer+ +oci-default+
- :database db)
- (cond (select-p
- (make-query-cursor db stmthp result-types field-names))
- (t
- (oci-handle-free (deref-vp stmthp) +oci-htype-stmt+)
- nil)))))))
+ (with-slots (envhp svchp errhp) db
+ (uffi:with-foreign-strings ((c-stmt-string sql-stmt-string))
+ (let ((stmthp (uffi:allocate-foreign-object :pointer-void))
+ select-p)
+
+ (uffi:with-foreign-object (stmttype :unsigned-short)
+ (unwind-protect
+ (progn
+ (oci-handle-alloc (deref-vp envhp)
+ stmthp
+ +oci-htype-stmt+ 0 +null-void-pointer-pointer+)
+ (oci-stmt-prepare (deref-vp stmthp)
+ (deref-vp errhp)
+ c-stmt-string
+ (length sql-stmt-string)
+ +oci-ntv-syntax+ +oci-default+ :database db)
+ (oci-attr-get (deref-vp stmthp)
+ +oci-htype-stmt+
+ stmttype
+ +unsigned-int-null-pointer+
+ +oci-attr-stmt-type+
+ (deref-vp errhp)
+ :database db)
+
+ (setq select-p (= (uffi:deref-pointer stmttype :unsigned-short) 1))
+ (let ((iters (if select-p 0 1)))
+
+ (oci-stmt-execute (deref-vp svchp)
+ (deref-vp stmthp)
+ (deref-vp errhp)
+ iters 0 +null-void-pointer+ +null-void-pointer+ +oci-default+
+ :database db)))
+ ;; free resources unless a query
+ (unless select-p
+ (oci-handle-free (deref-vp stmthp) +oci-htype-stmt+)
+ (uffi:free-foreign-object stmthp))))
+
+ (cond
+ (select-p
+ (make-query-cursor db stmthp result-types field-names))
+ (t
+ nil))))))
;; Return a QUERY-CURSOR representing the table returned from the OCI
(defun make-query-cursor (db stmthp result-types field-names)
(let ((qc (%make-query-cursor :db db
:stmthp stmthp
- :cds (make-query-cursor-cds db stmthp
+ :cds (make-query-cursor-cds db stmthp
result-types
field-names))))
(refill-qc-buffers qc)
;; 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
+;; 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
;; the Oracle 9i OCI documentation. -- JJB 20040713
(uffi:def-type byte-pointer (* :byte))
-(uffi:def-type ulong-pointer (* :unsigned-long))
(uffi:def-type void-pointer-pointer (* :void-pointer))
(defun make-query-cursor-cds (database stmthp result-types field-names)
(precision :short)
(scale :byte)
(colname '(* :unsigned-char))
- (colnamelen :unsigned-long)
- (colsize :unsigned-short)
- (colsizesize :unsigned-long)
+ (colnamelen 'ub4)
+ (colsize 'ub2)
(defnp ':pointer-void))
(let ((buffer nil)
(sizeof nil))
(do ((icolumn 0 (1+ icolumn))
(cds-as-reversed-list nil))
- ((not (eql (oci-param-get (deref-vp stmthp)
+ ((not (eql (oci-param-get (deref-vp stmthp)
+oci-htype-stmt+
(deref-vp errhp)
parmdp
;; Decode type of ICOLUMNth column into a type we're prepared to
;; handle in Lisp.
(oci-attr-get (deref-vp parmdp)
- +oci-dtype-param+
+ +oci-dtype-param+
dtype-foreign
+unsigned-int-null-pointer+
+oci-attr-data-type+
(setf (uffi:deref-pointer colsize :unsigned-short) 0)
(setf dtype #.SQLT-STR)
(oci-attr-get (deref-vp parmdp)
- +oci-dtype-param+
+ +oci-dtype-param+
colsize
+unsigned-int-null-pointer+
+oci-attr-data-size+
(deref-vp errhp))
(setq colname-string (uffi:convert-from-foreign-string
(uffi:deref-pointer colname '(* :unsigned-char))
- :length (uffi:deref-pointer colnamelen :unsigned-long))))
+ :length (uffi:deref-pointer colnamelen 'ub4))))
(push (make-cd :name colname-string
:sizeof sizeof
:buffer buffer
+unsigned-short-null-pointer+
(foreign-resource-buffer retcodes)
+oci-default+))))))))
-
+
;; Release the resources associated with a QUERY-CURSOR.
(defun close-query (qc)
(oci-handle-free (deref-vp (qc-stmthp qc)) +oci-htype-stmt+)
+ (uffi:free-foreign-object (qc-stmthp qc))
(let ((cds (qc-cds qc)))
(dotimes (i (length cds))
(release-cd-resources (aref cds i))))
#-oci7
(oci-env-create envhp +oci-default+ +null-void-pointer+
- +null-void-pointer+ +null-void-pointer+
+ +null-void-pointer+ +null-void-pointer+
+null-void-pointer+ 0 +null-void-pointer-pointer+)
+
#+oci7
(progn
(oci-initialize +oci-object+ +null-void-pointer+ +null-void-pointer+
+oci-htype-env+ 0
+null-void-pointer-pointer+)) ;no testing return
(oci-env-init envhp +oci-default+ 0 +null-void-pointer-pointer+))
+
(oci-handle-alloc (deref-vp envhp) errhp
+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)
- +oci-htype-svcctx+
- (deref-vp srvhp) 0 +oci-attr-server+
- (deref-vp errhp))
- ;; oci-handle-alloc((dvoid *)encvhp, (dvoid **)&stmthp, OCI_HTYPE_STMT, 0, 0);
- ;;#+nil
-
(let ((db (make-instance 'oracle-database
:name (database-name-from-spec connection-spec
database-type)
:svchp svchp
:dsn data-source-name
:user user)))
- (oci-logon (deref-vp envhp)
- (deref-vp errhp)
- svchp
- (uffi:convert-to-cstring user) (length user)
- (uffi:convert-to-cstring password) (length password)
- (uffi:convert-to-cstring data-source-name) (length data-source-name)
- :database db)
+ (uffi:with-foreign-strings ((c-user user)
+ (c-password password)
+ (c-data-source-name data-source-name))
+ (oci-logon (deref-vp envhp)
+ (deref-vp errhp)
+ svchp
+ c-user (length user)
+ c-password (length password)
+ c-data-source-name (length data-source-name)
+ :database db))
;; :date-format-length (1+ (length date-format)))))
(setf (slot-value db 'clsql-sys::state) :open)
(database-execute-command
(defun major-client-version-from-string (str)
- (cond
+ (cond
((search " 10g " str)
10)
((search "Oracle9i " str)
(defun major-server-version-from-string (str)
(when (> (length str) 2)
- (cond
+ (cond
((string= "10." (subseq str 0 3))
10)
((string= "9." (subseq str 0 2))
:database database))
(defmethod database-sequence-next (sequence-name (database oracle-database))
- (caar
- (database-query
- (concatenate 'string "SELECT "
- (sql-escape sequence-name)
- ".NEXTVAL FROM dual"
- )
- database :auto nil)))
+ (caar (database-query
+ (concatenate 'string "SELECT "
+ (sql-escape sequence-name)
+ ".NEXTVAL FROM dual")
+ database :auto nil)))
+
+(defmethod database-sequence-last (sequence-name (database oracle-database))
+ (caar (database-query
+ (concatenate 'string "SELECT "
+ (sql-escape sequence-name)
+ ".CURRVAL FROM dual")
+ database :auto nil)))
(defmethod database-set-sequence-position (name position (database oracle-database))
(without-interrupts
(let* ((next (database-sequence-next name database))
(incr (- position next)))
- (database-execute-command
- (format nil "ALTER SEQUENCE ~A INCREMENT BY ~D" name incr)
- database)
+ (unless (zerop incr)
+ (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)
(defmethod database-list-sequences ((database oracle-database) &key owner)
(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")))
+ (cond ((null owner)
+ "select sequence_name from user_sequences")
+ ((eq owner :all)
+ "select sequence_name from all_sequences")
+ (t
+ (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)))))
(mapcar #'car (database-query query database nil nil))))
(defmethod database-execute-command (sql-expression (database oracle-database))
(defmethod database-query-result-set ((query-expression string)
- (database oracle-database)
+ (database oracle-database)
&key full-set result-types)
(let ((cursor (sql-stmt-exec query-expression database result-types nil)))
(if full-set
(defmethod database-dump-result-set (result-set (database oracle-database))
- (close-query result-set))
+ (close-query result-set))
(defmethod database-store-next-row (result-set (database oracle-database) list)
(let* ((eof-value :eof)
projects / clsql.git / blobdiff