From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sun, 18 Apr 2004 02:49:46 +0000 (+0000)
Subject: r9050: Automated commit for Debian build of clsql upstream-version-2.7.6
X-Git-Tag: v3.8.6~613
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=135b3acd4de4c069c9e0e906c44deb4b67f9ad33

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

diff --git a/ChangeLog b/ChangeLog
index 2500721..1fa9602 100644
--- 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
diff --git a/debian/changelog b/debian/changelog
index fa67d44..284e3f0 100644
--- 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
diff --git a/sql/classes.lisp b/sql/classes.lisp
index 5a22584..7098ca2 100644
--- 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)
-           (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
-                (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)))
diff --git a/sql/objects.lisp b/sql/objects.lisp
index e1bc241..38c5f49 100644
--- 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))))
+      (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)))))