X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-odbc%2Fodbc-api.lisp;h=b17af024651a85554ea5d8ce8754fb7d83d7e4c0;hp=a320d7e3f561543d87314f5469b698de2de48dbe;hb=5148be446aee32ec705beac3fbba35f499df4fd4;hpb=a6576bcf62dd1e710085ec74089d0730d599001b

diff --git a/db-odbc/odbc-api.lisp b/db-odbc/odbc-api.lisp
index a320d7e..b17af02 100644
--- a/db-odbc/odbc-api.lisp
+++ b/db-odbc/odbc-api.lisp
@@ -6,7 +6,7 @@
 ;;;; Purpose:  Low-level ODBC API using UFFI
 ;;;; Authors:  Kevin M. Rosenberg and Paul Meurer
 ;;;;
-;;;; $Id: odbc-package.lisp 7061 2003-09-07 06:34:45Z kevin $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2004 by Kevin M. Rosenberg
 ;;;; and Copyright (C) Paul Meurer 1999 - 2001. All rights reserved.
@@ -27,8 +27,8 @@ May be locally bound to something else if a certain type is necessary.")
 (defvar *time-conversion-function*
     (lambda (universal-time &optional fraction)
       (declare (ignore fraction))
-      (clsql-base:format-time 
-       nil (clsql-base:utime->time universal-time) 
+      (clsql-sys:format-time 
+       nil (clsql-sys:utime->time universal-time) 
        :format :iso)
       #+ignore
       universal-time)
@@ -44,8 +44,10 @@ as possible second argument) to the desired representation of date/time/timestam
   (let ((size (gensym)))
     `(let ((,size (length ,string)))
        (when (and ,max-length (> ,size ,max-length))
-         (error "string \"~a\" of length ~d is longer than max-length: ~d"
-                ,string ,size ,max-length))
+         (error 'clsql:sql-database-data-error
+		:message
+		(format nil "string \"~a\" of length ~d is longer than max-length: ~d"
+			,string ,size ,max-length)))
       (with-cast-pointer (char-ptr ,ptr :byte)
 	(dotimes (i ,size)
 	  (setf (deref-array char-ptr '(:array :byte) i) 
@@ -113,22 +115,35 @@ as possible second argument) to the desired representation of date/time/timestam
           (progn ,result-code ,@body))
          (#.$SQL_INVALID_HANDLE
           (error
-	   'clsql-base:clsql-odbc-error
-	   :odbc-message "Invalid handle"))
+	   'clsql-sys:sql-database-error
+	   :message "ODBC: Invalid handle"))
          (#.$SQL_STILL_EXECUTING
           (error
-	   'clsql-base:clsql-odbc-error
-	   :odbc-message "Still executing"))
+	   'clsql-sys:sql-temporary-error
+	   :message "ODBC: Still executing"))
          (#.$SQL_ERROR
           (multiple-value-bind (error-message sql-state)
 	      (handle-error (or ,henv +null-handle-ptr+)
 			    (or ,hdbc +null-handle-ptr+)
 			    (or ,hstmt +null-handle-ptr+))
             (error
-	     'clsql-base:clsql-odbc-error
-	     :odbc-message error-message
-	     :sql-state sql-state)))
+	     'clsql-sys:sql-database-error
+	     :message error-message
+	     :secondary-error-id sql-state)))
+	 (#.$SQL_NO_DATA_FOUND
+	  (progn ,result-code ,@body))
+	 ;; work-around for Allegro 7.0beta AMD64 which
+	 ;; has for negative numbers
 	 (otherwise
+	  (multiple-value-bind (error-message sql-state)
+	      (handle-error (or ,henv +null-handle-ptr+)
+			    (or ,hdbc +null-handle-ptr+)
+			    (or ,hstmt +null-handle-ptr+))
+            (error
+	     'clsql-sys:sql-database-error
+	     :message error-message
+	     :secondary-error-id sql-state))
+	  #+ignore
           (progn ,result-code ,@body))))))
 
 (defun %new-environment-handle ()
@@ -239,7 +254,7 @@ as possible second argument) to the desired representation of date/time/timestam
 	     (SQLAllocStmt hdbc hstmt-ptr) 
 	     (deref-pointer hstmt-ptr 'sql-handle)))))
     (if (uffi:null-pointer-p statement-handle)
-	(error "Received null statement handle.")
+	(error 'clsql:sql-database-error :message "Received null statement handle.")
 	statement-handle)))
 	
 (defun %sql-get-info (hdbc info-type)
@@ -743,7 +758,8 @@ as possible second argument) to the desired representation of date/time/timestam
              (prog1
                (cond (flatp 
                       (when (> column-count 1)
-                        (error "If more than one column is to be fetched, flatp has to be nil."))
+                        (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) 
@@ -847,7 +863,7 @@ as possible second argument) to the desired representation of date/time/timestam
                                       data-ptr str 
                                       offset 
                                       data-length)))
-                    (error "wrong type. preliminary."))
+                    (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"))
@@ -865,7 +881,7 @@ as possible second argument) to the desired representation of date/time/timestam
                                     data-ptr str 
                                     offset 
                                     (min out-len (1- +max-precision+))))
-                    (error "wrong type. preliminary."))
+                    (error 'clsql:sql-database-error :message "wrong type. preliminary."))
                while 
                (and (= res $SQL_SUCCESS_WITH_INFO)
                     #+ingore(eq (sql-state +null-handle-ptr+ +null-handle-ptr+ hstmt)