X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Futils.lisp;h=60fedc3f971d4a8fd6b9b2d39471dfcb5350064d;hb=084aa8d0bcfd2e07d0f7b267f27440191d699268;hp=b43e3180e64f6f8d392446229660c6eed1caaab1;hpb=dc107d34212597ed1272cfa21138d384e71b00d2;p=clsql.git diff --git a/sql/utils.lisp b/sql/utils.lisp index b43e318..60fedc3 100644 --- a/sql/utils.lisp +++ b/sql/utils.lisp @@ -43,6 +43,7 @@ (defun float-to-sql-string (num) "Convert exponent character for SQL" (let ((str (write-to-string num :readably t))) + (declare (type string str)) (cond ((find #\f str) (substitute #\e #\f str)) @@ -125,6 +126,7 @@ (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 @@ -166,6 +168,7 @@ (setq pos (1+ end)))) (defun string-to-list-connection-spec (str) + (declare (type string str)) (let ((at-pos (position-char #\@ str 0 (length str)))) (cond ((and at-pos (> (length str) at-pos)) @@ -392,3 +395,13 @@ is replaced with replacement. [FROM http://cl-cookbook.sourceforge.net/strings.h (unless stream (get-output-stream-string out)))) + +(defun filter-plist (plist &rest keys-to-remove) + "Returns a copy of the given plist with indicated key-value pairs +removed. keys are searched with #'MEMBER" + (declare (dynamic-extent keys-to-remove)) + (when plist + (loop for (k v . rest) = plist then rest + unless (member k keys-to-remove) + collect k and collect v + while rest)))