mirrors/pgloader
1
0
Fork 0
mirror of https://github.com/dimitri/pgloader.git synced 2026-05-04 10:31:02 +02:00
Code Issues Projects Releases Wiki Activity

Fix MS SQL text values processing.

Browse Source 
The previous code required non-zero data length for all MS SQL returned
values, where it makes no sense for text like values (an empty string is
ok). Also, the code was trimming spaces from both ends on syb-char data,
and in testing that return type is used for varchar too.

Fix #366. Fix #368.
This commit is contained in:
Dimitri Fontaine 2016-03-20 20:15:02 +01:00
parent 4155d06ae5
commit 63c3b3b1c7
1 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/monkey/mssql.lisp
View File

@ -78,32 +78,52 @@
(logior byte (- (mask-field (byte 1 (1- (* n 8))) byte))))
(defun sysdb-data-to-lisp (%dbproc data type len)
(if (> len 0)
(case (foreign-enum-keyword '%syb-value-type type)
((:syb-varchar :syb-text) (foreign-string-to-lisp data :count len))
(:syb-char (string-trim #(#\Space) (foreign-string-to-lisp data :count len)))
((:syb-bit :syb-bitn) (mem-ref data :int))
(:syb-int1 (unsigned-to-signed (mem-ref data :unsigned-int) 1))
(:syb-int2 (unsigned-to-signed (mem-ref data :unsigned-int) 2))
(:syb-int4 (unsigned-to-signed (mem-ref data :unsigned-int) 4))
(:syb-int8 (mem-ref data :int8))
(:syb-flt8 (mem-ref data :double))
(:syb-datetime
(with-foreign-pointer (%buf +numeric-buf-sz+)
(foreign-string-to-lisp %buf
:count (%dbconvert %dbproc type data -1 :syb-char %buf +numeric-buf-sz+))))
((:syb-money :syb-money4 :syb-decimal :syb-numeric)
(with-foreign-pointer (%buf +numeric-buf-sz+)
(parse-number:parse-number
(foreign-string-to-lisp %buf
:count (%dbconvert %dbproc type data -1 :syb-char %buf +numeric-buf-sz+)))))
((:syb-image :syb-binary :syb-varbinary :syb-blob)
(let ((vector (make-array len :element-type '(unsigned-byte 8))))
(dotimes (i len)
(setf (aref vector i) (mem-ref data :uchar i)))
vector))
(otherwise (error "not supported type ~A"
(foreign-enum-keyword '%syb-value-type type))))))
(let ((syb-type (foreign-enum-keyword '%syb-value-type type)))
(case syb-type
;; we accept emtpy string (len is 0)
((:syb-char :syb-varchar :syb-text)
(foreign-string-to-lisp data :count len))
(otherwise
;; other types must have a non-zero len now, or we just return nil.
(if (> len 0)
(case syb-type
((:syb-bit :syb-bitn) (mem-ref data :int))
(:syb-int1 (unsigned-to-signed (mem-ref data :unsigned-int) 1))
(:syb-int2 (unsigned-to-signed (mem-ref data :unsigned-int) 2))
(:syb-int4 (unsigned-to-signed (mem-ref data :unsigned-int) 4))
(:syb-int8 (mem-ref data :int8))
(:syb-flt8 (mem-ref data :double))
(:syb-datetime
(with-foreign-pointer (%buf +numeric-buf-sz+)
(let ((count
(%dbconvert %dbproc
type
data
-1
:syb-char
%buf
+numeric-buf-sz+)))
(foreign-string-to-lisp %buf :count count))))
((:syb-money :syb-money4 :syb-decimal :syb-numeric)
(with-foreign-pointer (%buf +numeric-buf-sz+)
(let ((count
(%dbconvert %dbproc
type
data
-1
:syb-char
%buf
+numeric-buf-sz+)))
(parse-number:parse-number
(foreign-string-to-lisp %buf :count count )))))
((:syb-image :syb-binary :syb-varbinary :syb-blob)
(let ((vector (make-array len :element-type '(unsigned-byte 8))))
(dotimes (i len)
(setf (aref vector i) (mem-ref data :uchar i)))
vector))
(otherwise (error "not supported type ~A"
(foreign-enum-keyword '%syb-value-type type)))))))))
;; (defconstant +dbbuffer+ 14)