X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base%2Futils.cl;h=99df86c90e38a9285b660ef43986f764b09c813e;hb=42a951e9f7152e7c145958f4dfed41d4e865c9fd;hp=b64824c971b29a61d858280eb1c664cd5f15b57d;hpb=96f1b817adddbf0a33b54b3b23c09b1c39a23871;p=clsql.git

diff --git a/base/utils.cl b/base/utils.cl
index b64824c..99df86c 100644
--- a/base/utils.cl
+++ b/base/utils.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:   Kevin M. Rosenberg
 ;;;; Date Started: Mar 2002
 ;;;;
-;;;; $Id: utils.cl,v 1.2 2002/05/15 17:23:59 kevin Exp $
+;;;; $Id: utils.cl,v 1.4 2002/05/27 17:19:30 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,7 +17,7 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :clsql-sys)
+(in-package :clsql-base-sys)
 
 (defun number-to-sql-string (num)
   (etypecase num
@@ -32,8 +32,24 @@
   "Convert exponent character for SQL"
   (substitute #\e #\f (substitute #\e #\d (write-to-string num :readably t))))
 
-(defun sql-escape (s)
-  "Escape single quotes for SQL"
+(defun sql-escape (identifier)
+  "Change hyphens to underscores, ensure string"
+  (let* ((unescaped (etypecase identifier
+                      (symbol (symbol-name identifier))
+                      (string identifier)))
+         (escaped (make-string (length unescaped))))
+    (dotimes (i (length unescaped))
+      (setf (char escaped i)
+            (cond ((equal (char unescaped i) #\-)
+                   #\_)
+                  ;; ...
+                  (t
+                   (char unescaped i)))))
+    escaped))
+
+
+(defun sql-escape-quotes (s)
+  "Escape quotes for SQL string writing"
   (substitute-string-for-char s #\' "''"))
 
 (defun substitute-string-for-char (procstr match-char subst-str)