r9212: Automated commit for Debian build of clsql upstream-version-2.10.8

[clsql.git] / sql / objects.lisp

diff --git a/sql/objects.lisp b/sql/objects.lisp
index 9598ea643d3172bf8acdd209be7fd443e42b52a6..2d569c754a0ea6deff68d83edeba3a92b029a403 100644 (file)
--- a/sql/objects.lisp
+++ b/sql/objects.lisp
@@ -397,7 +397,7 @@ superclass of the newly-defined View Class."
        (let ((qualifier (key-qualifier-for-instance instance :database vd)))
          (delete-records :from vt :where qualifier :database vd)
          (setf (slot-value instance 'view-database) nil))
-       (error 'clsql-no-database-error nil))))
+       (error 'clsql-base::clsql-no-database-error :database nil))))
 
 (defmethod update-instance-from-records ((instance standard-db-object)
                                          &key (database *default-database*))
@@ -665,9 +665,9 @@ superclass of the newly-defined View Class."
        (string (if (string= "0" val) nil t))
        (integer (if (zerop val) nil t))))
     (:postgresql
-     (if (database-type :odbc)
+     (if (eq :odbc (database-type database))
         (if (string= "0" val) nil t)
-        (equal "t" val)))
+       (equal "t" val)))
     (t
      (equal "t" val))))
 
@@ -795,7 +795,7 @@ superclass of the newly-defined View Class."
                   objects))))
     (let* ((*db-deserializing* t)
           (*default-database* (or database
-                                  (error 'clsql-no-database-error nil)))
+                                  (error 'clsql-base::clsql-no-database-error :database nil)))
           (sclasses (mapcar #'find-class view-classes))
           (sels (mapcar #'generate-selection-list sclasses))
           (fullsels (apply #'append sels))