(defvar *info-output* nil
"Stream to send SUCCESS_WITH_INFO messages.")
-(defun %null-ptr ()
- (make-null-pointer :byte))
-
(defmacro %put-str (ptr string &optional max-length)
(let ((size (gensym)))
`(let ((,size (length ,string)))
(#.$SQL_INTEGER $SQL_C_SLONG)
(#.$SQL_SMALLINT $SQL_C_SSHORT)
(#.$SQL_DOUBLE $SQL_C_DOUBLE)
- (#.$SQL_FLOAT $SQL_C_FLOAT)
- (#.$SQL_REAL $SQL_C_DOUBLE)
+ (#.$SQL_FLOAT $SQL_C_DOUBLE)
+ (#.$SQL_REAL $SQL_C_FLOAT)
(#.$SQL_DATE $SQL_C_DATE)
(#.$SQL_TIME $SQL_C_TIME)
(#.$SQL_TIMESTAMP $SQL_C_TIMESTAMP)
(#.$SQL_INTEGER (get-cast-int data-ptr))
(#.$SQL_BIGINT (read-from-string
(get-cast-foreign-string data-ptr)))
- (#.$SQL_TINYINT (read-from-string
- (get-cast-foreign-string data-ptr)))
+ (#.$SQL_TINYINT (get-cast-byte data-ptr))
(#.$SQL_DECIMAL
(let ((*read-base* 10))
(read-from-string (get-cast-foreign-string data-ptr))))
(data-ptr
(case c-type ;; add more?
(#.$SQL_C_SLONG (uffi:allocate-foreign-object :long))
- (#.$SQL_C_DOUBLE (uffi:allocate-foreign-object :double))
(#.$SQL_C_DATE (allocate-foreign-object 'sql-c-date))
(#.$SQL_C_TIME (allocate-foreign-object 'sql-c-time))
(#.$SQL_C_TIMESTAMP (allocate-foreign-object 'sql-c-timestamp))
(#.$SQL_C_FLOAT (uffi:allocate-foreign-object :float))
- (#.$SQL_REAL (uffi:allocate-foreign-object :float))
+ (#.$SQL_C_DOUBLE (uffi:allocate-foreign-object :double))
(#.$SQL_C_BIT (uffi:allocate-foreign-object :byte))
- (#.$SQL_C_STINYINT (uffi:allocate-foreign-object :byte))
+ (#.$SQL_C_STINYINT (uffi:allocate-foreign-object :short))
(#.$SQL_C_SSHORT (uffi:allocate-foreign-object :short))
(#.$SQL_C_CHAR (uffi:allocate-foreign-string (1+ size)))
(#.$SQL_C_BINARY (uffi:allocate-foreign-string (1+ (* 2 size))))
(when *break-on-unknown-data-type*
(break "SQL type is ~A, precision ~D, size ~D, C type is ~A"
sql-type precision size c-type))
- (uffi:allocate-foreign-object :pointer-void (1+ size)))))
+ (uffi:allocate-foreign-object :byte (1+ size)))))
(out-len-ptr (uffi:allocate-foreign-object :long)))
(values c-type data-ptr out-len-ptr size long-p)))
;; depending on option, we return a long int or a string; string not implemented
(defun get-connection-option (hdbc option)
- (with-foreign-objects ((param-ptr :long))
+ (with-foreign-object (param-ptr :long)
(with-error-handling (:hdbc hdbc)
(SQLGetConnectOption hdbc option param-ptr)
(deref-pointer param-ptr :long))))
str))))))
(def-type c-timestamp-ptr-type '(* (:struct sql-c-timestamp)))
+(def-type c-time-ptr-type '(* (:struct sql-c-time)))
+(def-type c-date-ptr-type '(* (:struct sql-c-date)))
(defun timestamp-to-universal-time (ptr)
(declare (type c-timestamp-ptr-type ptr))
(defun universal-time-to-timestamp (time &optional (fraction 0))
(multiple-value-bind (sec min hour day month year)
(decode-universal-time time)
- (with-foreign-object (ptr 'sql-c-timestamp)
+ (let ((ptr (allocate-foreign-object 'sql-c-timestamp)))
(setf (get-slot-value ptr 'sql-c-timestamp 'second) sec
(get-slot-value ptr 'sql-c-timestamp 'minute) min
(get-slot-value ptr 'sql-c-timestamp 'hour) hour
ptr))
(defun date-to-universal-time (ptr)
- (declare (type c-timestamp-ptr-type ptr))
+ (declare (type c-date-ptr-type ptr))
(encode-universal-time
0 0 0
(get-slot-value ptr 'sql-c-timestamp 'day)
(get-slot-value ptr 'sql-c-timestamp 'year)))
(defun time-to-universal-time (ptr)
- (declare (type c-timestamp-type ptr))
+ (declare (type c-time-ptr-type ptr))
(encode-universal-time
(get-slot-value ptr 'sql-c-timestamp 'second)
(get-slot-value ptr 'sql-c-timestamp 'minute)
(setf (henv db) (%new-environment-handle)))
(setf (hdbc db) (%new-db-connection-handle (henv db)))
(%sql-connect (hdbc db) data-source-name user password)
- (setf (db-hstmt db) (%new-statement-handle (hdbc db)))
+ #+ignore (setf (db-hstmt db) (%new-statement-handle (hdbc db)))
(when (/= (get-odbc-info db odbc::$SQL_TXN_CAPABLE) odbc::$SQL_TC_NONE)
(if autocommit
(enable-autocommit (hdbc db))
(when hstmt
(%free-statement hstmt :drop)
(setf hstmt nil)))))
- (%free-statement (db-hstmt database) :drop)
+ (when (db-hstmt database)
+ (%free-statement (db-hstmt database) :drop))
(%disconnect hdbc)))
(defmethod get-free-query ((database odbc-db))
"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) database
+ (with-slots (queries hdbc) database
(or (clsql-base-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
+ width hstmt
column-sql-types column-data-ptrs
column-out-len-ptrs column-precisions
column-scales column-nullables-p)
;;(%dispose-column-ptrs inactive-query)
(setf column-count 0
width +max-precision+
+ hstmt (%new-statement-handle hdbc)
(fill-pointer column-names) 0
(fill-pointer column-c-types) 0
(fill-pointer column-sql-types) 0