From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 30 Aug 2006 13:36:06 +0000 (+0000)
Subject: r11068:         * clsql.asd: Add support for loop extensions for clisp. Support clisp... 
X-Git-Tag: v3.8.6~54
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=ed3fc2379a78875cf80cdb4d000c0bfdf8806fe7

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

diff --git a/ChangeLog b/ChangeLog
index 113bc61..1927d33 100644
--- 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 f423927..1a5fcdf 100644
--- 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 5bce5d8..44cde13 100644
--- 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)