X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-oracle%2Foracle-sql.lisp;h=9460011db0d7f1a687d4faafa513eef7eeee9c0c;hp=976dd1975b79da64ada7ef7b6da9c63bdab93cbb;hb=2ba41ebdcd4963728c8d5460e389a5381b8e2293;hpb=fe6d36c16c61c855fc3b0c0c7c07f3cf3de4241d

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index 976dd19..9460011 100644
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -405,7 +405,7 @@ the length of that format.")
                                         ; from it after that..
 
 
-(defun fetch-row (qc (eof-errorp t) eof-value encoding)
+(defun fetch-row (qc &optional (eof-errorp t) eof-value encoding)
   (declare (optimize (speed 3)))
   (cond ((zerop (qc-n-from-oci qc))
          (if eof-errorp
@@ -430,7 +430,7 @@ the length of that format.")
                        (unless (= indicator -1)
                          (ecase (cd-oci-data-type cd)
                            (#.SQLT-STR
-                            (deref-oci-string b irow (cd-sizeof cd)))
+                            (deref-oci-string b irow (cd-sizeof cd) encoding))
                            (#.SQLT-FLT
                             (locally
                                 (declare (type double-array b))
@@ -442,7 +442,7 @@ the length of that format.")
                                    (declare (type int-array b))
                                  (uffi:deref-array b '(:array :int) irow)))))
                            (#.SQLT-DATE
-                            (deref-oci-string b irow (cd-sizeof cd))))))))
+                            (deref-oci-string b irow (cd-sizeof cd) encoding)))))))
                (when (and (eq :string (cd-result-type cd))
                           value
                           (not (stringp value)))
@@ -514,7 +514,7 @@ the length of that format.")
                  (oci-stmt-prepare (deref-vp stmthp)
                                    (deref-vp errhp)
                                    c-stmt-string
-                                   (length sql-stmt-string)
+                                   (uffi:foreign-string-length c-stmt-string)
                                    +oci-ntv-syntax+ +oci-default+ :database db)
                  (oci-attr-get (deref-vp stmthp)
                                +oci-htype-stmt+