fixed a bug where it was ignoring the new parameters passed in on a setf-er

[clsql.git] / sql / command-object.lisp

diff --git a/sql/command-object.lisp b/sql/command-object.lisp
index c7b0ae5c4be3b5e25e96afe2b0ca78ee2967970e..566a2fea293b6693225af28e7034ed9d06c1441b 100644 (file)
--- a/sql/command-object.lisp
+++ b/sql/command-object.lisp
@@ -32,12 +32,31 @@
                      :documentation "Have we already prepared this command object")
    ))
 
+(defmethod initialize-instance :after ((o command-object) &key &allow-other-keys )
+  ;; Inits parameter nulls
+  (setf (parameters o) (parameters o)))
+
+(defmethod (setf parameters) (new (o command-object))
+  " This causes the semantics to match cl-sql instead of cl-postgresql
+  "
+  (setf (slot-value o 'parameters)
+       (loop for p in new
+             collecting (cond ((null p) :null)
+                              ((member p (list :false :F)) nil)
+                              (T p)))))
+
+(defun reset-command-object (co)
+  "Resets the command object to have no name and to be unprepared
+     (This is useful if you want to run a command against a second database)"
+  (setf (prepared-name co) ""
+       (has-been-prepared co) nil))
+
 (defun command-object (expression &optional parameters (prepared-name ""))
   (make-instance 'command-object
                 :expression expression
                 :parameters parameters
                 :prepared-name prepared-name))
 
-(export '(expression parameters prepared-name has-been-prepared command-object))
+(export '(expression parameters prepared-name has-been-prepared command-object reset-command-object))