r8986: rename for aodbc compliance

diff --git a/db-odbc/odbc-package.lisp b/db-odbc/odbc-package.lisp
index a2b7b107c9fc6d5a46222606d14ff06db3889745..4c8374283cd47dd55058874c5269d55331e8f596 100644 (file)
--- 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 474ef8e96f64baa0dbd5e6ac11697f7578ad83c0..30308e5024c078fd183af05fe89d461e70260f67 100644 (file)
--- 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