make output-sql for ident-attributes do its best not to output invalid sql

[clsql.git] / sql / expressions.lisp

diff --git a/sql/expressions.lisp b/sql/expressions.lisp
index 16e967bee67d2a4f07e66f0a22a22955a6b275e0..aa9edcab98143431b00e3213906ea1fd01bbb605 100644 (file)
--- a/sql/expressions.lisp
+++ b/sql/expressions.lisp
@@ -110,6 +110,7 @@
     `(make-instance 'sql-ident :name ',name)))
 
 (defmethod output-sql ((expr sql-ident) database)
+  
   (with-slots (name) expr
     (write-string
      (etypecase name
@@ -147,33 +148,32 @@
       :type ',type)))
 
 (defmethod output-sql ((expr sql-ident-attribute) database)
-  (with-slots (qualifier name type) expr
-    (if (and (not qualifier) (not type))
-        (etypecase name
-          (string
-           (write-string name *sql-stream*))
-          (symbol
-           (write-string
-            (sql-escape (symbol-name name)) *sql-stream*)))
-
-        ;;; KMR: The TYPE field is used by CommonSQL for type conversion -- it
-      ;;; should not be output in SQL statements
-      #+ignore
-      (format *sql-stream* "~@[~A.~]~A~@[ ~A~]"
-              (when qualifier
-                (sql-escape qualifier))
-              (sql-escape name)
-              (when type
-                (symbol-name type)))
-      (format *sql-stream* "~@[~A.~]~A"
-              (when qualifier
-                (typecase qualifier
-                  (string (format nil "~s" qualifier))
-                  (t (sql-escape qualifier))))
-              (typecase name
-                (string (format nil "~s" (sql-escape name)))
-                (t (sql-escape name)))))
-    t))
+;;; KMR: The TYPE field is used by CommonSQL for type conversion -- it
+;;; should not be output in SQL statements
+  (let ((*print-pretty* nil))
+    (labels ((quoted-string-p (inp)
+              (and (char-equal #\" (elt inp 0))
+                   (char-equal #\" (elt inp (1- (length inp))))))
+            (safety-first (inp)
+              "do our best not to output sql that we can guarantee is invalid. 
+              if the ident has a space or quote in it, instead output a quoted
+             identifier containing those chars"
+              (when (and (not (quoted-string-p inp))
+                         (find-if
+                          (lambda (x) (member x '(#\space #\' #\")
+                                              :test #'char-equal)) inp))
+                (setf inp (format nil "~s" (substitute "\\\"" "\"" inp :test #'string-equal))))
+              inp))
+      (with-slots (qualifier name type) expr
+       (format *sql-stream* "~@[~a.~]~a"
+               (typecase qualifier
+                 (null nil)            ; nil is a symbol
+                 (string (format nil "~s" qualifier))
+                 (symbol (safety-first (sql-escape qualifier))))
+               (typecase name ;; could never get this to be nil without getting another error first
+                 (string (format nil "~s" name))
+                 (symbol (safety-first (sql-escape name)))))
+       t))))
 
 (defmethod output-sql-hash-key ((expr sql-ident-attribute) database)
   (with-slots (qualifier name type)