r9042: Automated commit for Debian build of clsql upstream-version-2.7.5

[clsql.git] / base / basic-sql.lisp

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 61a932e5ad02df135fc3e6c0687c4c6c962ca0d8..7b5452823748c5451baf6caff8b14c8324f37fa8 100644 (file)
--- a/base/basic-sql.lisp
+++ b/base/basic-sql.lisp
@@ -31,14 +31,12 @@ 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))
+         (res (if (and flatp (= 1 (length (car res))))
                   (mapcar #'car res)
-                  res)))
-    (record-sql-result res database)
+               res)))
+    (record-sql-action res :result database)
     res))
 
 ;;; Execute
@@ -54,12 +52,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)