r9736: fix bug preventing the :DB-CONSTRAINTS View Class slot option accepting a...

diff --git a/ChangeLog b/ChangeLog
index fee7194f6907cde8d1da1ca62568a703aab6c7fd..3dba7ff2d10302fa8a46437b8ce433e51f20900f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+6 Jul 2004 Marcus Pearce <m.t.pearce@city.ac.uk> 
+       * sql/expressions.lisp: add AUTO-INCREMENT and UNIQUE to the 
+       recognised column constraints for CREATE-TABLE and the :DB-CONSTRAINTS 
+       View Class slot option. 
+       * sql/ooddl.lisp: fix bug preventing the :DB-CONSTRAINTS View Class 
+       slot option accepting a list of constraints [reported by Travis Cross]. 
+

 3 Jul 2004 Marcus Pearce <m.t.pearce@city.ac.uk> 
        * doc/appendix.xml: add notes about idiosyncrasies/unsupported 
        features and so on the documentation for each backend. 
 3 Jul 2004 Marcus Pearce <m.t.pearce@city.ac.uk> 
        * doc/appendix.xml: add notes about idiosyncrasies/unsupported 
        features and so on the documentation for each backend. 

diff --git a/sql/expressions.lisp b/sql/expressions.lisp
index 50aa5d1fd478942ec8dfdd6eebd15f6d1bb4d252..ace360378f240fb47b0bf126466d2383b5412b5b 100644 (file)
--- a/sql/expressions.lisp
+++ b/sql/expressions.lisp
@@ -841,7 +841,9 @@ uninclusive, and the args from that keyword to the end."
    (cons (symbol-name-default-case "NOT") "NOT") 
    (cons (symbol-name-default-case "NULL") "NULL") 
    (cons (symbol-name-default-case "PRIMARY") "PRIMARY") 
    (cons (symbol-name-default-case "NOT") "NOT") 
    (cons (symbol-name-default-case "NULL") "NULL") 
    (cons (symbol-name-default-case "PRIMARY") "PRIMARY") 

-   (cons (symbol-name-default-case "KEY") "KEY")))
+   (cons (symbol-name-default-case "KEY") "KEY")
+   (cons (symbol-name-default-case "AUTO-INCREMENT") "AUTO_INCREMENT")
+   (cons (symbol-name-default-case "UNIQUE") "UNIQUE")))

 
 ;;
 ;; Convert type spec to sql syntax
 
 ;;
 ;; Convert type spec to sql syntax

diff --git a/sql/ooddl.lisp b/sql/ooddl.lisp
index 610da26a5877976bed3ba4182137369656b61d58..d44f0221b420e9bda065995cf718c114e483e3de 100644 (file)
--- a/sql/ooddl.lisp
+++ b/sql/ooddl.lisp
@@ -121,7 +121,7 @@ in DATABASE which defaults to *DEFAULT-DATABASE*."
       (setf cdef (append cdef (list (view-class-slot-db-type slotdef))))
       (let ((const (view-class-slot-db-constraints slotdef)))
         (when const 
       (setf cdef (append cdef (list (view-class-slot-db-type slotdef))))
       (let ((const (view-class-slot-db-constraints slotdef)))
         (when const 

-          (setq cdef (append cdef (list const)))))
+          (setq cdef (append cdef (listify const)))))

       cdef)))
 
 
       cdef)))