Fix for '>10 fields error'

klimenko-serj · Sep 13, 2012 · e0673a9 · e0673a9
1 parent 6de63e0
commit e0673a9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/cl-fbclient-functions.lisp b/cl-fbclient-functions.lisp
@@ -63,14 +63,14 @@
      (setf (cffi:foreign-slot-value new-xsqlda 'xsqlda 'sqln) n)
      new-xsqlda))
 ;-----------------------------------------------------------------------------------
+(defun need-remake-xsqlda (tmp-xsqlda)
+  (> (cffi:foreign-slot-value tmp-xsqlda 'xsqlda 'sqld) 
+     (cffi:foreign-slot-value tmp-xsqlda 'xsqlda 'sqln)))
+;-----------------------------------------------------------------------------------
 (defun remake-xsqlda (tmp-xsqlda)
-  (cond ((> (cffi:foreign-slot-value tmp-xsqlda 'xsqlda 'sqld) 
+  (unwind-protect 
-	    (cffi:foreign-slot-value tmp-xsqlda 'xsqlda 'sqln))
+       (make-xsqlda (cffi:foreign-slot-value tmp-xsqlda 'xsqlda 'sqld))
-	(let ((new-xsqlda (make-xsqlda 
+    (cffi-sys:foreign-free tmp-xsqlda)))
-			   (cffi:foreign-slot-value tmp-xsqlda 'xsqlda 'sqld))))
-	  (cffi-sys:foreign-free tmp-xsqlda)
-	  new-xsqlda))
-	(T tmp-xsqlda)))
 ;-----------------------------------------------------------------------------------
 (defun get-var-type-by-fbtype-num (type-num)
       (cond 

diff --git a/cl-fbclient.lisp b/cl-fbclient.lisp
@@ -187,7 +187,19 @@
 		  :fb-error-text "Error in isc-dsql-describe"
 		  :fbclient-msg (get-status-vector-msg status-vector*))
 	(cffi-sys:foreign-free status-vector*)))
-    (setf (xsqlda-output* fb-stmt) (remake-xsqlda (xsqlda-output* fb-stmt)))
+    (when (need-remake-xsqlda (xsqlda-output* fb-stmt))
+      (setf (xsqlda-output* fb-stmt) (remake-xsqlda (xsqlda-output* fb-stmt)))
+      (isc-dsql-describe status-vector* 
+			 (statement-handle* fb-stmt)
+			 1 
+			 (xsqlda-output* fb-stmt))
+      (when (status-vector-error-p status-vector*)
+	(unwind-protect
+	     (error 'fb-error 
+		    :fb-error-code 32 
+		    :fb-error-text "Error in isc-dsql-describe"
+		    :fbclient-msg (get-status-vector-msg status-vector*))
+	  (cffi-sys:foreign-free status-vector*))))
     (alloc-vars-data (xsqlda-output* fb-stmt))
     (cffi-sys:foreign-free status-vector*)))
 ;-----------------------------------------------------------------------------------