(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
likely that we'll have to worry about the CMUCL limit."))
+(uffi:def-type vp-type :pointer-void)
+(uffi:def-type vpp-type (* :pointer-void))
+
(defmacro deref-vp (foreign-object)
- `(uffi:deref-pointer ,foreign-object :pointer-void))
+ `(the vp-type (uffi:deref-pointer (the vpp-type ,foreign-object) :pointer-void)))
+
+(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))
;; constants - from OCI?
(eval-when (:compile-toplevel :load-toplevel :execute)
(defconstant SQLT-NUMBER 2)
(defconstant SQLT-INT 3)
- (defconstant SQLT-STR 5)
(defconstant SQLT-FLT 4)
+ (defconstant SQLT-STR 5)
(defconstant SQLT-DATE 12))
;;; Note that despite the suggestive class name (and the way that the
holding multiple date strings in fixed-width fields, we need to know
the length of that format.")
(server-version
- :type string
+ :type (or null string)
:initarg :server-version
: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")))
;;; Handle the messy case of return code=+oci-error+, querying the
(defun handle-oci-error (&key database nulls-ok)
(cond (database
- (with-slots (errhp)
- 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)
- (uffi:ensure-char-storable (code-char 0)))
-
+ (uffi:ensure-char-storable (code-char 0)))
(setf (uffi:deref-pointer errcode :long) 0)
- (oci-error-get (deref-vp errhp) 1
- (uffi:make-null-pointer :unsigned-char)
- errcode errbuf +errbuf-len+ +oci-htype-error+)
+
+ (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
(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.
#+nil
(progn
- (trace oci-initialize #+oci-8-1-5 oci-env-create oci-handle-alloc oci-logon
+ (trace #-oci7 oci-env-create oci-initialize oci-handle-alloc oci-logon
oci-error-get oci-stmt-prepare oci-stmt-execute
oci-param-get oci-logon oci-attr-get oci-define-by-pos oci-stmt-fetch)
(setf debug::*debug-print-length* nil))
-;;;; the OCI library, part V: converting from OCI representations to Lisp
-;;;; representations
-
;; Return the INDEXth string of the OCI array, represented as Lisp
;; SIMPLE-STRING. SIZE is the size of the fixed-width fields used by
;; Oracle to store strings within the array.
-;; In the wild world of databases, trailing spaces aren't generally
-;; significant, since e.g. "LARRY " and "LARRY " are the same string
-;; stored in different fixed-width fields. OCI drops trailing spaces
-;; for us in some cases but apparently not for fields of fixed
-;; character width, e.g.
-;;
-;; (dbi:sql "create table employees (name char(15), job char(15), city
-;; char(15), rate float)" :db orcl :types :auto)
-;; In order to map the "same string" property above onto Lisp equality,
-;; we drop trailing spaces in all cases:
-
-(uffi:def-type string-array (:array :unsigned-char))
+(uffi:def-type string-pointer (* :unsigned-char))
(defun deref-oci-string (arrayptr string-index size)
- (declare (type string-array arrayptr))
+ (declare (type string-pointer arrayptr))
(declare (type (mod #.+n-buf-rows+) string-index))
(declare (type (and unsigned-byte fixnum) size))
- (let* ((raw (uffi:convert-from-foreign-string
- (uffi:make-pointer
- (+ (uffi:pointer-address arrayptr) (* string-index size))
- :unsigned-char)))
- (trimmed (string-trim " " raw)))
- (if (equal trimmed "NULL") nil trimmed)))
+ (let ((str (uffi:convert-from-foreign-string
+ (uffi:make-pointer
+ (+ (uffi:pointer-address arrayptr) (* string-index size))
+ :unsigned-char))))
+ (if (string-equal str "NULL") nil str)))
;; the OCI library, part Z: no-longer used logic to convert from
;; Oracle's binary date representation to Common Lisp's native date
(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)))
-
-(defmethod list-all-table-columns (table (db oracle-database))
- (declare (string table))
- (let* ((sql-stmt (concatenate
- 'simple-string
- "select "
- "'',"
- "all_tables.OWNER,"
- "'',"
- "user_tab_columns.COLUMN_NAME,"
- "user_tab_columns.DATA_TYPE from user_tab_columns,"
- "all_tables where all_tables.table_name = '" table "'"
- " and user_tab_columns.table_name = '" table "'"))
- (preresult (database-query sql-stmt db :auto nil)))
- ;; PRERESULT is like RESULT except that it has a name instead of
- ;; type codes in the fifth column of each row. To fix this, we
- ;; destructively modify PRERESULT.
- (dolist (preresult-row preresult)
- (setf (fifth preresult-row)
- (if (find (fifth preresult-row)
- #("NUMBER" "DATE")
- :test #'string=)
- 2 ; numeric
- 1))) ; string
- preresult))
+ (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 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
(#.SQLT-FLT
(uffi:deref-array b '(:array :double) irow))
(#.SQLT-INT
- (uffi:deref-array b '(:array :int) irow))
+ (ecase (cd-sizeof cd)
+ (4
+ (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)
(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)
;; debugging only
+(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)
(declare (optimize (safety 3) #+nil (speed 3))
(type oracle-database database)
(type pointer-pointer-void stmthp))
(with-slots (errhp) database
(uffi:with-foreign-objects ((dtype-foreign :unsigned-short)
- (parmdp ':pointer-void)
- (precision :byte)
- (scale :byte)
- (colname '(* :unsigned-char))
- (colnamelen :unsigned-long)
- (colsize :unsigned-long)
- (colsizesize :unsigned-long)
- (defnp ':pointer-void))
+ (parmdp :pointer-void)
+ (precision :byte)
+ (scale :byte)
+ (colname '(* :unsigned-char))
+ (colnamelen :unsigned-long)
+ (colsize :unsigned-long)
+ (colsizesize :unsigned-long)
+ (defnp ':pointer-void))
(let ((buffer nil)
(sizeof nil))
(do ((icolumn 0 (1+ icolumn))
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
dtype-foreign
- (uffi:make-null-pointer :unsigned-int)
+ +unsigned-int-null-pointer+
+oci-attr-data-type+
(deref-vp errhp))
(let ((dtype (uffi:deref-pointer dtype-foreign :unsigned-short)))
+ (declare (fixnum dtype))
(case dtype
(#.SQLT-DATE
(setf buffer (acquire-foreign-resource :unsigned-char
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
precision
- (uffi:make-null-pointer :unsigned-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 :unsigned-int)
+ +unsigned-int-null-pointer+
+oci-attr-scale+
(deref-vp errhp))
(let ((*scale (uffi:deref-pointer scale :byte))
(*precision (uffi:deref-pointer precision :byte)))
+
;;(format t "scale=~d, precision=~d~%" *scale *precision)
(cond
- ((or (zerop *scale)
- (and (minusp *scale) (< *precision 10)))
+ ((or (and (minusp *scale) (zerop *precision))
+ (and (zerop *scale) (plusp *precision)))
(setf buffer (acquire-foreign-resource :int +n-buf-rows+)
sizeof 4 ;; sizeof(int)
dtype #.SQLT-INT))
(t
(setf buffer (acquire-foreign-resource :double +n-buf-rows+)
sizeof 8 ;; sizeof(double)
- dtype #.SQLT-FLT)))) )
+ dtype #.SQLT-FLT)))))
;; Default to SQL-STR
- (t
- (setf (uffi:deref-pointer colsize :unsigned-long) 0
- dtype #.SQLT-STR)
+ (t
+ (setf (uffi:deref-pointer colsize :unsigned-long) 0)
+ (setf dtype #.SQLT-STR)
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
colsize
- (uffi:make-null-pointer :unsigned-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))))
defnp
(deref-vp errhp)
(1+ icolumn) ; OCI 1-based indexing again
- (uffi:with-cast-pointer (vp (foreign-resource-buffer buffer) :void)
- vp)
+ (foreign-resource-buffer buffer)
sizeof
dtype
- (uffi:with-cast-pointer (vp (foreign-resource-buffer indicators) :void)
- vp)
- (uffi:make-null-pointer :unsigned-short)
- (uffi:with-cast-pointer (vp (foreign-resource-buffer retcodes) :unsigned-short)
- vp)
+ (foreign-resource-buffer indicators)
+ +unsigned-short-null-pointer+
+ (foreign-resource-buffer retcodes)
+oci-default+))))))))
;; Release the resources associated with a QUERY-CURSOR.
;; error-handling mechanism themselves) so we just assert they
;; work.
(setf (deref-vp envhp) +null-void-pointer+)
- #+oci-8-1-5
- (progn
- (oci-env-create envhp +oci-default+ +null-void-pointer+
- +null-void-pointer+ +null-void-pointer+
- +null-void-pointer+ 0 +null-void-pointer-pointer+)
- (oci-handle-alloc envhp
- (deref-vp errhp)
- +oci-htype-error+ 0
- +null-void-pointer-pointer+))
- #-oci-8-1-5
+ #-oci7
+ (oci-env-create envhp +oci-default+ +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+
+null-void-pointer+ +null-void-pointer-pointer+)
(ignore-errors (oci-handle-alloc +null-void-pointer+ envhp
+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+)
- (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 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 server-version (uffi:convert-from-foreign-string buf)))
- (setq db (make-instance 'oracle-database
- :name (database-name-from-spec connection-spec
- database-type)
- :envhp envhp
- :errhp errhp
- :database-type :oracle
- :svchp svchp
- :dsn data-source-name
- :user user
- :server-version server-version
- :major-version-number (major-version-from-string
- server-version)))
-
+ (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)
+ :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
;; :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.
(push row reversed-result))))))
-(defmethod database-create-sequence
- (sequence-name (database oracle-database))
+(defmethod database-create-sequence (sequence-name (database oracle-database))
(execute-command
- (concatenate 'string "CREATE SEQUENCE "
- (sql-escape sequence-name))
+ (concatenate 'string "CREATE SEQUENCE " (sql-escape sequence-name))
:database database))
-(defmethod database-drop-sequence
- (sequence-name (database oracle-database))
+(defmethod database-drop-sequence (sequence-name (database oracle-database))
(execute-command
- (concatenate 'string "DROP SEQUENCE "
- (sql-escape sequence-name))
+ (concatenate 'string "DROP SEQUENCE " (sql-escape sequence-name))
:database database))
(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 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)
+ (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)
- ;; HACK HACK HACK
- (database-query "commit" database nil nil)
+ (when (database-autocommit database)
+ (oracle-commit database))
t)
do (setf (nth i list) (nth i row)))
list)))
-(defmethod clsql-sys:database-start-transaction ((database oracle-database))
- (call-next-method))
+(defmethod database-start-transaction ((database oracle-database))
+ (call-next-method)
+ ;; Not needed with simple transaction
+ #+ignore
+ (with-slots (svchp errhp) database
+ (oci-trans-start (deref-vp svchp)
+ (deref-vp errhp)
+ 60
+ +oci-trans-new+))
+ t)
-;;(with-slots (svchp errhp) database
-;; (osucc (oci-trans-start (uffi:deref-pointer svchp)
-;; (uffi:deref-pointer errhp)
-;; 60
-;; +oci-trans-new+)))
-;; t)
-
-(defmethod clsql-sys:database-commit-transaction ((database oracle-database))
- (call-next-method)
+(defun oracle-commit (database)
(with-slots (svchp errhp) database
- (osucc (oci-trans-commit (deref-vp svchp)
- (deref-vp errhp)
- 0)))
+ (osucc (oci-trans-commit (deref-vp svchp)
+ (deref-vp errhp)
+ 0))))
+
+(defmethod database-commit-transaction ((database oracle-database))
+ (call-next-method)
+ (oracle-commit database)
t)
-(defmethod clsql-sys:database-abort-transaction ((database oracle-database))
+(defmethod database-abort-transaction ((database oracle-database))
(call-next-method)
(osucc (oci-trans-rollback (deref-vp (svchp database))
(deref-vp (errhp database))
0))
t)
-(defparameter *constraint-types*
- '(("NOT-NULL" . "NOT NULL")))
-
-(defmethod database-output-sql ((str string) (database oracle-database))
- (if (and (null (position #\' str))
- (null (position #\\ str)))
- (format nil "'~A'" str)
- (let* ((l (length str))
- (buf (make-string (+ l 3))))
- (setf (aref buf 0) #\')
- (do ((i 0 (incf i))
- (j 1 (incf j)))
- ((= i l) (setf (aref buf j) #\'))
- (if (= j (- (length buf) 1))
- (setf buf (adjust-array buf (+ (length buf) 1))))
- (cond ((eql (aref str i) #\')
- (setf (aref buf j) #\')
- (incf j)))
- (setf (aref buf j) (aref str i)))
- buf)))
-
-
;; Specifications
(defmethod db-type-has-bigint? ((type (eql :oracle)))
projects / clsql.git / blobdiff