Changeset unicode,7

Timestamp:

02/20/2008 05:30:35 AM (18 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

unicode

parents:

Rev	Tree	Chgset
6	@unicode,6	[unicode,6]
5.1.1	@unicode,5.1.1	[unicode,5.1.1]

revision id:

dsowen@fugue88.ws-20080220053035-zvmt9xh4jzwaqj2i

Message:

Merged from vendor.

Location:

unicode

Files:

• doc/documentation.html (modified) (1 diff)
• doc/notes.html (modified) (1 diff)
• src/odbc/odbc-ff-interface.lisp (modified) (1 diff)
• src/odbc/odbc-main.lisp (modified) (2 diffs)
• src/odbc/parameter.lisp (modified) (6 diffs)
• src/test/test-mysql.lisp (modified) (2 diffs)
• src/test/test-oracle.lisp (modified) (1 diff)
• src/test/test-sql-server.lisp (modified) (1 diff)

unicode/doc/documentation.html

@@ -16 +16 @@
     <p>
       For Information about ODBC-API, I recommend the
-      <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/dasdkodbcoverview.asp">
+      <a href="http://msdn2.microsoft.com/en-us/library/ms710252(VS.85).aspx">
         ODBC documentation from Microsoft</a>.
     </p>

unicode/doc/notes.html

@@ -281 +281 @@
 The decimal expansion of 1/7 is periodic, so the digits 0.285 are correct. Thus
 MySQL uses the precision of double, but does not return all digits.
-
+<p>
+
+<h3>The SQL Parser</h3>
+The <tt>/* ..*/</tt> comments do not have to be closed:
+<pre>
+19]> (exec-query *con3* "select 1 as a /*bla")
+
+((1)) ;
+("a")
+</pre>
+Maybe this depends on the version of MySQL or some system parameter.
+</p>
 <h3>Parameters</h3>
 <p>

unicode/src/odbc/odbc-ff-interface.lisp

@@ -313 +313 @@
      year)))
 
-
-(defmacro %sql-len-data-at-exec (length)
-  `(- $SQL_LEN_DATA_AT_EXEC_OFFSET ,length))
+(defun %sql-len-data-at-exec (length)
+  (- $SQL_LEN_DATA_AT_EXEC_OFFSET length))

unicode/src/odbc/odbc-main.lisp

@@ -467 +467 @@
 ;; this functions works only, since we store at value-ptr the position
 ;; of the parameter
-;; dso--
 (defun sql-param-data-position (hstmt)
   (with-temporary-allocations
@@ -474 +473 @@
                    (%sql-param-data hstmt ptr))))
       (values res (if (= res $SQL_NEED_DATA)
-                      (cffi:mem-ref (cffi:mem-ref ptr :pointer) :int32))))))
-                                        ; TODO: The :int32 above
-                                        ; should probably be changed!
+                      (cffi:mem-ref (cffi:mem-ref ptr :pointer) :long))))))
+
+
 
 (defmethod exec-prepared-query ((query prepared-statement) &rest parameters)

unicode/src/odbc/parameter.lisp

@@ -305 +305 @@
 
 
+
+;;; LOB parameters
+;;; lob parameters are handled differently, the buffer is not filled with the
+;;; parameters value but we send data at execution time.
+;;; This is done with the call:
+;;; (setf (cffi:mem-ref (slot-value param 'ind-ptr) 'sql-len)
+;;;              (%sql-len-data-at-exec (length value))))))
+;;; At execution time the result of %sql-execute or %sql-exec-direct
+;;; is $SQL_NEED_DATA. 
+;;; The next call to %sql-param-data gives the address of the data buffer 
+;;; of the needed bind parameter.
+;;; For the LOB parameters we store in this buffer the position of the
+;;; bind parameter. At execution time we get the buffer address of the
+;;; bind parameter. From this buffer we retrieve the parameter position
+;;; and so we know which parameter to send.
+;;; see functions exec-sql-statement and sql-param-data-position
+;;; in odbc-main.lisp
+;;; there is also the Microsoft documentation on SQLPutData, SQLParamData, 
+;;;  SQL_NEED_DATA  and etc.
+
 ;;;-----------------------
 ;;;    clob parameter
@@ -315 +335 @@
 
 (defclass clob-parameter (lob-parameter) ())
-
 
 (defmethod initialize-parameter ((param clob-parameter) args)
@@ -325 +344 @@
     ;; the value-ptr will be needed to find the parameter,  
     ;; we store the position there
-    (setf buffer-length (cffi:foreign-type-size 'sql-pointer))
-    (setf value-ptr (cffi:foreign-alloc 'sql-pointer))))
+    (setf buffer-length (cffi:foreign-type-size :long))
+    (setf value-ptr (cffi:foreign-alloc :long))))
 
 (defmethod set-parameter-value ((param clob-parameter) value)
@@ -375 +394 @@
     ;; the value-ptr will be needed to find the parameter,  
     ;; we store the position there
-    (setf buffer-length (cffi:foreign-type-size 'sql-pointer))
-    (setf value-ptr (cffi:foreign-alloc 'sql-pointer))))
+    (setf buffer-length (cffi:foreign-type-size :long))
+    (setf value-ptr (cffi:foreign-alloc ':long))))
 
 (defmethod set-parameter-value ((param uclob-parameter) value)
@@ -384 +403 @@
     (progn
       (setf (slot-value param 'temp-val) value)
-      (setf (cffi:mem-ref (slot-value param 'value-ptr) ':long)
+      (setf (cffi:mem-ref (slot-value param 'value-ptr) :long)
               (slot-value param 'position))
       (setf (cffi:mem-ref (slot-value param 'ind-ptr) 'sql-len)
@@ -424 +443 @@
     ;; the value-ptr will be needed to find the parameter, 
     ;; we store the position there
-    (setf buffer-length (cffi:foreign-type-size 'sql-pointer))
-    (setf value-ptr (cffi:foreign-alloc 'sql-pointer)))
+    (setf buffer-length (cffi:foreign-type-size :long))
+    (setf value-ptr (cffi:foreign-alloc :long)))
 )
 

unicode/src/test/test-mysql.lisp

@@ -40 +40 @@
 
 create table type_test
-(id int,
+ (id int,
 t_TINYINT TINYINT,
 t_SMALLINT  SMALLINT,
@@ -99 +99 @@
   --t_LONGBLOB longblob,
   --t_LONGTEXT = lpad('a',33000,'x') 
+*/
   where id =1
 ")

unicode/src/test/test-oracle.lisp

@@ -144 +144 @@
                                 '(:string :in) 
                                 '(:string :out))))
-    (let ((str "lölkÀlkÀölkÀlhjajhgfsjgakjhgfjfjhgffdtrtreztr"))
+    (let ((str "lolkalkxylkzlhjajhgfsjgakjhgfjfjhgffdtrtreztr"))
       (assert (equal str (first (exec-prepared-command stm str))))
       (free-statement stm)))

unicode/src/test/test-sql-server.lisp

@@ -245 +245 @@
                             '(:string :in) 
                             '(:unicode-string :in))
-    (let* ((strings '("hjgkhgkzt65646&%2" "nnvfdsfsfz6tztß0#="))
+    (let* ((strings '("hjgkhgkzt65646&%2" "nnvfdsfsfz6tztB0#="))
            (res (exec-prepared-query stm (first strings) (second strings))))
       (assert (equal res (list strings))))))