summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6f9c91e)
* Version 3.5.4
* sql/metaclasses.lisp: Apply patch from Friedrich Dominicus to
fix accessor for new versions of SBCL
* db-oracle/oracle-sql.lisp: Apply patch from James Bielman
to improving parsing of time.
* db-db2/db2-constants.lisp: Change NULL_HANDLE has suggested
by Harold Lee.
* db-oracle/oracle-dbi.lisp: Add support for SQL BIT type
as noted by Russ Tyndall.
+28 Feb 2006 Kevin Rosenberg <kevin@rosenberg.net>
+ * Version 3.5.4
+ * sql/metaclasses.lisp: Apply patch from Friedrich Dominicus to
+ fix accessor for new versions of SBCL
+ * db-oracle/oracle-sql.lisp: Apply patch from James Bielman
+ to improving parsing of time.
+ * db-db2/db2-constants.lisp: Change NULL_HANDLE has suggested
+ by Harold Lee.
+ * db-oracle/oracle-dbi.lisp: Add support for SQL BIT type
+ as noted by Russ Tyndall.
+
16 Jan 2006 Kevin Rosenberg <kevin@rosenberg.net>
* Version 3.5.3
* sql/time.lisp: Commit patch from Aleksandar Bakic
16 Jan 2006 Kevin Rosenberg <kevin@rosenberg.net>
* Version 3.5.3
* sql/time.lisp: Commit patch from Aleksandar Bakic
-(defconstant SQL_NULL_HANDLE 0)
+(defconstant SQL_NULL_HANDLE nil)
(defconstant SQL_HANDLE_ENV 1)
(defconstant SQL_HANDLE_DBC 2)
(defconstant SQL_HANDLE_STMT 3)
(defconstant SQL_HANDLE_ENV 1)
(defconstant SQL_HANDLE_DBC 2)
(defconstant SQL_HANDLE_STMT 3)
(defvar *null* nil
"Lisp representation of SQL Null value, default = nil.
May be locally bound to something else if a certain type is necessary.")
(defvar *null* nil
"Lisp representation of SQL Null value, default = nil.
May be locally bound to something else if a certain type is necessary.")
(defvar *binary-format* :unsigned-byte-vector)
(defvar *time-conversion-function*
(lambda (universal-time &optional fraction)
(declare (ignore fraction))
(defvar *binary-format* :unsigned-byte-vector)
(defvar *time-conversion-function*
(lambda (universal-time &optional fraction)
(declare (ignore fraction))
- (clsql-sys:format-time
- nil (clsql-sys:utime->time universal-time)
+ (clsql-sys:format-time
+ nil (clsql-sys:utime->time universal-time)
:format :iso)
#+ignore
universal-time)
:format :iso)
#+ignore
universal-time)
,string ,size ,max-length)))
(with-cast-pointer (char-ptr ,ptr :byte)
(dotimes (i ,size)
,string ,size ,max-length)))
(with-cast-pointer (char-ptr ,ptr :byte)
(dotimes (i ,size)
- (setf (deref-array char-ptr '(:array :byte) i)
+ (setf (deref-array char-ptr '(:array :byte) i)
(char-code (char ,string i))))
(setf (deref-array char-ptr '(:array :byte) ,size) 0)))))
(char-code (char ,string i))))
(setf (deref-array char-ptr '(:array :byte) ,size) 0)))))
(deref-array ptr '(:array :unsigned-char) i)))
(incf offset))
offset)
(deref-array ptr '(:array :unsigned-char) i)))
(incf offset))
offset)
(defun handle-error (henv hdbc hstmt)
(let ((sql-state (allocate-foreign-string 256))
(error-message (allocate-foreign-string #.$SQL_MAX_MESSAGE_LENGTH)))
(defun handle-error (henv hdbc hstmt)
(let ((sql-state (allocate-foreign-string 256))
(error-message (allocate-foreign-string #.$SQL_MAX_MESSAGE_LENGTH)))
- (deref-pointer msg-length :short)
+ (deref-pointer msg-length :short)
(deref-pointer error-code #.$ODBC-LONG-TYPE))))))
(defun sql-state (henv hdbc hstmt)
(deref-pointer error-code #.$ODBC-LONG-TYPE))))))
(defun sql-state (henv hdbc hstmt)
(msg-length :short))
(SQLError henv hdbc hstmt sql-state error-code
error-message #.$SQL_MAX_MESSAGE_LENGTH msg-length)
(msg-length :short))
(SQLError henv hdbc hstmt sql-state error-code
error-message #.$SQL_MAX_MESSAGE_LENGTH msg-length)
- (let ((state (convert-from-foreign-string sql-state)))
+ (let ((state (convert-from-foreign-string sql-state)))
(free-foreign-object error-message)
(free-foreign-object sql-state)
state
(free-foreign-object error-message)
(free-foreign-object sql-state)
state
(defun %sql-free-environment (henv)
(defun %sql-free-environment (henv)
(:henv henv)
(SQLFreeEnv henv)))
(:henv henv)
(SQLFreeEnv henv)))
(deref-pointer phdbc 'sql-handle))))
(defun %free-statement (hstmt option)
(deref-pointer phdbc 'sql-handle))))
(defun %free-statement (hstmt option)
(ecase option
(:drop $SQL_DROP)
(:close $SQL_CLOSE)
(ecase option
(:drop $SQL_DROP)
(:close $SQL_CLOSE)
(with-cstrings ((server-ptr server)
(uid-ptr uid)
(pwd-ptr pwd))
(with-cstrings ((server-ptr server)
(uid-ptr uid)
(pwd-ptr pwd))
- (SQLConnect hdbc server-ptr $SQL_NTS uid-ptr
+ (SQLConnect hdbc server-ptr $SQL_NTS uid-ptr
$SQL_NTS pwd-ptr $SQL_NTS))))
(defun %sql-driver-connect (hdbc connection-string completion window-handle)
$SQL_NTS pwd-ptr $SQL_NTS))))
(defun %sql-driver-connect (hdbc connection-string completion window-handle)
(let ((completed-connection-string (allocate-foreign-string $SQL_MAX_CONN_OUT)))
(unwind-protect
(with-foreign-object (completed-connection-length :short)
(let ((completed-connection-string (allocate-foreign-string $SQL_MAX_CONN_OUT)))
(unwind-protect
(with-foreign-object (completed-connection-length :short)
- (SQLDriverConnect hdbc
- window-handle
+ (SQLDriverConnect hdbc
+ window-handle
connection-ptr $SQL_NTS
completed-connection-string $SQL_MAX_CONN_OUT
completed-connection-length
connection-ptr $SQL_NTS
completed-connection-string $SQL_MAX_CONN_OUT
completed-connection-length
(free-foreign-object completed-connection-string)))))
(defun %disconnect (hdbc)
(free-foreign-object completed-connection-string)))))
(defun %disconnect (hdbc)
(:hdbc hdbc)
(SQLDisconnect hdbc)))
(defun %commit (henv hdbc)
(:hdbc hdbc)
(SQLDisconnect hdbc)))
(defun %commit (henv hdbc)
henv hdbc $SQL_COMMIT)))
(defun %rollback (henv hdbc)
henv hdbc $SQL_COMMIT)))
(defun %rollback (henv hdbc)
henv hdbc $SQL_ROLLBACK)))
; col-nr is zero-based in Lisp
henv hdbc $SQL_ROLLBACK)))
; col-nr is zero-based in Lisp
(with-error-handling
(:hstmt hstmt)
(SQLBindParameter hstmt (1+ parameter-nr)
(with-error-handling
(:hstmt hstmt)
(SQLBindParameter hstmt (1+ parameter-nr)
- parameter-type ;$SQL_PARAM_INPUT
+ parameter-type ;$SQL_PARAM_INPUT
c-type ;$SQL_C_CHAR
sql-type ;$SQL_VARCHAR
precision ;(1- (length str))
c-type ;$SQL_C_CHAR
sql-type ;$SQL_VARCHAR
precision ;(1- (length str))
)))
(defun %sql-fetch (hstmt)
)))
(defun %sql-fetch (hstmt)
(:hstmt hstmt)
(SQLFetch hstmt)))
(defun %new-statement-handle (hdbc)
(let ((statement-handle
(with-foreign-object (phstmt 'sql-handle)
(:hstmt hstmt)
(SQLFetch hstmt)))
(defun %new-statement-handle (hdbc)
(let ((statement-handle
(with-foreign-object (phstmt 'sql-handle)
- (SQLAllocHandle $SQL_HANDLE_STMT hdbc phstmt)
+ (SQLAllocHandle $SQL_HANDLE_STMT hdbc phstmt)
(deref-pointer phstmt 'sql-handle)))))
(if (uffi:null-pointer-p statement-handle)
(error 'clsql:sql-database-error :message "Received null statement handle.")
statement-handle)))
(deref-pointer phstmt 'sql-handle)))))
(if (uffi:null-pointer-p statement-handle)
(error 'clsql:sql-database-error :message "Received null statement handle.")
statement-handle)))
(defun %sql-get-info (hdbc info-type)
(ecase info-type
;; those return string
(defun %sql-get-info (hdbc info-type)
(ecase info-type
;; those return string
#.$SQL_SPECIAL_CHARACTERS
#.$SQL_TABLE_TERM
#.$SQL_USER_NAME)
#.$SQL_SPECIAL_CHARACTERS
#.$SQL_TABLE_TERM
#.$SQL_USER_NAME)
- (let ((info-ptr (allocate-foreign-string 1024)))
+ (let ((info-ptr (allocate-foreign-string 1024)))
(with-foreign-object (info-length-ptr :short)
(with-foreign-object (info-length-ptr :short)
(:hdbc hdbc)
(SQLGetInfo hdbc info-type info-ptr 1023 info-length-ptr)
(let ((info (convert-from-foreign-string info-ptr)))
(:hdbc hdbc)
(SQLGetInfo hdbc info-type info-ptr 1023 info-length-ptr)
(let ((info (convert-from-foreign-string info-ptr)))
#.$SQL_TXN_CAPABLE)
(with-foreign-objects ((info-ptr :short)
(info-length-ptr :short))
#.$SQL_TXN_CAPABLE)
(with-foreign-objects ((info-ptr :short)
(info-length-ptr :short))
(:hdbc hdbc)
(SQLGetInfo hdbc
info-type
(:hdbc hdbc)
(SQLGetInfo hdbc
info-type
(deref-pointer info-ptr :short)))
)
;; those returning a long bitmask
(deref-pointer info-ptr :short)))
)
;; those returning a long bitmask
#.$SQL_BOOKMARK_PERSISTENCE
#.$SQL_CONVERT_BIGINT
#.$SQL_CONVERT_BINARY
#.$SQL_BOOKMARK_PERSISTENCE
#.$SQL_CONVERT_BIGINT
#.$SQL_CONVERT_BINARY
#.$SQL_UNION)
(with-foreign-objects ((info-ptr #.$ODBC-LONG-TYPE)
(info-length-ptr :short))
#.$SQL_UNION)
(with-foreign-objects ((info-ptr #.$ODBC-LONG-TYPE)
(info-length-ptr :short))
(:hdbc hdbc)
(SQLGetInfo hdbc
info-type
(:hdbc hdbc)
(SQLGetInfo hdbc
info-type
)
(with-foreign-objects ((info-ptr #.$ODBC-LONG-TYPE)
(info-length-ptr :short))
)
(with-foreign-objects ((info-ptr #.$ODBC-LONG-TYPE)
(info-length-ptr :short))
(:hdbc hdbc)
(SQLGetInfo hdbc info-type info-ptr 255 info-length-ptr)
(deref-pointer info-ptr #.$ODBC-LONG-TYPE))))))
(:hdbc hdbc)
(SQLGetInfo hdbc info-type info-ptr 255 info-length-ptr)
(deref-pointer info-ptr #.$ODBC-LONG-TYPE))))))
(defun %sql-exec-direct (sql hstmt henv hdbc)
(with-cstring (sql-ptr sql)
(with-error-handling
(defun %sql-exec-direct (sql hstmt henv hdbc)
(with-cstring (sql-ptr sql)
(with-error-handling
(deref-pointer column-precision-ptr #.$ODBC-ULONG-TYPE)
(deref-pointer column-scale-ptr :short)
(deref-pointer column-nullable-p-ptr :short)))))))
(deref-pointer column-precision-ptr #.$ODBC-ULONG-TYPE)
(deref-pointer column-scale-ptr :short)
(deref-pointer column-nullable-p-ptr :short)))))))
;; parameter counting is 1-based
(defun %describe-parameter (hstmt parameter-nr)
(with-foreign-objects ((column-sql-type-ptr :short)
(column-precision-ptr #.$ODBC-ULONG-TYPE)
(column-scale-ptr :short)
(column-nullable-p-ptr :short))
;; parameter counting is 1-based
(defun %describe-parameter (hstmt parameter-nr)
(with-foreign-objects ((column-sql-type-ptr :short)
(column-precision-ptr #.$ODBC-ULONG-TYPE)
(column-scale-ptr :short)
(column-nullable-p-ptr :short))
(:hstmt hstmt)
(SQLDescribeParam hstmt parameter-nr
column-sql-type-ptr
(:hstmt hstmt)
(SQLDescribeParam hstmt parameter-nr
column-sql-type-ptr
(with-foreign-objects ((descriptor-length-ptr :short)
(numeric-descriptor-ptr #.$ODBC-LONG-TYPE))
(with-error-handling
(with-foreign-objects ((descriptor-length-ptr :short)
(numeric-descriptor-ptr #.$ODBC-LONG-TYPE))
(with-error-handling
(SQLColAttributes hstmt column-nr descriptor-type descriptor-info-ptr
256 descriptor-length-ptr
numeric-descriptor-ptr)
(SQLColAttributes hstmt column-nr descriptor-type descriptor-info-ptr
256 descriptor-length-ptr
numeric-descriptor-ptr)
(values
desc
(deref-pointer numeric-descriptor-ptr #.$ODBC-LONG-TYPE)))))))
(values
desc
(deref-pointer numeric-descriptor-ptr #.$ODBC-LONG-TYPE)))))))
-
-(defun %prepare-describe-columns (hstmt table-qualifier table-owner
+
+(defun %prepare-describe-columns (hstmt table-qualifier table-owner
table-name column-name)
(with-cstrings ((table-qualifier-ptr table-qualifier)
table-name column-name)
(with-cstrings ((table-qualifier-ptr table-qualifier)
- (table-owner-ptr table-owner)
+ (table-owner-ptr table-owner)
(table-name-ptr table-name)
(column-name-ptr column-name))
(with-error-handling
(table-name-ptr table-name)
(column-name-ptr column-name))
(with-error-handling
(SQLColumns hstmt
table-qualifier-ptr (length table-qualifier)
table-owner-ptr (length table-owner)
table-name-ptr (length table-name)
column-name-ptr (length column-name)))))
(SQLColumns hstmt
table-qualifier-ptr (length table-qualifier)
table-owner-ptr (length table-owner)
table-name-ptr (length table-name)
column-name-ptr (length column-name)))))
-(defun %describe-columns (hdbc table-qualifier table-owner
+(defun %describe-columns (hdbc table-qualifier table-owner
table-name column-name)
(with-statement-handle (hstmt hdbc)
table-name column-name)
(with-statement-handle (hstmt hdbc)
- (%prepare-describe-columns hstmt table-qualifier table-owner
+ (%prepare-describe-columns hstmt table-qualifier table-owner
table-name column-name)
(fetch-all-rows hstmt)))
table-name column-name)
(fetch-all-rows hstmt)))
(free-foreign-object name-ptr)
(free-foreign-object description-ptr)
nil))))))
(free-foreign-object name-ptr)
(free-foreign-object description-ptr)
nil))))))
(defun sql-to-c-type (sql-type)
(ecase sql-type
(defun sql-to-c-type (sql-type)
(ecase sql-type
- ((#.$SQL_CHAR #.$SQL_VARCHAR #.$SQL_LONGVARCHAR
+ ((#.$SQL_CHAR #.$SQL_VARCHAR #.$SQL_LONGVARCHAR
#.$SQL_NUMERIC #.$SQL_DECIMAL #.$SQL_BIGINT -8 -9 -10) $SQL_C_CHAR) ;; Added -10 for MSSQL ntext type
(#.$SQL_INTEGER $SQL_C_SLONG)
(#.$SQL_SMALLINT $SQL_C_SSHORT)
#.$SQL_NUMERIC #.$SQL_DECIMAL #.$SQL_BIGINT -8 -9 -10) $SQL_C_CHAR) ;; Added -10 for MSSQL ntext type
(#.$SQL_INTEGER $SQL_C_SLONG)
(#.$SQL_SMALLINT $SQL_C_SSHORT)
(t
(case sql-type
;; SQL extended datatypes
(t
(case sql-type
;; SQL extended datatypes
- (#.$SQL_TINYINT (get-cast-byte data-ptr))
+ (#.$SQL_TINYINT (get-cast-byte data-ptr))
(#.$SQL_C_STINYINT (get-cast-byte data-ptr)) ;; ?
(#.$SQL_C_SSHORT (get-cast-short data-ptr)) ;; ?
(#.$SQL_SMALLINT (get-cast-short data-ptr)) ;; ??
(#.$SQL_INTEGER (get-cast-int data-ptr))
(#.$SQL_BIGINT (read-from-string
(get-cast-foreign-string data-ptr)))
(#.$SQL_C_STINYINT (get-cast-byte data-ptr)) ;; ?
(#.$SQL_C_SSHORT (get-cast-short data-ptr)) ;; ?
(#.$SQL_SMALLINT (get-cast-short data-ptr)) ;; ??
(#.$SQL_INTEGER (get-cast-int data-ptr))
(#.$SQL_BIGINT (read-from-string
(get-cast-foreign-string data-ptr)))
(let ((*read-base* 10))
(read-from-string (get-cast-foreign-string data-ptr))))
(let ((*read-base* 10))
(read-from-string (get-cast-foreign-string data-ptr))))
+ (#.$SQL_BIT (get-cast-byte data-ptr))
+ (t
(case c-type
((#.$SQL_C_DATE #.$SQL_C_TYPE_DATE)
(funcall *time-conversion-function* (date-to-universal-time data-ptr)))
(case c-type
((#.$SQL_C_DATE #.$SQL_C_TYPE_DATE)
(funcall *time-conversion-function* (date-to-universal-time data-ptr)))
(code-char (get-cast-short data-ptr)))
(t
(get-cast-foreign-string data-ptr)))))))))
(code-char (get-cast-short data-ptr)))
(t
(get-cast-foreign-string data-ptr)))))))))
;; FIXME: this could be better optimized for types which use READ-FROM-STRING above
;; FIXME: this could be better optimized for types which use READ-FROM-STRING above
(if (and (or (eq result-type t) (eq result-type :string))
value
(not (stringp value)))
(if (and (or (eq result-type t) (eq result-type :string))
value
(not (stringp value)))
(#.$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))))
(#.$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))))
;; Maybe should signal a restartable condition for this?
(when *break-on-unknown-data-type*
;; Maybe should signal a restartable condition for this?
(when *break-on-unknown-data-type*
- (break "SQL type is ~A, precision ~D, size ~D, C type is ~A"
+ (break "SQL type is ~A, precision ~D, size ~D, C type is ~A"
sql-type precision size c-type))
(uffi:allocate-foreign-object :byte (1+ size)))))
(out-len-ptr (uffi:allocate-foreign-object #.$ODBC-LONG-TYPE)))
sql-type precision size c-type))
(uffi:allocate-foreign-object :byte (1+ size)))))
(out-len-ptr (uffi:allocate-foreign-object #.$ODBC-LONG-TYPE)))
(aref out-len-ptrs col-nr) out-len-ptr))))
;; the main loop
(prog1
(aref out-len-ptrs col-nr) out-len-ptr))))
;; the main loop
(prog1
(when (> column-count 1)
(error 'clsql:sql-database-error
:message "If more than one column is to be fetched, flatp has to be nil."))
(loop until (= (%sql-fetch hstmt) $SQL_NO_DATA_FOUND)
collect
(when (> column-count 1)
(error 'clsql:sql-database-error
:message "If more than one column is to be fetched, flatp has to be nil."))
(loop until (= (%sql-fetch hstmt) $SQL_NO_DATA_FOUND)
collect
- (read-data (aref data-ptrs 0)
+ (read-data (aref data-ptrs 0)
(aref c-types 0)
(aref sql-types 0)
(aref out-len-ptrs 0)
(aref c-types 0)
(aref sql-types 0)
(aref out-len-ptrs 0)
collect
(loop for col-nr from 0 to (1- column-count)
collect
collect
(loop for col-nr from 0 to (1- column-count)
collect
- (read-data (aref data-ptrs col-nr)
+ (read-data (aref data-ptrs col-nr)
(aref c-types col-nr)
(aref sql-types col-nr)
(aref out-len-ptrs col-nr)
(aref c-types col-nr)
(aref sql-types col-nr)
(aref out-len-ptrs col-nr)
(set-connection-option hdbc $SQL_AUTOCOMMIT $SQL_AUTOCOMMIT_ON))
(defun %sql-set-pos (hstmt row option lock)
(set-connection-option hdbc $SQL_AUTOCOMMIT $SQL_AUTOCOMMIT_ON))
(defun %sql-set-pos (hstmt row option lock)
(:hstmt hstmt)
(SQLSetPos hstmt row option lock)))
(:hstmt hstmt)
(SQLSetPos hstmt row option lock)))
(defconstant $sql-data-truncated (intern "01004" :keyword))
(defconstant $sql-data-truncated (intern "01004" :keyword))
-(defun read-data-in-chunks (hstmt column-nr data-ptr c-type sql-type
+(defun read-data-in-chunks (hstmt column-nr data-ptr c-type sql-type
out-len-ptr result-type)
(declare (type long-ptr-type out-len-ptr)
(ignore result-type))
out-len-ptr result-type)
(declare (type long-ptr-type out-len-ptr)
(ignore result-type))
- (let* ((res (%sql-get-data hstmt column-nr c-type data-ptr
+ (let* ((res (%sql-get-data hstmt column-nr c-type data-ptr
+max-precision+ out-len-ptr))
(out-len (deref-pointer out-len-ptr #.$ODBC-LONG-TYPE))
(offset 0)
+max-precision+ out-len-ptr))
(out-len (deref-pointer out-len-ptr #.$ODBC-LONG-TYPE))
(offset 0)
(adjust-array str (+ offset data-length)
:initial-element #\?)
(setf offset (%cstring-into-vector
(adjust-array str (+ offset data-length)
:initial-element #\?)
(setf offset (%cstring-into-vector
data-length)))
(error 'clsql:sql-database-error :message "wrong type. preliminary."))
while (and (= res $SQL_SUCCESS_WITH_INFO)
(equal (sql-state +null-handle-ptr+ +null-handle-ptr+ hstmt)
"01004"))
data-length)))
(error 'clsql:sql-database-error :message "wrong type. preliminary."))
while (and (= res $SQL_SUCCESS_WITH_INFO)
(equal (sql-state +null-handle-ptr+ +null-handle-ptr+ hstmt)
"01004"))
- do (setf res (%sql-get-data hstmt column-nr c-type data-ptr
+ do (setf res (%sql-get-data hstmt column-nr c-type data-ptr
+max-precision+ out-len-ptr)))
(setf str (coerce str 'string))
(if (= sql-type $SQL_DECIMAL)
+max-precision+ out-len-ptr)))
(setf str (coerce str 'string))
(if (= sql-type $SQL_DECIMAL)
(let ((str (make-string out-len)))
(loop do (if (= c-type #.$SQL_CHAR)
(setf offset (%cstring-into-vector ;string
(let ((str (make-string out-len)))
(loop do (if (= c-type #.$SQL_CHAR)
(setf offset (%cstring-into-vector ;string
(min out-len (1- +max-precision+))))
(error 'clsql:sql-database-error :message "wrong type. preliminary."))
(min out-len (1- +max-precision+))))
(error 'clsql:sql-database-error :message "wrong type. preliminary."))
(and (= res $SQL_SUCCESS_WITH_INFO)
#+ingore(eq (sql-state +null-handle-ptr+ +null-handle-ptr+ hstmt)
$sql-data-truncated)
(equal (sql-state +null-handle-ptr+ +null-handle-ptr+ hstmt)
"01004"))
(and (= res $SQL_SUCCESS_WITH_INFO)
#+ingore(eq (sql-state +null-handle-ptr+ +null-handle-ptr+ hstmt)
$sql-data-truncated)
(equal (sql-state +null-handle-ptr+ +null-handle-ptr+ hstmt)
"01004"))
- do (setf res (%sql-get-data hstmt column-nr c-type data-ptr
+ do (setf res (%sql-get-data hstmt column-nr c-type data-ptr
+max-precision+ out-len-ptr)
out-len (deref-pointer out-len-ptr #.$ODBC-LONG-TYPE)))
(if (= sql-type $SQL_DECIMAL)
+max-precision+ out-len-ptr)
out-len (deref-pointer out-len-ptr #.$ODBC-LONG-TYPE)))
(if (= sql-type $SQL_DECIMAL)
(defun timestamp-to-universal-time (ptr)
(declare (type c-timestamp-ptr-type ptr))
(values
(defun timestamp-to-universal-time (ptr)
(declare (type c-timestamp-ptr-type ptr))
(values
(get-slot-value ptr 'sql-c-timestamp 'second)
(get-slot-value ptr 'sql-c-timestamp 'minute)
(get-slot-value ptr 'sql-c-timestamp 'hour)
(get-slot-value ptr 'sql-c-timestamp 'second)
(get-slot-value ptr 'sql-c-timestamp 'minute)
(get-slot-value ptr 'sql-c-timestamp 'hour)
(defun time-to-universal-time (ptr)
(declare (type c-time-ptr-type ptr))
(defun time-to-universal-time (ptr)
(declare (type c-time-ptr-type ptr))
(get-slot-value ptr 'sql-c-timestamp 'second)
(get-slot-value ptr 'sql-c-timestamp 'minute)
(get-slot-value ptr 'sql-c-timestamp 'hour)
(get-slot-value ptr 'sql-c-timestamp 'second)
(get-slot-value ptr 'sql-c-timestamp 'minute)
(get-slot-value ptr 'sql-c-timestamp 'hour)
(defun %set-attr-odbc-version (henv version)
(with-error-handling (:henv henv)
(defun %set-attr-odbc-version (henv version)
(with-error-handling (:henv henv)
- (SQLSetEnvAttr henv $SQL_ATTR_ODBC_VERSION
+ (SQLSetEnvAttr henv $SQL_ATTR_ODBC_VERSION
(make-pointer version :void) 0)))
(defun %list-tables (hstmt)
(make-pointer version :void) 0)))
(defun %list-tables (hstmt)
(defun %table-statistics (table hstmt &key unique (ensure t))
(with-cstrings ((table-cs table))
(with-error-handling (:hstmt hstmt)
(defun %table-statistics (table hstmt &key unique (ensure t))
(with-cstrings ((table-cs table))
(with-error-handling (:hstmt hstmt)
hstmt
+null-ptr+ 0
+null-ptr+ 0
hstmt
+null-ptr+ 0
+null-ptr+ 0
(when (or (eql res $SQL_SUCCESS)
(eql res $SQL_SUCCESS_WITH_INFO))
(push (convert-from-foreign-string dsn) results))
(when (or (eql res $SQL_SUCCESS)
(eql res $SQL_SUCCESS_WITH_INFO))
(push (convert-from-foreign-string dsn) results))
(do ((res (with-error-handling (:henv henv)
(SQLDataSources henv $SQL_FETCH_NEXT dsn
(1+ $SQL_MAX_DSN_LENGTH)
(do ((res (with-error-handling (:henv henv)
(SQLDataSources henv $SQL_FETCH_NEXT dsn
(1+ $SQL_MAX_DSN_LENGTH)
(date-format
:initarg :date-format
:reader date-format
(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
(date-format-length
:type number
:documentation
(uffi:with-foreign-strings ((c-stmt-string sql-stmt-string))
(let ((stmthp (uffi:allocate-foreign-object :pointer-void))
select-p)
(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
(uffi:with-foreign-object (stmttype :unsigned-short)
(unwind-protect
(progn
+oci-attr-stmt-type+
(deref-vp errhp)
:database db)
+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)))
(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)
(oci-stmt-execute (deref-vp svchp)
(deref-vp stmthp)
(deref-vp errhp)
(unless select-p
(oci-handle-free (deref-vp stmthp) +oci-htype-stmt+)
(uffi:free-foreign-object stmthp))))
(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))
(cond
(select-p
(make-query-cursor db stmthp result-types field-names))
+cl-sql (3.5.4-1) unstable; urgency=low
+
+ * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org> Tue, 28 Feb 2006 08:48:40 -0700
+
cl-sql (3.5.3-1) unstable; urgency=low
* New upstream
cl-sql (3.5.3-1) unstable; urgency=low
* New upstream
(null (specified-type dsd)))
(setf (specified-type dsd)
(slot-definition-type dsd))
(null (specified-type dsd)))
(setf (specified-type dsd)
(slot-definition-type dsd))
- (setf #-clisp (slot-value dsd 'type)
- #+clisp (slot-definition-type dsd)
+ (setf #-(or clisp sbcl) (slot-value dsd 'type)
+ #+(or clisp sbcl) (slot-definition-type dsd)
(compute-lisp-type-from-slot-specification
dsd (slot-definition-type dsd))))
(compute-lisp-type-from-slot-specification
dsd (slot-definition-type dsd))))