From 709d415122d04713da58a7c6d7ee10162c386a56 Mon Sep 17 00:00:00 2001 From: Nathan Bird Date: Fri, 29 Jan 2010 15:16:55 -0500 Subject: [PATCH] Using the new clsql-sys::+whitespace-chars+ param. --- db-sqlite3/sqlite3-sql.lisp | 2 +- sql/expressions.lisp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/db-sqlite3/sqlite3-sql.lisp b/db-sqlite3/sqlite3-sql.lisp index 1ba6b0b..929aece 100644 --- a/db-sqlite3/sqlite3-sql.lisp +++ b/db-sqlite3/sqlite3-sql.lisp @@ -287,7 +287,7 @@ return (let* ((raw-type (third field-info)) (start-length (position #\( raw-type)) - (type (string-trim '(#\space #\tab #\newline) + (type (string-trim clsql-sys::+whitespace-chars+ (if start-length (subseq raw-type 0 start-length) raw-type))) diff --git a/sql/expressions.lisp b/sql/expressions.lisp index 770bf37..b54029e 100644 --- a/sql/expressions.lisp +++ b/sql/expressions.lisp @@ -249,12 +249,7 @@ ;; the next loop simply emits each sub-expression with the appropriate number of ;; parens and operators (flet ((trim (sub) - (string-trim '(#\space #\newline #\return #\tab - ;; sbcl, allegrocl, and clisp use #\no-break_space - ;; lispworks uses #\no-break-space - #-lispworks #\no-break_space - #+lispworks #\no-break-space - ) + (string-trim +whitespace-chars+ (with-output-to-string (*sql-stream*) (output-sql sub database))))) (let ((str-subs (loop for sub in sub-expressions -- 2.34.1