X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Futils.lisp;h=52ee019943c3250946d6d465bbb3ca94210aaf43;hb=30186614582039bdc3d3f86bc5165ef300c5d3e0;hp=6e4230d84d94486d8448cc9c84f9c89839bd47e4;hpb=bab5e8056e3850cd9fb0582f73955aee5abf010b;p=clsql.git diff --git a/sql/utils.lisp b/sql/utils.lisp index 6e4230d..52ee019 100644 --- a/sql/utils.lisp +++ b/sql/utils.lisp @@ -16,6 +16,12 @@ (in-package #:clsql-sys) +(defun %get-int (v) + (etypecase v + (string (parse-integer v :junk-allowed t)) + (integer v) + (number (truncate v)))) + (defvar +whitespace-chars+ '(#\space #\tab #\newline #\return ;; Tested: sbcl unicode, allegrocl, openmcl,clisp use #\no-break_space @@ -125,15 +131,17 @@ (substitute-string-for-char s #\' "''")) (defun substitute-string-for-char (procstr match-char subst-str) -"Substitutes a string for a single matching character of a string" - (declare (type string procstr)) - (let ((pos (position match-char procstr))) - (if pos - (concatenate 'string - (subseq procstr 0 pos) subst-str - (substitute-string-for-char - (subseq procstr (1+ pos)) match-char subst-str)) - procstr))) + "Substitutes a string for a single matching character of a string" + (when procstr + (locally + (declare (type string procstr)) + (let ((pos (position match-char procstr))) + (if pos + (concatenate 'string + (subseq procstr 0 pos) subst-str + (substitute-string-for-char + (subseq procstr (1+ pos)) match-char subst-str)) + procstr))))) (defun position-char (char string start max)