X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base%2Futils.lisp;h=9fb6e7c2b59c99af41079353a57270cc4376b186;hb=967266c94b00f91e5967b8330fe2b9134b0c0447;hp=55f2bc91e540401d957a3e3679f18ebfc4b9bc60;hpb=d0f147d0e7d942b379bd7cd472f26b00c33916bc;p=clsql.git

diff --git a/base/utils.lisp b/base/utils.lisp
index 55f2bc9..9fb6e7c 100644
--- a/base/utils.lisp
+++ b/base/utils.lisp
@@ -76,7 +76,7 @@
   #+allegro (mp:make-process-lock :name name)
   #+cmu (mp:make-lock name)
   #+lispworks (mp:make-lock :name name)
-  #+openmcl (ccl:make-lock :name name)
+  #+openmcl (ccl:make-lock name)
   #+sb-thread (sb-thread:make-mutex :name name)
   #+scl (thread:make-lock name)
   #-(or allegro cmu lispworks openmcl sb-thread scl) (declare (ignore name))
@@ -185,23 +185,33 @@ synchronously execute the result using a Bourne-compatible shell,
 returns (VALUES string-output error-output exit-status)"
   (let ((command (apply #'format nil control-string args)))
     #+sbcl
-    (let ((process (sb-ext:run-program  
+    (let* ((process (sb-ext:run-program  
 		    "/bin/sh"
 		    (list "-c" command)
-		    :input nil :output :stream :error :stream)))
+		    :input nil :output :stream :error :stream))
+	   (output (read-stream-to-string (sb-impl::process-output process)))
+	   (error (read-stream-to-string (sb-impl::process-error process))))
+      (close (sb-impl::process-output process))
+      (close (sb-impl::process-error process))
       (values
-       (sb-impl::process-output process)
-       (sb-impl::process-error process)
-       (sb-impl::process-exit-code process)))
+       output
+       error
+       (sb-impl::process-exit-code process)))    
+
     
     #+(or cmu scl)
-    (let ((process (ext:run-program  
-		    "/bin/sh"
-		    (list "-c" command)
-		    :input nil :output :stream :error :stream)))
+    (let* ((process (ext:run-program  
+		     "/bin/sh"
+		     (list "-c" command)
+		     :input nil :output :stream :error :stream))
+	   (output (read-stream-to-string (ext::process-output process)))
+	   (error (read-stream-to-string (ext::process-error process))))
+      (close (ext::process-output process))
+      (close (ext::process-error process))
+
       (values
-       (ext::process-output process)
-       (ext::process-error process)
+       output
+       error
        (ext::process-exit-code process)))    
 
     #+allegro
@@ -321,3 +331,23 @@ list of characters and replacement strings."
 	  (setf (char new-string dpos) c)
 	  (incf dpos))))))
 
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (char= #\a (schar (symbol-name '#:a) 0))
+    (pushnew :lowercase-reader *features*)))
+
+(defun symbol-name-default-case (str)
+  #-lowercase-reader
+  (string-upcase str)
+  #+lowercase-reader
+  (string-downcase str))
+
+(defmethod convert-to-db-default-case (str database)
+  (if database
+      (case (db-type-default-case (database-underlying-type database))
+	(:upper (string-upcase str))
+	(:lower (string-downcase str))
+	(t str))
+    ;; Default CommonSQL behavior is to upcase strings
+    (string-upcase str)))
+