Changeset combined,2.1.13 for combined/src/odbc/odbc-main.lisp

Timestamp:

02/04/2008 01:12:58 AM (18 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

test

parents:

Rev	Tree	Chgset
2.1.12	@combined,2.1.12	[combined,2.1.12]
5	@combined,5	[combined,5]

revision id:

dsowen@fugue88.ws-20080204011258-m8yzmcun7yq1lb7q

Message:

Merge from vendor.

File:

• combined/src/odbc/odbc-main.lisp (modified) (5 diffs)

combined/src/odbc/odbc-main.lisp

@@ -106 +106 @@
 
 
-;;; fixme, is this correct?
 (defmethod print-object ((connection odbc-connection) s)
   (format s "#<~A SERVER=~S DBMS=~S USER=~S>"
@@ -310 +309 @@
          (error "not able to deduce parameter specification for ~A" obj)))))
 
-(defun exec-sql (connection sql parameter-list)
+(defun exec-sql-statement (connection sql parameter-list)
   (let ((query (make-query connection)))
     (unwind-protect
@@ -358 +357 @@
         )))
 
+(defun exec-sql* (connection sql parameter-list)
+  (exec-sql-statement connection sql parameter-list))
+
+(defun exec-sql (connection sql &rest parameter-list)
+  (exec-sql* connection sql parameter-list))
+
+
+
 (defun exec-query* (connection sql parameter-list)
   (multiple-value-bind (rows result-sets out-params)
-      (exec-sql connection sql parameter-list)
+      (exec-sql-statement connection sql parameter-list)
     (declare (ignore rows) (ignore out-params))
     (let ((res nil))
@@ -373 +380 @@
 (defun exec-update* (connection sql parameter-list)
   (multiple-value-bind (rows result-sets out-params)
-      (exec-sql connection sql parameter-list)
+      (exec-sql-statement connection sql parameter-list)
     (declare (ignore result-sets out-params))
     rows))
@@ -382 +389 @@
 (defun exec-command* (connection sql parameter-list)
   (multiple-value-bind (rows result-sets out-params)
-      (exec-sql connection sql parameter-list)
+      (exec-sql-statement connection sql parameter-list)
     (declare (ignore rows result-sets))
     (values-list out-params)))