Changeset main,5 for main

Timestamp:

10/06/2007 04:38:39 AM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

xbase

revision id:

dsowen@fugue88.ws-20071006043839-k24vfijhbb4ogdor

Message:

Now converts boolean fields.
Escape SQL keyword GROUP.
Escape back-slashes in strings (Postgres-specific).

File:

• main/xbase.lisp (modified) (4 diffs)

main/xbase.lisp

@@ -129 +129 @@
                   ((string= type "D") 'string)
                   ((string= type "M") 'string)
+                  ((string= type "L") 'string)
                   (t (abort)))))
       `(,(intern name) ,type ,size))))
@@ -146 +147 @@
 (defun sql-escape-fieldname (name)
   (let ((name (string-downcase name)))
-    (if (member name '("user") :test 'equal)
+    (if (member name '("group" "user") :test 'equal)
         (concatenate 'string "\"" name "\"")
         name)))
@@ -153 +154 @@
   (if (string= value "")
       "null"
-      (format nil "'~A'" (cl-ppcre:regex-replace-all "'" value "''"))))
+      (let ((value
+             (concatenate 'string "'" (regex-replace-all "'" value "''") "'")))
+        (when (find #\\ value :test 'char=)
+          (setf value (concatenate 'string
+                                   "E"
+                                   (regex-replace-all "\\\\"
+                                                      value
+                                                      "\\\\\\\\"))))
+        value)))
 
 (defun sql-column (desc)
@@ -174 +183 @@
                (warn "MEMOs aren't implemented yet.")
                "NUMERIC(10)")
+              ((string= type "L")
+               "BOOLEAN")
               (t (error "Bad type ~S." type))))))