parameter-columns))
(defgeneric get-odbc-info (src info-type))
+(defvar *reuse-query-objects* t)
+
;;; SQL Interface
db))
(defun disconnect (database)
+ "This is set in the generic-odbc-database disconnect-fn slot so xref fails
+ but this does get called on generic ODBC connections "
(with-slots (hdbc queries) database
(dolist (query queries)
- (if (query-active-p query)
- (with-slots (hstmt) query
- (when hstmt
- (%free-statement hstmt :drop)
- (setf hstmt nil)))))
+ (db-close-query query :drop-p T))
(when (db-hstmt database)
(%free-statement (db-hstmt database) :drop))
(%disconnect hdbc)))
(coerce (column-names query) 'list))))
(db-close-query query))))
-(defun list-table-indexes (table &key db unique hstmt)
+(defun list-table-indexes (table &key db unique hstmt
+ &aux (table
+ (princ-to-string
+ (clsql-sys::unescaped-database-identifier table))))
(declare (ignore hstmt))
(let ((query (get-free-query db)))
(unwind-protect
- (progn
- (with-slots (hstmt) query
- (unless hstmt
- (setf hstmt (%new-statement-handle (hdbc db))))
- (%table-statistics table hstmt :unique unique)
- (%initialize-query query nil nil)
- (values
- (db-fetch-query-results query)
- (coerce (column-names query) 'list))))
+ (progn
+ (with-slots (hstmt) query
+ (unless hstmt
+ (setf hstmt (%new-statement-handle (hdbc db))))
+ (%table-statistics table hstmt :unique unique)
+ (%initialize-query query nil nil)
+ (values
+ (db-fetch-query-results query)
+ (coerce (column-names query) 'list))))
(db-close-query query))))
-(defun list-all-table-columns (table &key db hstmt)
+(defun list-all-table-columns (table &key db hstmt
+ &aux (table
+ (princ-to-string
+ (clsql-sys::unescaped-database-identifier table))))
(declare (ignore hstmt))
(db-describe-columns db nil nil table nil)) ;; use nil rather than "" for unspecified values
(setf active-p t)))))
;; one for odbc-db is missing
+;; TODO: Seems to be uncalled
(defmethod terminate ((query odbc-query))
;;(format tb::*local-output* "~%*** terminated: ~s" query)
- (with-slots (hstmt) query
- (when hstmt
- ;(%free-statement hstmt :drop)
- (uffi:free-foreign-object hstmt)) ;; ??
- (%dispose-column-ptrs query)))
+ (db-close-query query))
(defun %dispose-column-ptrs (query)
+ "frees memory allocated for query object column-data and column-data-length"
(with-slots (column-data-ptrs column-out-len-ptrs hstmt) query
(loop for data-ptr across column-data-ptrs
- when data-ptr do (uffi:free-foreign-object data-ptr))
- (loop for out-len-ptr across column-out-len-ptrs
- when out-len-ptr do (uffi:free-foreign-object out-len-ptr))))
+ for out-len-ptr across column-out-len-ptrs
+ when data-ptr
+ do (uffi:free-foreign-object data-ptr)
+ when out-len-ptr
+ do (uffi:free-foreign-object out-len-ptr))
+ (setf (fill-pointer column-data-ptrs) 0
+ (fill-pointer column-out-len-ptrs) 0)))
(defmethod db-open-query ((database odbc-db) query-expression
&key arglen col-positions result-types width
(cond ((< 0 precision (query-width query))
(read-data data-ptr c-type sql-type out-len-ptr result-type))
((zerop (get-cast-long out-len-ptr))
- nil)
+ nil)
(t
(read-data-in-chunks hstmt j data-ptr c-type sql-type
out-len-ptr result-type))))))))
"get-free-query finds or makes a nonactive query object, and then sets it to active.
This makes the functions db-execute-command and db-query thread safe."
(with-slots (queries hdbc) database
- (or (clsql-sys:without-interrupts
- (let ((inactive-query (find-if (lambda (query)
- (not (query-active-p query)))
- queries)))
- (when inactive-query
- (with-slots (column-count column-names column-c-types
- width hstmt
- column-sql-types column-data-ptrs
- column-out-len-ptrs column-precisions
- column-scales column-nullables-p)
- inactive-query
- ;;(print column-data-ptrs tb::*local-output*)
- ;;(%dispose-column-ptrs inactive-query)
- (setf column-count 0
- width +max-precision+
- ;; KMR hstmt (%new-statement-handle hdbc)
- (fill-pointer column-names) 0
- (fill-pointer column-c-types) 0
- (fill-pointer column-sql-types) 0
- (fill-pointer column-data-ptrs) 0
- (fill-pointer column-out-len-ptrs) 0
- (fill-pointer column-precisions) 0
- (fill-pointer column-scales) 0
- (fill-pointer column-nullables-p) 0))
- (setf (query-active-p inactive-query) t))
- inactive-query))
+ (or (and *reuse-query-objects*
+ (clsql-sys:without-interrupts
+ (let ((inactive-query (find-if (lambda (query)
+ (not (query-active-p query)))
+ queries)))
+ (when inactive-query
+ (with-slots (column-count column-names column-c-types
+ width hstmt
+ column-sql-types column-data-ptrs
+ column-out-len-ptrs column-precisions
+ column-scales column-nullables-p)
+ inactive-query
+ (setf column-count 0
+ width +max-precision+
+ ;; KMR hstmt (%new-statement-handle hdbc)
+ (fill-pointer column-names) 0
+ (fill-pointer column-c-types) 0
+ (fill-pointer column-sql-types) 0
+ (fill-pointer column-data-ptrs) 0
+ (fill-pointer column-out-len-ptrs) 0
+ (fill-pointer column-precisions) 0
+ (fill-pointer column-scales) 0
+ (fill-pointer column-nullables-p) 0))
+ (setf (query-active-p inactive-query) t))
+ inactive-query)))
(let ((new-query (make-instance 'odbc-query
:database database
;;(clone-database database)
;; get column information
(initialize-column col-nr))))
+ ;; TODO: move this into the above loop
(setf computed-result-types (make-array column-count))
(dotimes (i column-count)
(setf (aref computed-result-types i)
(#.odbc::$SQL_C_FLOAT :float)
(#.odbc::$SQL_C_SSHORT :short)
(#.odbc::$SQL_C_STINYINT :short)
+ (#.odbc::$SQL_C_SBIGINT #.odbc::$ODBC-BIG-TYPE)
(#.odbc::$SQL_C_TYPE_TIMESTAMP :time)
+ (#.odbc::$SQL_C_CHAR ;; TODO: Read this as rational instead of double
+ (or (case (aref column-sql-types i)
+ ((#.odbc::$SQL_NUMERIC #.odbc::$SQL_DECIMAL) :double))
+ T))
+
(t t)))
(t t)))))
query)
-(defun db-close-query (query &key drop-p)
+(defun db-close-query (query &key (drop-p (not *reuse-query-objects*)))
(with-slots (hstmt column-count column-names column-c-types column-sql-types
- column-data-ptrs column-out-len-ptrs column-precisions
- column-scales column-nullables-p) query
- (let ((count (fill-pointer column-data-ptrs)))
- (when (not (zerop count))
- (dotimes (col-nr count)
- (let ((data-ptr (aref column-data-ptrs col-nr))
- (out-len-ptr (aref column-out-len-ptrs col-nr)))
- (declare (ignorable data-ptr out-len-ptr))
- ;; free-statment :unbind frees these
- #+ignore (when data-ptr (uffi:free-foreign-object data-ptr))
- #+ignore (when out-len-ptr (uffi:free-foreign-object out-len-ptr)))))
- (cond ((null hstmt)
- nil)
- (drop-p
- (%free-statement hstmt :drop)
- (setf hstmt nil))
- (t
- (%free-statement hstmt :unbind)
- (%free-statement hstmt :reset)
- (%free-statement hstmt :close)))
- (setf (query-active-p query) nil)))
+ column-data-ptrs column-out-len-ptrs column-precisions
+ column-scales column-nullables-p database) query
+ (%dispose-column-ptrs query)
+ (cond ((null hstmt) nil)
+ (drop-p
+ (%free-statement hstmt :drop)
+ ;; dont free with uffi/ this is a double free and crashes everything
+ ;; (uffi:free-foreign-object hstmt)
+ (setf hstmt nil))
+ (t
+ (%free-statement hstmt :unbind)
+ (%free-statement hstmt :reset)
+ (%free-statement hstmt :close)))
+ (setf (query-active-p query) nil)
+ (when drop-p
+ (clsql-sys:without-interrupts
+ (with-slots (queries) database
+ (setf queries (remove query queries))))))
query)
(defmethod %read-query-data ((database odbc-db) ignore-columns)
(defun sql-to-lisp-type (sql-type)
(ecase sql-type
((#.odbc::$SQL_CHAR #.odbc::$SQL_VARCHAR #.odbc::$SQL_LONGVARCHAR) :string)
- ((#.odbc::$SQL_NUMERIC #.odbc::$SQL_DECIMAL #.odbc::$SQL_BIGINT) :string) ; ??
+ ((#.odbc::$SQL_NUMERIC #.odbc::$SQL_DECIMAL) :string) ; ??
+ (#.odbc::$SQL_BIGINT #.odbc::$ODBC-BIG-TYPE)
(#.odbc::$SQL_INTEGER #.odbc::$ODBC-LONG-TYPE)
(#.odbc::$SQL_SMALLINT :short)
((#.odbc::$SQL_FLOAT #.odbc::$SQL_DOUBLE) #.odbc::$ODBC-LONG-TYPE)
(let ((query (get-free-query database)))
(with-slots (hstmt) query
(unless hstmt (setf hstmt (%new-statement-handle hdbc))))
- (db-prepare-statement query sql parameter-table parameter-columns))))
+ (db-prepare-statement
+ query sql :parameter-table parameter-table :parameter-columns parameter-columns))))
(defmethod db-prepare-statement ((query odbc-query) (sql string)
&key parameter-table parameter-columns)
(defun %db-bind-execute (query &rest parameters)
+ "Only used from db-map-bind-query
+ parameters are released in %reset-query
+ "
(with-slots (hstmt parameter-data-ptrs) query
(loop for parameter in parameters
with data-ptr and size and parameter-string
do
(setf parameter-string
(if (stringp parameter)
- parameter
- (write-to-string parameter))
- size (length parameter-string)
+ parameter
+ (write-to-string parameter))
+ size (length parameter-string)
data-ptr
(uffi:allocate-foreign-string (1+ size)))
(vector-push-extend data-ptr parameter-data-ptrs)
(defun %db-reset-query (query)
+ "Only used from db-map-bind-query
+ parameters are allocated in %db-bind-execute
+ "
(with-slots (hstmt parameter-data-ptrs) query
(prog1
- (db-fetch-query-results query nil)
+ (db-fetch-query-results query nil)
(%free-statement hstmt :reset) ;; but _not_ :unbind !
(%free-statement hstmt :close)
(dotimes (param-nr (fill-pointer parameter-data-ptrs))
projects / clsql.git / blobdiff