r9050: Automated commit for Debian build of clsql upstream-version-2.7.6

diff --git a/ChangeLog b/ChangeLog
index 2500721e17eb6b5f9cd14dbb8af3d3645f78ca45..1fa9602632fe896fddd55bf17cd501101db08924 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+16 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 2.7.6
+       * base/objects.lisp, base/classes.lisp: Patch
+       for db-kind from Eduardo Munoz
+       

 16 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.7.5
        * base/basic-sql.lisp: Fix FLATP in QUERY
 16 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.7.5
        * base/basic-sql.lisp: Fix FLATP in QUERY

diff --git a/debian/changelog b/debian/changelog
index fa67d44b36e38c7fe008a39958396845452bcc23..284e3f0cdcb53d67d5ed0d65c4033b398a55c08a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.7.6-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 17 Apr 2004 20:48:15 -0600
+

 cl-sql (2.7.5-1) unstable; urgency=low
 
   * New upstream
 cl-sql (2.7.5-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/classes.lisp b/sql/classes.lisp
index 5a22584f5f3e304ae8cd7758af2a93984e2ad2f7..7098ca2c81eafb294522578b648d896f0f20782f 100644 (file)
--- a/sql/classes.lisp
+++ b/sql/classes.lisp
@@ -644,13 +644,14 @@ uninclusive, and the args from that keyword to the end."
 (defmethod output-sql ((stmt sql-create-table) &optional
                        (database *default-database*))
   (flet ((output-column (column-spec)
 (defmethod output-sql ((stmt sql-create-table) &optional
                        (database *default-database*))
   (flet ((output-column (column-spec)

-           (destructuring-bind (name type &rest constraints)
+           (destructuring-bind (name type &optional db-type &rest constraints)

                column-spec
              (let ((type (listify type)))
                (output-sql name database)
                (write-char #\Space *sql-stream*)
                (write-string
                column-spec
              (let ((type (listify type)))
                (output-sql name database)
                (write-char #\Space *sql-stream*)
                (write-string

-                (database-get-type-specifier (car type) (cdr type) database)
+                (if (stringp db-type) db-type ; override definition
+                    (database-get-type-specifier (car type) (cdr type) database))

                 *sql-stream*)
                (let ((constraints
                       (database-constraint-statement constraints database)))
                 *sql-stream*)
                (let ((constraints
                       (database-constraint-statement constraints database)))

diff --git a/sql/objects.lisp b/sql/objects.lisp
index e1bc241e09cdf26c4be92f3e9d1ff7517052063a..38c5f498ace16816ff1556eb09bd6bb28019150f 100644 (file)
--- a/sql/objects.lisp
+++ b/sql/objects.lisp
@@ -234,6 +234,7 @@ superclass of the newly-defined View Class."
     (let ((cdef
            (list (sql-expression :attribute (view-class-slot-column slotdef))
                  (slot-type slotdef))))
     (let ((cdef
            (list (sql-expression :attribute (view-class-slot-column slotdef))
                  (slot-type slotdef))))

+      (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)))))
       (let ((const (view-class-slot-db-constraints slotdef)))
         (when const 
           (setq cdef (append cdef (list const)))))