X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-aodbc%2Faodbc-sql.lisp;h=e83b3fe0aa1bfb0869e3fb36c777fc8959795643;hp=a43fb188dab9eac61c5271c95ad075ba9defdde8;hb=e567409d9fff3f7231c2a0bb69b345e19de2b246;hpb=bb2818fb8a6714a55b360dec0bb043c5edccb3f4

diff --git a/db-aodbc/aodbc-sql.lisp b/db-aodbc/aodbc-sql.lisp
index a43fb18..e83b3fe 100644
--- a/db-aodbc/aodbc-sql.lisp
+++ b/db-aodbc/aodbc-sql.lisp
@@ -28,17 +28,16 @@
   t)
 
 (when (find-package :dbi)
-  (clsql-sys:database-type-load-foreign :aodbc)) 
+  (clsql-sys:database-type-load-foreign :aodbc))
 
 
 ;; AODBC interface
 
 (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)))
+  ((aodbc-db-type :accessor database-aodbc-db-type :initform :unknown)))
 
 (defmethod database-name-from-spec (connection-spec
-				    (database-type (eql :aodbc)))
+                                    (database-type (eql :aodbc)))
   (check-connection-spec connection-spec database-type (dsn user password))
   (destructuring-bind (dsn user password) connection-spec
     (declare (ignore password))
@@ -49,101 +48,37 @@
   #+aodbc-v2
   (destructuring-bind (dsn user password) connection-spec
     (handler-case
-	(make-instance 'aodbc-database
-	  :name (database-name-from-spec connection-spec :aodbc)
-	  :database-type :aodbc
-	  :dbi-package (find-package '#:dbi)
-	  :aodbc-conn
-	  (dbi:connect :user user
-		       :password password
-		       :data-source-name dsn))
-      (clsql-error (e)
-	(error e))
-      (error () 	;; Init or Connect failed
-	(error 'sql-connection-error
-	       :database-type database-type
-	       :connection-spec connection-spec
-	       :message "Connection failed")))))
-
-
-
-;;; Sequence functions
-
-(defun %sequence-name-to-table (sequence-name)
-  (concatenate 'string "_CLSQL_SEQ_" (sql-escape sequence-name)))
-
-(defun %table-name-to-sequence-name (table-name)
-  (and (>= (length table-name) 11)
-       (string-equal (subseq table-name 0 11) "_CLSQL_SEQ_")
-       (subseq table-name 11)))
-
-(defmethod database-create-sequence (sequence-name
-				     (database aodbc-database))
-  (let ((table-name (%sequence-name-to-table sequence-name)))
-    (database-execute-command
-     (concatenate 'string "CREATE TABLE " table-name
-		  " (last_value int NOT NULL PRIMARY KEY, increment_by int, min_value int, is_called char(1))")
-     database)
-    (database-execute-command 
-     (concatenate 'string "INSERT INTO " table-name
-		  " VALUES (1,1,1,'f')")
-     database)))
-
-(defmethod database-drop-sequence (sequence-name
-				   (database aodbc-database))
-  (database-execute-command
-   (concatenate 'string "DROP TABLE " (%sequence-name-to-table sequence-name)) 
-   database))
-
-(defmethod database-list-sequences ((database aodbc-database)
-                                    &key (owner nil))
-  (declare (ignore owner))
-  (warn "database-list-sequences not implemented for AODBC.")
-  nil)
-
-
-(defmethod database-list-indexes ((database aodbc-database)
-				 &key (owner nil))
-  (warn "database-list-indexes not implemented for AODBC.")
-  nil)
-
-(defmethod database-set-sequence-position (sequence-name
-                                           (position integer)
-                                           (database aodbc-database))
-  (database-execute-command
-   (format nil "UPDATE ~A SET last_value=~A,is_called='t'" 
-	   (%sequence-name-to-table sequence-name)
-           position)
-   database)
-  position)
-
-(defmethod database-sequence-next (sequence-name (database aodbc-database))
-  (without-interrupts
-   (let* ((table-name (%sequence-name-to-table sequence-name))
-	  (tuple
-	   (car (database-query 
-		 (concatenate 'string "SELECT last_value,is_called FROM " 
-			      table-name)
-		 database :auto nil))))
-     (cond
-       ((char-equal (schar (second tuple) 0) #\f)
-	(database-execute-command
-	 (format nil "UPDATE ~A SET is_called='t'" table-name)
-	 database)
-	(car tuple))
-       (t
-	(let ((new-pos (1+ (car tuple))))
-	 (database-execute-command
-	  (format nil "UPDATE ~A SET last_value=~D" table-name new-pos)
-	  database)
-	 new-pos))))))
-	     
-(defmethod database-sequence-last (sequence-name (database aodbc-database))
-  (without-interrupts
-   (caar (database-query 
-	  (concatenate 'string "SELECT last_value FROM " 
-		       (%sequence-name-to-table sequence-name))
-	  database :auto nil))))
+        (make-instance 'aodbc-database
+          :name (database-name-from-spec connection-spec :aodbc)
+          :database-type :aodbc
+          :dbi-package (find-package '#:dbi)
+          :odbc-conn
+          (dbi:connect :user user
+                       :password password
+                       :data-source-name dsn))
+      (sql-error (e)
+        (error e))
+      (error ()         ;; Init or Connect failed
+        (error 'sql-connection-error
+               :database-type database-type
+               :connection-spec connection-spec
+               :message "Connection failed")))))
+
+
+(defmethod database-query (query-expression (database aodbc-database)
+                           result-types field-names)
+  #+aodbc-v2
+  (handler-case
+      (dbi:sql query-expression
+               :db (clsql-sys::odbc-conn database)
+               :types result-types
+               :column-names field-names)
+    #+ignore
+    (error ()
+      (error 'sql-database-data-error
+             :database database
+             :expression query-expression
+             :message "Query failed"))))
 
 (defmethod database-create (connection-spec (type (eql :aodbc)))
   (warn "Not implemented."))