X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base%2Fbasic-sql.lisp;h=38733147d990750b4eb971c90a5c96d96b734561;hb=79dacf4fb7e6707e815c3e8072e5c809acaa9386;hp=61a932e5ad02df135fc3e6c0687c4c6c962ca0d8;hpb=5691bb90517d7c565a141d131da76c3de1f8d566;p=clsql.git diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp index 61a932e..3873314 100644 --- a/base/basic-sql.lisp +++ b/base/basic-sql.lisp @@ -31,14 +31,14 @@ that expression and a list of field names selected in sql-exp.")) (defmethod query ((query-expression string) &key (database *default-database*) (result-types nil) (flatp nil)) - (record-sql-command query-expression database) + (record-sql-action query-expression :query database) (let* ((res (database-query query-expression database result-types)) (res (if (and flatp (= (length (slot-value query-expression 'selections)) 1)) (mapcar #'car res) res))) - (record-sql-result res database) + (record-sql-action res :result database) res)) ;;; Execute @@ -54,12 +54,11 @@ pair.")) (defmethod execute-command ((sql-expression string) &key (database *default-database*)) - (record-sql-command sql-expression database) + (record-sql-action sql-expression :command database) (let ((res (database-execute-command sql-expression database))) - (record-sql-result res database)) + (record-sql-action res :result database)) (values)) - (defmacro do-query (((&rest args) query-expression &key (database '*default-database*) (result-types nil)) &body body)