r8955: v 2.6.3

diff --git a/ChangeLog b/ChangeLog
index 9edc43b660eb4153f0704123898fe4124e693651..5adcac1522f13eda795e94082f0c885ad230e40a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+10 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 2.6.3
+       * test/test-init.lisp: Signal correctly
+       if any errors occurred in any test suite
+       * base/loop-extensions.lisp: Fix error
+       introduced for Lispworks
+       * base/pool.lisp: Fix locking for CMUCL
+       * base/objects.lisp: Remove schema-version cruft
+       
 10 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.6.2: New CLSQL API functions:
        DESCRIBE-TABLE AND TRUNCATE-DATABASE

diff --git a/sql/new-objects.lisp b/sql/new-objects.lisp
index fc050cb944584d361f884079782c889513fd3b15..c06882fe78fe2cf5decc7f45a5536679d385c7d7 100644 (file)
--- a/sql/new-objects.lisp
+++ b/sql/new-objects.lisp
@@ -28,7 +28,7 @@
 (defmethod slot-value-using-class ((class standard-db-class) instance slot-def)
   (declare (optimize (speed 3)))
   (unless *db-deserializing*
-    (let ((slot-name (slot-defition-name-name slot-def))
+    (let ((slot-name (slot-definition-name slot-def))
           (slot-kind (view-class-slot-db-kind slot-def)))
       (when (and (eql slot-kind :join)
                  (not (slot-boundp instance slot-name)))
@@ -425,7 +425,7 @@ are derived from the View Class definition."))
     (let* ((att (view-class-slot-column sd))
            (val (db-value-from-slot sd (slot-value obj slot) database)))
       (cond ((and vct sd stored?)
-             (update-records :table (sql-expression :table vct)
+             (update-records (sql-expression :table vct)
                              :attributes (list (sql-expression :attribute att))
                              :values (list val)
                              :where (key-qualifier-for-instance obj :database database)
@@ -460,7 +460,7 @@ names are derived from the view class definition."))
                                    (db-value-from-slot s val database))))
                        sds)))
     (cond ((and avps stored?)
-           (update-records :table (sql-expression :table vct)
+           (update-records (sql-expression :table vct)
                            :av-pairs avps
                            :where (key-qualifier-for-instance
                                    obj :database database)
@@ -501,7 +501,7 @@ associated with that database."))
       (unless record-values
         (error "No settable slots."))
       (if (slot-value obj 'stored)
-          (update-records :table (sql-expression :table view-class-table)
+          (update-records (sql-expression :table view-class-table)
                           :av-pairs record-values
                           :where (key-qualifier-for-instance
                                   obj :database database)

diff --git a/tests/new-test-init.lisp b/tests/new-test-init.lisp
index c71025a50405c7d32c13f71fdf11bfe1971e9266..48940a0443deae771f8c496d12e388ecb269410b 100644 (file)
--- a/tests/new-test-init.lisp
+++ b/tests/new-test-init.lisp
@@ -283,8 +283,11 @@
   (clsql:update-records-from-instance employee10)
   (clsql:update-records-from-instance company1))
 
+(defvar *error-count* 0)
+
 (defun run-tests ()
-  (let ((specs (read-specs)))
+  (let ((specs (read-specs))
+       (*error-count* 0))
     (unless specs
       (warn "Not running tests because test configuration file is missing")
       (return-from run-tests :skipped))
@@ -292,7 +295,8 @@
     (dolist (db-type +all-db-types+)
       (let ((spec (db-type-spec db-type specs)))
        (when spec
-         (do-tests-for-backend spec db-type))))))
+         (do-tests-for-backend spec db-type))))
+    (zerop *error-count*)))
 
 (defun load-necessary-systems (specs)
   (dolist (db-type +all-db-types+)
@@ -306,25 +310,23 @@
 ***     Running CLSQL tests with ~A backend.
 *******************************************************************
 " db-type)
+  (regression-test:rem-all-tests)
   
   ;; Tests of clsql-base
   (ignore-errors (destroy-database spec :database-type db-type))
   (ignore-errors (create-database spec :database-type db-type))
   (with-tests (:name "CLSQL")
     (test-basic spec db-type))
-  
-  (regression-test:rem-all-tests)
+  (incf *error-count* *test-errors*)
+
+  (ignore-errors (destroy-database spec :database-type db-type))
+  (ignore-errors (create-database spec :database-type db-type))
   (dolist (test (append *rt-connection* *rt-fddl* *rt-fdml*
                        *rt-ooddl* *rt-oodml* *rt-syntax*))
     (eval test))
-  
-  (ignore-errors (destroy-database spec :database-type db-type))
-  (ignore-errors (create-database spec :database-type db-type))
   (test-connect-to-database db-type spec)
-  
-  (assert *default-database*)
   (test-initialise-database)
+  (let ((remaining (rtest:do-tests)))
+    (when (consp remaining)
+      (incf *error-count* (length remaining)))))
 
-  (assert *default-database*)
-  (rtest:do-tests)
-  (disconnect))