X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-oracle%2Foracle-sql.lisp;h=ea990b533a74037de2c2261cc7cf102c203fb23c;hp=7e471a9c0647c21fd8d23e85ec4d55fef9abda0f;hb=8c6c643e3debe875bd14408cc3129d8148dfd125;hpb=5be31565b7d87b90f0e79a9e61af84ad05e12920

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index 7e471a9..ea990b5 100644
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -140,17 +140,16 @@ the length of that format.")
 			    errcode errbuf +errbuf-len+ +oci-htype-error+)
              (let ((subcode (uffi:deref-pointer errcode :long)))
                (unless (and nulls-ok (= subcode +null-value-returned+))
-                 (error 'clsql-sql-error
+                 (error 'sql-database-error
                         :database database
-                        :errno subcode
-			:expression nil
-                        :error (uffi:convert-from-foreign-string errbuf)))))))
+                        :error-id subcode
+                        :message (uffi:convert-from-foreign-string errbuf)))))))
 	(nulls-ok
-	 (error 'clsql-sql-error
+	 (error 'sql-database-error
                 :database database
                 :message "can't handle NULLS-OK without ERRHP"))
 	(t 
-	 (error 'clsql-sql-error
+	 (error 'sql-database-error
                 :database database
                 :message "OCI Error (and no ERRHP available to find subcode)"))))
 
@@ -309,7 +308,7 @@ the length of that format.")
 	   (format nil
 		   "select user_tab_columns,column_name from user_tab_columns where user_tab_columns.table_name='~A'"
 		   table)
-	   database nil nil))))
+	   database nil nil)))
 
 
 ;; Return one row of the table referred to by QC, represented as a