r9246: return list of lists for :target-slot

diff --git a/ChangeLog b/ChangeLog
index f1431116c8e8c3033d4688456a1cab133d350e32..540d6b699db2d0035b7e7aebd15d640cd946962f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 4 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * TODO: New section on optimizations, especially optimizing JOINs.
 4 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * TODO: New section on optimizations, especially optimizing JOINs.

-
+       * sql/objects.lisp: Have :target-slot return of list of lists rather
+       than a list of cons pairs to be conformant with CommonSQL.
+       

 4 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.10.11
        * base/basic-sql.lisp: Avoid multiple evaluation
 4 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.10.11
        * base/basic-sql.lisp: Avoid multiple evaluation

diff --git a/sql/objects.lisp b/sql/objects.lisp
index fccf37dbb2a359dc854e1e31c268525af9d6f91e..2ebad78b332af0017ff545b76edff45e3eff218d 100644 (file)
--- a/sql/objects.lisp
+++ b/sql/objects.lisp
@@ -722,7 +722,7 @@ superclass of the newly-defined View Class."
        (mapcar (lambda (obj)
                  (let* ((target-name (gethash :target-slot dbi))
                         (target-class (find-class target-name)))
        (mapcar (lambda (obj)
                  (let* ((target-name (gethash :target-slot dbi))
                         (target-class (find-class target-name)))

-                   (cons 
+                   (list 

                     (car
                      (fault-join-slot-raw 
                       target-class
                     (car
                      (fault-join-slot-raw 
                       target-class

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 7e69d6e3c51b84b30f60fdd36de15ffe3fe72f6f..804248bcb09ff262a94145124a828c2e16cd1df5 100644 (file)
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -85,9 +85,9 @@
     (mapcar #'(lambda (pair)
                (list
                 (typep (car pair) 'address)
     (mapcar #'(lambda (pair)
                (list
                 (typep (car pair) 'address)

-                (typep (cdr pair) 'employee-address)
+                (typep (second pair) 'employee-address)

                 (slot-value (car pair) 'addressid)
                 (slot-value (car pair) 'addressid)

-                (slot-value (cdr pair) 'addressid)))
+                (slot-value (second pair) 'addressid)))

      (employee-addresses employee1))
   ((t t 1 1) (t t 2 2)))
 
      (employee-addresses employee1))
   ((t t 1 1) (t t 2 2)))
 


@@ -95,9 +95,9 @@
     (mapcar #'(lambda (pair)
                (list
                 (typep (car pair) 'address)
     (mapcar #'(lambda (pair)
                (list
                 (typep (car pair) 'address)

-                (typep (cdr pair) 'employee-address)
+                (typep (second pair) 'employee-address)

                 (slot-value (car pair) 'addressid)
                 (slot-value (car pair) 'addressid)

-                (slot-value (cdr pair) 'addressid)))
+                (slot-value (second pair) 'addressid)))

      (employee-addresses employee2))
   ((t t 2 2)))
 
      (employee-addresses employee2))
   ((t t 2 2)))