r11068: * clsql.asd: Add support for loop extensions for clisp. Support clisp...

diff --git a/ChangeLog b/ChangeLog
index 113bc61d53fbf912a4efd77982848dda3bf121ae..1927d33cee594da46681027ca16faed73f9d7aa2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@
        * uffi/make.sh, db-mysql/make.sh: Remove files
        * uffi/Makefile, db-mysql/Makefile: Add support for cygwin compilation.
        Refactor to remove need to make.sh shell scripts. 
-       * clsql.asd: Add support for loop extensions for clisp.
+       * clsql.asd: Add support for loop extensions for clisp. Support clisp via cffi.
        * sql/loop-extension.lisp: Define loop-record-iteration-path in CLSQL-SYS 
        package rather than CL-USER. Add support for ansi-loop on clisp. 
        * sql/ansi-loop.lisp: New file to support iteration on clisp. 

diff --git a/clsql.asd b/clsql.asd
index f423927cecfb262027d2057fa504c0159237f4e2..1a5fcdf1c18fdfce2d5f1c1f1619405955584231 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -18,6 +18,12 @@
 (defpackage #:clsql-system (:use #:asdf #:cl))
 (in-package #:clsql-system)
 
+#+clisp
+(progn
+  (asdf:operate 'asdf:load-op 'cffi)
+  (asdf:operate 'asdf:load-op 'cffi-uffi-compat)
+  (asdf:defsystem uffi :depends-on (cffi-uffi-compat)))
+
 ;; need to load uffi for below perform :after method
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (find-package 'uffi)

diff --git a/sql/expressions.lisp b/sql/expressions.lisp
index 5bce5d89c03e30d9b5118392b2d3f338aacd34e9..44cde13d4b57c6b271be8241b1597e017a23678b 100644 (file)
--- a/sql/expressions.lisp
+++ b/sql/expressions.lisp
@@ -900,11 +900,10 @@ uninclusive, and the args from that keyword to the end."
 (defmethod database-output-sql ((tee (eql t)) database)
   (if database
       (let ((val (database-output-sql-as-type 'boolean t database (database-type database))))
-        (if val
-            (typecase val
-              (string val)
-              (t (format nil "~A" val)))
-          "'Y'"))
+        (when val
+          (typecase val
+            (string (format nil "'~A'" val))
+            (integer (format nil "~A" val)))))
     "'Y'"))
 
 #+nil(defmethod database-output-sql ((tee (eql t)) database)