From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Mon, 12 Apr 2004 22:08:32 +0000 (+0000)
Subject: r8986: rename for aodbc compliance
X-Git-Tag: v3.8.6~643
X-Git-Url: http://git.kpe.io/?a=commitdiff_plain;ds=sidebyside;h=4eec15b82de673c5676f5f817f9dba0b939606cf;hp=2f1e9becafa048960362bd6f9bb0f327045807cd;p=clsql.git

r8986: rename for aodbc compliance
---

diff --git a/db-odbc/odbc-package.lisp b/db-odbc/odbc-package.lisp
index a2b7b10..4c83742 100644
--- a/db-odbc/odbc-package.lisp
+++ b/db-odbc/odbc-package.lisp
@@ -25,9 +25,9 @@
 
      #:connect
      #:disconnect
-     #:query
-     #:execute
+     #:sql
      #:close-query
      #:fetch-row
+     
      )
     (:documentation "This is the low-level interface ODBC."))
diff --git a/db-odbc/odbc-sql.lisp b/db-odbc/odbc-sql.lisp
index 474ef8e..30308e5 100644
--- a/db-odbc/odbc-sql.lisp
+++ b/db-odbc/odbc-sql.lisp
@@ -59,7 +59,7 @@
 
 (defmethod database-query (query-expression (database odbc-database) result-types) 
   (handler-case
-      (odbc:query query-expression :db (database-odbc-conn database)
+      (odbc:sql query-expression :db (database-odbc-conn database)
 	       :types result-types)
     (error ()
       (error 'clsql-sql-error
@@ -71,7 +71,7 @@
 (defmethod database-execute-command (sql-expression 
 				     (database odbc-database))
   (handler-case
-      (odbc:execute sql-expression (database-odbc-conn database))
+      (odbc:sql sql-expression (database-odbc-conn database))
     (error ()
       (error 'clsql-sql-error
 	     :database database
@@ -89,7 +89,7 @@
 				      &key full-set result-types)
   (handler-case 
       (multiple-value-bind (query column-names)
-	  (odbc:query query-expression 
+	  (odbc:sql query-expression 
 		   :db (database-odbc-conn database) 
 		   :row-count nil
 		   :column-names t