From 69df048c1413aa55d9816ad4c7d6f32ae2d6c6cc Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Mon, 10 May 2004 20:59:22 +0000
Subject: [PATCH] r9309: fix recording reversion tests/test-init.lisp: Change a
 :column attribute         to test symbols as value

---
 ChangeLog            | 4 ++++
 base/basic-sql.lisp  | 8 ++++----
 base/package.lisp    | 3 ++-
 sql/package.lisp     | 3 ++-
 tests/test-init.lisp | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee9f43b..a030885 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 10 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
 	* sql/kmr-mop.lisp: Explicitly check slot order and
 	store as a cl:*feature*
+	* sql/recording.lisp: Remove additional types to
+	increase CommonSQL conformance.
+	* tests/test-init.lisp: Change a :column attribute
+	to test symbols as value
 	
 9 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
 	* Version 2.10.15
diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 258832d..a7d32cf 100644
--- a/base/basic-sql.lisp
+++ b/base/basic-sql.lisp
@@ -31,13 +31,13 @@ that expression and a list of field names selected in sql-exp."))
 
 (defmethod query ((query-expression string) &key (database *default-database*)
                   (result-types :auto) (flatp nil) (field-names t))
-  (record-sql-action query-expression :query database)
+  (record-sql-command query-expression database)
   (multiple-value-bind (rows names) (database-query query-expression database result-types
                                                     field-names)
     (let ((result (if (and flatp (= 1 (length (car rows))))
                       (mapcar #'car rows)
                     rows)))
-      (record-sql-action result :result database)
+      (record-sql-result result database)
       (if field-names
 	  (values result names)
 	result))))
@@ -55,9 +55,9 @@ pair."))
 
 (defmethod execute-command ((sql-expression string)
                             &key (database *default-database*))
-  (record-sql-action sql-expression :command database)
+  (record-sql-command sql-expression database)
   (let ((res (database-execute-command sql-expression database)))
-    (record-sql-action res :result database))
+    (record-sql-result res database))
   (values))
 
 ;;; Large objects support
diff --git a/base/package.lisp b/base/package.lisp
index 1650d3e..cef8cd9 100644
--- a/base/package.lisp
+++ b/base/package.lisp
@@ -235,7 +235,8 @@
      #:mjd-to-gregorian
 
      ;; recording.lisp -- SQL I/O Recording 
-     #:record-sql-action
+     #:record-sql-command
+     #:record-sql-result
      #:add-sql-stream                 ; recording  xx
      #:delete-sql-stream	          ; recording  xx
      #:list-sql-streams	          ; recording  xx
diff --git a/sql/package.lisp b/sql/package.lisp
index ff6ec17..1b887ed 100644
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -209,7 +209,8 @@
 
        
        ;; recording.lisp -- SQL I/O Recording 
-       #:record-sql-action
+       #:record-sql-command
+       #:record-sql-result
        #:add-sql-stream                   ; recording  xx
        #:delete-sql-stream                ; recording  xx
        #:list-sql-streams                 ; recording  xx
diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 6034918..ed94987 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -145,7 +145,7 @@
     :type (string 30)
     :initarg :city)
    (postal-code
-    :column "zip"
+    :column zip
     :type integer
     :void-value 0
     :initarg :postal-code))
-- 
2.34.1