r9447: * sql/*.lisp: Add db-type parameter to generic functions READ-SQL...

[clsql.git] / db-aodbc / aodbc-sql.lisp

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index 22aa329b4b1c4fc706790e91bb1f6850c8377641..4d83206945bb5b9881d06f21e88afbd6cb6829d8 100644 (file)
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -19,24 +19,21 @@
 (in-package #:clsql-aodbc)
 
 ;; interface foreign library loading routines
-(defmethod clsql-base-sys:database-type-library-loaded ((database-type (eql :aodbc)))
+(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :aodbc)))
   "T if foreign library was able to be loaded successfully. "
   (when (find-package :dbi) ;; finds Allegro's DBI (AODBC) package
     t))
 
-(defmethod clsql-base-sys:database-type-load-foreign ((databae-type (eql :aodbc)))
+(defmethod clsql-sys:database-type-load-foreign ((databae-type (eql :aodbc)))
   t)
 
 (when (find-package :dbi)
-  (clsql-base-sys:database-type-load-foreign :aodbc)) 
-
-(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
-  t)
+  (clsql-sys:database-type-load-foreign :aodbc)) 
 
 
 ;; AODBC interface
 
-(defclass aodbc-database (database)
+(defclass aodbc-database (generic-odbc-database)
   ((aodbc-conn :accessor database-aodbc-conn :initarg :aodbc-conn)
    (aodbc-db-type :accessor database-aodbc-db-type :initform :unknown)))
 
@@ -62,11 +59,10 @@
       (clsql-error (e)
        (error e))
       (error ()        ;; Init or Connect failed
-       (error 'clsql-connect-error
+       (error 'sql-connection-error
               :database-type database-type
               :connection-spec connection-spec
-              :errno nil
-              :error "Connection failed")))))
+              :message "Connection failed")))))
 
 (defmethod database-disconnect ((database aodbc-database))
   #+aodbc-v2
@@ -74,19 +70,19 @@
   (setf (database-aodbc-conn database) nil)
   t)
 
-(defmethod database-query (query-expression (database aodbc-database) result-types) 
+(defmethod database-query (query-expression (database aodbc-database) result-types field-names) 
   #+aodbc-v2
   (handler-case
       (dbi:sql query-expression :db (database-aodbc-conn database)
-              :types result-types)
+              :types result-types
+               :column-names field-names)
       (clsql-error (e)
        (error e))
     (error ()
-      (error 'clsql-sql-error
+      (error 'sql-database-data-error
             :database database
             :expression query-expression
-            :errno nil
-            :error "Query failed"))))
+            :message "Query failed."))))
 
 (defmethod database-execute-command (sql-expression 
                                     (database aodbc-database))
@@ -96,11 +92,10 @@
       (clsql-error (e)
        (error e))
     (error ()
-      (error 'clsql-sql-error
+      (error 'sql-database-data-error
             :database database
             :expression sql-expression
-            :errno nil
-            :error "Execute command failed"))))
+            :error "Execute command failed."))))
 
 (defstruct aodbc-result-set
   (query nil)
@@ -129,11 +124,10 @@
       (clsql-error (e)
        (error e))
     (error ()
-      (error 'clsql-sql-error
+      (error 'sql-database-data-error
             :database database
             :expression query-expression
-            :errno nil
-            :error "Query result set failed"))))
+            :error "Query result set failed."))))
 
 (defmethod database-dump-result-set (result-set (database aodbc-database))
   #+aodbc-v2
@@ -157,11 +151,11 @@
 ;;; Sequence functions
 
 (defun %sequence-name-to-table (sequence-name)
-  (concatenate 'string "_clsql_seq_" (sql-escape sequence-name)))
+  (concatenate 'string "_CLSQL_SEQ_" (sql-escape sequence-name)))
 
 (defun %table-name-to-sequence-name (table-name)
   (and (>= (length table-name) 11)
-       (string= (subseq table-name 0 11) "_clsql_seq_")
+       (string-equal (subseq table-name 0 11) "_CLSQL_SEQ_")
        (subseq table-name 11)))
 
 (defmethod database-create-sequence (sequence-name
@@ -185,9 +179,8 @@
 (defmethod database-list-sequences ((database aodbc-database)
                                     &key (owner nil))
   (declare (ignore owner))
-  (mapcar #'(lambda (s) (%table-name-to-sequence-name (car s)))
-          (database-query "SHOW TABLES LIKE '%clsql_seq%'" 
-                          database nil)))
+  (warn "database-list-sequences not implemented for AODBC.")
+  nil)
 
 (defmethod database-list-tables ((database aodbc-database)
                                 &key (owner nil))
@@ -261,8 +254,7 @@
           (car (database-query 
                 (concatenate 'string "SELECT last_value,is_called FROM " 
                              table-name)
-                database
-                :auto))))
+                database :auto nil))))
      (cond
        ((char-equal (schar (second tuple) 0) #\f)
        (database-execute-command
@@ -281,8 +273,7 @@
    (caar (database-query 
          (concatenate 'string "SELECT last_value FROM " 
                       (%sequence-name-to-table sequence-name))
-         database
-         :auto))))
+         database :auto nil))))
 
 (defmethod database-create (connection-spec (type (eql :aodbc)))
   (warn "Not implemented."))
@@ -301,6 +292,8 @@
 (defmethod db-backend-has-create/destroy-db? ((db-type (eql :aodbc)))
   nil)
 
-#+ignore                      
-(when (clsql-base-sys:database-type-library-loaded :aodbc)
-  (clsql-base-sys:initialize-database-type :database-type :aodbc))
+(defmethod database-initialize-database-type ((database-type (eql :aodbc)))
+  t)
+
+(when (clsql-sys:database-type-library-loaded :aodbc)
+  (clsql-sys:initialize-database-type :database-type :aodbc))