X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-oracle%2Foracle-sql.lisp;h=d5ed576e38812523e0e86600f9bd276590c3c174;hb=8e4ed03c227c7476acf9888d94fa6d1426989076;hp=780713e05bb8f736e230d6fb7869e5c54e20b3f7;hpb=39bc32836bdf5bdab576ba1e4ef3762f46000b98;p=clsql.git diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp index 780713e..d5ed576 100644 --- a/db-oracle/oracle-sql.lisp +++ b/db-oracle/oracle-sql.lisp @@ -139,22 +139,24 @@ the length of that format."))) (errcode :long)) (setf (uffi:deref-array errbuf '(:array :unsigned-char) 0) (code-char 0)) ; i.e. init to empty string (setf (uffi:deref-pointer errcode :long) 0) - (oci-error-get (uffi:deref-pointer errhp '(* :void)) 1 "" (c-& errcode :unsigned-char) - (c-& errbuf :unsigned-char) +errbuf-len+ +oci-htype-error+) + (oci-error-get (uffi:deref-pointer errhp void-pointer) 1 + (uffi:make-null-pointer :unsigned-char) + errcode errbuf +errbuf-len+ +oci-htype-error+) (let ((subcode (uffi:deref-pointer errcode :long))) (unless (and nulls-ok (= subcode +null-value-returned+)) (error 'clsql-sql-error :database database :errno subcode + :expression nil :error (uffi:convert-from-foreign-string errbuf))))))) (nulls-ok (error 'clsql-sql-error :database database - :error "can't handle NULLS-OK without ERRHP")) + :message "can't handle NULLS-OK without ERRHP")) (t (error 'clsql-sql-error :database database - :error "OCI Error (and no ERRHP available to find subcode)")))) + :message "OCI Error (and no ERRHP available to find subcode)")))) ;;; Require an OCI success code. ;;; @@ -208,7 +210,7 @@ the length of that format."))) (declare (type (mod #.+n-buf-rows+) string-index)) (declare (type (and unsigned-byte fixnum) size)) (let* ((raw (uffi:convert-from-foreign-string - (uffi:pointer-address (uffi:deref-array arrayptr '(:array :unsigned-char) (* string-index size))))) + (+ (uffi:pointer-address arrayptr) (* string-index size)))) (trimmed (string-trim " " raw))) (if (equal trimmed "NULL") nil trimmed))) @@ -335,8 +337,40 @@ the length of that format."))) (uffi:def-type short-pointer '(* :short)) (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) + (:conc-name qc-) + (:constructor %make-query-cursor)) + (db (error "missing DB") ; db conn. this table is associated with + :type db + :read-only t) + (stmthp (error "missing STMTHP") ; the statement handle used to create +;; :type alien ; this table. owned by the QUERY-CURSOR + :read-only t) ; object, deallocated on CLOSE-QUERY + (cds) ; (error "missing CDS") ; column descriptors +; :type (simple-array cd 1) + ; :read-only t) + (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 + 0 ; number of buffered rows returned, i.e. + :type (integer 0 #.+n-buf-rows+)) ; the index, within the buffered rows, + ; of the next row which hasn't already + ; been returned + (total-n-from-oci + 0 ; total number of bytes recv'd from OCI + :type unsigned-byte) ; in all reads + (oci-end-seen-p nil)) ; Have we seen the end of OCI + ; data, i.e. OCI returning + ; less data than we requested? + ; OCI doesn't seem to like us + ; to try to read more data + ; from it after that.. + + (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 'clsql-error :message @@ -356,7 +390,7 @@ the length of that format."))) (value (let ((arb (foreign-resource-buffer (cd-indicators cd)))) (declare (type short-pointer arb)) - (unless (= (uffi:deref-array arb :int irow) -1) + (unless (= (uffi:deref-array arb '(:array :int) irow) -1) (ecase (cd-oci-data-type cd) (#.SQLT-STR (deref-oci-string b irow (cd-sizeof cd))) (#.SQLT-FLT (uffi:deref-array b '(:array :double) irow)) @@ -385,7 +419,9 @@ the length of that format."))) :nulls-ok t)))) (uffi:with-foreign-object (rowcount :long) (oci-attr-get (uffi:deref-pointer (qc-stmthp qc) void-pointer) +oci-htype-stmt+ - (c-& rowcount :long) nil +oci-attr-row-count+ + rowcount + (uffi:make-null-pointer :unsigned-long) + +oci-attr-row-count+ (uffi:deref-pointer errhp void-pointer)) (setf (qc-n-from-oci qc) (- (uffi:deref-pointer rowcount :long) (qc-total-n-from-oci qc))) @@ -413,22 +449,32 @@ the length of that format."))) (defun sql-stmt-exec (sql-stmt-string db &key types) (with-slots (envhp svchp errhp) db - (let ((stmthp (uffi:allocate-foreign-object (* :void)))) + (let ((stmthp (uffi:allocate-foreign-object void-pointer))) (uffi:with-foreign-object (stmttype :unsigned-short) - (oci-handle-alloc (uffi:deref-pointer envhp void-pointer) (c-& stmthp void-pointer) +oci-htype-stmt+ 0 nil) - (oci-stmt-prepare (uffi:deref-pointer stmthp void-pointer) (uffi:deref-pointer errhp void-pointer) - sql-stmt-string (length sql-stmt-string) + (oci-handle-alloc (uffi:deref-pointer envhp void-pointer) + stmthp + +oci-htype-stmt+ 0 +null-void-pointer-pointer+) + (oci-stmt-prepare (uffi:deref-pointer stmthp void-pointer) + (uffi:deref-pointer errhp void-pointer) + (uffi:convert-to-cstring sql-stmt-string) + (length sql-stmt-string) +oci-ntv-syntax+ +oci-default+ :database db) - (oci-attr-get (uffi:deref-pointer stmthp void-pointer) +oci-htype-stmt+ - (c-& stmttype :unsigned-short) nil +oci-attr-stmt-type+ - (uffi:deref-pointer errhp void-pointer) :database db) + (oci-attr-get (uffi:deref-pointer stmthp void-pointer) + +oci-htype-stmt+ + stmttype + (uffi:make-null-pointer :unsigned-int) + +oci-attr-stmt-type+ + (uffi:deref-pointer errhp void-pointer) + :database db) (let* ((select-p (= (uffi:deref-pointer stmttype :unsigned-short) 1)) (iters (if select-p 0 1))) - (oci-stmt-execute (uffi:deref-pointer svchp void-pointer) (uffi:deref-pointer stmthp void-pointer) + (oci-stmt-execute (uffi:deref-pointer svchp void-pointer) + (uffi:deref-pointer stmthp void-pointer) (uffi:deref-pointer errhp void-pointer) - iters 0 nil nil +oci-default+ :database db) + iters 0 +null-void-pointer+ +null-void-pointer+ +oci-default+ + :database db) (cond (select-p (make-query-cursor db stmthp types)) (t @@ -511,7 +557,7 @@ the length of that format."))) (defun make-query-cursor-cds (database stmthp types) - (declare (optimize (speed 3)) + (declare (optimize (safety 3) #+nil (speed 3)) (type oracle-database database) (type pointer-pointer-void stmthp)) (with-slots (errhp) @@ -531,47 +577,57 @@ the length of that format."))) (sizeof nil)) (do ((icolumn 0 (1+ icolumn)) (cds-as-reversed-list nil)) - ((not (eql (oci-param-get (uffi:deref-pointer stmthp void-pointer) +oci-htype-stmt+ + ((not (eql (oci-param-get (uffi:deref-pointer stmthp void-pointer) + +oci-htype-stmt+ (uffi:deref-pointer errhp void-pointer) - (uffi:pointer-address parmdp) + parmdp (1+ icolumn) :database database) +oci-success+)) (coerce (reverse cds-as-reversed-list) 'simple-vector)) ;; Decode type of ICOLUMNth column into a type we're prepared to ;; handle in Lisp. - (oci-attr-get parmdp +oci-dtype-param+ (uffi:pointer-address dtype) - nil +oci-attr-data-type+ (uffi:deref-pointer errhp void-pointer)) + (oci-attr-get (uffi:deref-pointer parmdp void-pointer) + +oci-dtype-param+ + dtype + (uffi:make-null-pointer :int) +oci-attr-data-type+ + (uffi:deref-pointer errhp void-pointer)) (case dtype (#.SQLT-DATE - (setf buffer (acquire-foreign-resource char (* 32 +n-buf-rows+))) + (setf buffer (acquire-foreign-resource :char (* 32 +n-buf-rows+))) (setf sizeof 32 dtype #.SQLT-STR)) (2 ;; number ;;(oci-attr-get parmdp +oci-dtype-param+ ;;(addr precision) nil +oci-attr-precision+ ;;(uffi:deref-pointer errhp)) - (oci-attr-get parmdp +oci-dtype-param+ - (uffi:pointer-address scale) nil +oci-attr-scale+ + (oci-attr-get (uffi:deref-pointer parmdp void-pointer) + +oci-dtype-param+ + scale + (uffi:make-null-pointer :int) +oci-attr-scale+ (uffi:deref-pointer errhp void-pointer)) (cond ((zerop scale) - (setf buffer (acquire-foreign-resource signed +n-buf-rows+) + (setf buffer (acquire-foreign-resource :init +n-buf-rows+) sizeof 4 ;; sizeof(int) dtype #.SQLT-INT)) (t - (setf buffer (acquire-foreign-resource double-float +n-buf-rows+) + (setf buffer (acquire-foreign-resource :double +n-buf-rows+) sizeof 8 ;; sizeof(double) dtype #.SQLT-FLT)))) (t ; Default to SQL-STR - (setf colsize 0 + (setf (uffi:deref-pointer colsize :unsigned-long) 0 dtype #.SQLT-STR) - (oci-attr-get parmdp +oci-dtype-param+ (uffi:pointer-address colsize) - (uffi:pointer-address colsizesize) +oci-attr-data-size+ + (oci-attr-get (uffi:deref-pointer parmdp void-pointer) + +oci-dtype-param+ + colsize + (uffi:make-null-pointer :int) ;; (uffi:pointer-address colsizesize) + +oci-attr-data-size+ (uffi:deref-pointer errhp void-pointer)) - (let ((colsize-including-null (1+ colsize))) - (setf buffer (acquire-foreign-resource char (* +n-buf-rows+ colsize-including-null))) + (let ((colsize-including-null (1+ (uffi:deref-pointer colsize :unsigned-long)))) + (setf buffer (acquire-foreign-resource + :char (* +n-buf-rows+ colsize-including-null))) (setf sizeof colsize-including-null)))) - (let ((retcodes (acquire-foreign-resource short +n-buf-rows+)) - (indicators (acquire-foreign-resource short +n-buf-rows+))) + (let ((retcodes (acquire-foreign-resource :short +n-buf-rows+)) + (indicators (acquire-foreign-resource :short +n-buf-rows+))) (push (make-cd :name "col" ;(subseq colname 0 colnamelen) :sizeof sizeof :buffer buffer @@ -580,14 +636,14 @@ the length of that format."))) :indicators indicators) cds-as-reversed-list) (oci-define-by-pos (uffi:deref-pointer stmthp void-pointer) - (uffi:pointer-address defnp) + defnp (uffi:deref-pointer errhp void-pointer) (1+ icolumn) ; OCI 1-based indexing again (foreign-resource-buffer buffer) sizeof dtype (foreign-resource-buffer indicators) - nil + (uffi:make-null-pointer :unsigned-short) (foreign-resource-buffer retcodes) +oci-default+))))))) @@ -610,24 +666,16 @@ the length of that format."))) (values)) -(defmethod print-object ((db oracle-database) stream) - (print-unreadable-object (db stream :type t :identity t) - (format stream "\"/~a/~a\"" - (slot-value db 'data-source-name) - (slot-value db 'user)))) - - (defmethod database-name-from-spec (connection-spec (database-type (eql :oracle))) - (check-connection-spec connection-spec database-type (user password dsn)) - (destructuring-bind (user password dsn) - connection-spec + (check-connection-spec connection-spec database-type (dsn user password)) + (destructuring-bind (dsn user password) connection-spec (declare (ignore password)) - (concatenate 'string "/" dsn "/" user))) + (concatenate 'string dsn "/" user))) (defmethod database-connect (connection-spec (database-type (eql :oracle))) - (check-connection-spec connection-spec database-type (user password dsn)) - (destructuring-bind (user password data-source-name) + (check-connection-spec connection-spec database-type (dsn user password)) + (destructuring-bind (data-source-name user password) connection-spec (let ((envhp (uffi:allocate-foreign-object (* :void))) (errhp (uffi:allocate-foreign-object (* :void))) @@ -638,47 +686,58 @@ the length of that format."))) ;; handle errors very gracefully (since they're part of the ;; error-handling mechanism themselves) so we just assert they ;; work. - (setf (uffi:deref-pointer envhp void-pointer) nil) + (setf (uffi:deref-pointer envhp void-pointer) +null-void-pointer+) #+oci-8-1-5 (progn - (oci-env-create (c-& envhp void-pointer) +oci-default+ nil nil nil nil 0 nil) - (oci-handle-alloc (uffi:deref-pointer envhp void-pointer) - (c-& errhp void-pointer) +oci-htype-error+ 0 nil)) + (oci-env-create envhp +oci-default+ nil nil nil nil 0 nil) + (oci-handle-alloc envhp + (c-& errhp void-pointer) +oci-htype-error+ 0 + +null-void-pointer-pointer+)) #-oci-8-1-5 (progn - (oci-initialize +oci-object+ nil nil nil nil) - (ignore-errors (oci-handle-alloc nil (c-& envhp void-pointer) +oci-htype-env+ 0 nil)) ;no testing return - (oci-env-init (c-& envhp void-pointer) +oci-default+ 0 nil) - (oci-handle-alloc (uffi:deref-pointer envhp void-pointer) (c-& errhp void-pointer) +oci-htype-error+ 0 nil) - (oci-handle-alloc (uffi:deref-pointer envhp void-pointer) (c-& srvhp void-pointer) +oci-htype-server+ 0 nil) - ;;(osucc (oci-server-attach srvhp errhp nil 0 +oci-default+)) - (oci-handle-alloc (uffi:deref-pointer envhp void-pointer) (c-& svchp void-pointer) +oci-htype-svcctx+ 0 nil) + (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 (uffi:deref-pointer envhp void-pointer) errhp + +oci-htype-error+ 0 +null-void-pointer-pointer+) + (oci-handle-alloc (uffi:deref-pointer envhp void-pointer) srvhp + +oci-htype-server+ 0 +null-void-pointer-pointer+) + (oci-server-attach (uffi:deref-pointer srvhp void-pointer) + (uffi:deref-pointer errhp void-pointer) + (uffi:make-null-pointer :unsigned-char) + 0 +oci-default+) + (oci-handle-alloc (uffi:deref-pointer envhp void-pointer) svchp + +oci-htype-svcctx+ 0 +null-void-pointer-pointer+) + (oci-attr-set (uffi:deref-pointer svchp void-pointer) + +oci-htype-svcctx+ + (uffi:deref-pointer srvhp void-pointer) 0 +oci-attr-server+ + (uffi:deref-pointer errhp void-pointer)) ;; oci-handle-alloc((dvoid *)encvhp, (dvoid **)&stmthp, OCI_HTYPE_STMT, 0, 0); - #+nil - (oci-attr-set (uffi:deref-pointer svchp void-pointer) +oci-htype-svcctx+ - (uffi:deref-pointer srvhp void-pointer) 0 +oci-attr-server+ errhp) + ;;#+nil ) - - #+nil - (format t "Logging in as user '~A' to database ~A~%" - user password data-source-name) - (oci-logon (uffi:deref-pointer envhp void-pointer) (uffi:deref-pointer errhp void-pointer) (c-& svchp void-pointer) - user (length user) - password (length password) - data-source-name (length data-source-name)) (let ((db (make-instance 'oracle-database :name (database-name-from-spec connection-spec database-type) :envhp envhp :errhp errhp - :db-type :oracle + :database-type :oracle :svchp svchp :dsn data-source-name :user user))) - ;; :date-format-length (1+ (length date-format))))) - (clsql:execute-command - (format nil "alter session set NLS_DATE_FORMAT='~A'" - (date-format db)) :database db) + (oci-logon (uffi:deref-pointer envhp void-pointer) + (uffi:deref-pointer errhp void-pointer) + 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) + ;; :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) db)))) @@ -708,7 +767,7 @@ the length of that format."))) (defmethod database-query (query-expression (database oracle-database) result-types field-names) (let ((cursor (sql-stmt-exec query-expression database :types :auto))) - (declare (type (or query-cursor null) cursor)) + ;; (declare (type (or query-cursor null) cursor)) (if (null cursor) ; No table was returned. (values) (do ((reversed-result nil)) @@ -744,8 +803,7 @@ the length of that format."))) ) :database database))) -(defmethod database-execute-command - (sql-expression (database oracle-database)) +(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) @@ -787,34 +845,6 @@ the length of that format."))) (cd-oci-data-type cd) (cd-sizeof cd)))) -;;; the result of a database query: a cursor through a table -(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 - :type db - :read-only t) - (stmthp (error "missing STMTHP") ; the statement handle used to create -;; :type alien ; this table. owned by the QUERY-CURSOR - :read-only t) ; object, deallocated on CLOSE-QUERY - (cds) ; (error "missing CDS") ; column descriptors -; :type (simple-array cd 1) -; :read-only t) - (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 0 ; number of buffered rows returned, i.e. - :type (integer 0 #.+n-buf-rows+)) ; the index, within the buffered rows, - ; of the next row which hasn't already - ; been returned - (total-n-from-oci 0 ; total number of bytes recv'd from OCI - :type unsigned-byte) ; in all reads - (oci-end-seen-p nil)) ; Have we seen the end of OCI - ; data, i.e. OCI returning - ; less data than we requested? - ; OCI doesn't seem to like us - ; to try to read more data - ; from it after that.. - (defun print-query-cursor (qc stream depth) (declare (ignore depth)) (print-unreadable-object (qc stream :type t :identity t)