(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)
- ((aodbc-conn :accessor database-aodbc-conn :initarg :aodbc-conn)))
+(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)))
(defmethod database-name-from-spec (connection-spec
(database-type (eql :aodbc)))
(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 '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
- (dbi:disconnect (database-aodbc-conn database))
- (setf (database-aodbc-conn database) nil)
- t)
-(defmethod database-query (query-expression (database aodbc-database) result-types)
- #+aodbc-v2
- (handler-case
- (dbi:sql query-expression :db (database-aodbc-conn database)
- :types result-types)
- (error ()
- (error 'clsql-sql-error
- :database database
- :expression query-expression
- :errno nil
- :error "Query failed"))))
-
-(defmethod database-execute-command (sql-expression
- (database aodbc-database))
- #+aodbc-v2
- (handler-case
- (dbi:sql sql-expression :db (database-aodbc-conn database))
- (error ()
- (error 'clsql-sql-error
- :database database
- :expression sql-expression
- :errno nil
- :error "Execute command failed"))))
-
-(defstruct aodbc-result-set
- (query nil)
- (types nil :type cons)
- (full-set nil :type boolean))
-
-(defmethod database-query-result-set ((query-expression string)
- (database aodbc-database)
- &key full-set result-types)
- #+aodbc-v2
- (handler-case
- (multiple-value-bind (query column-names)
- (dbi:sql query-expression
- :db (database-aodbc-conn database)
- :row-count nil
- :column-names t
- :query t
- :types result-types
- )
- (values
- (make-aodbc-result-set :query query :full-set full-set
- :types result-types)
- (length column-names)
- nil ;; not able to return number of rows with aodbc
- ))
- (error ()
- (error 'clsql-sql-error
- :database database
- :expression query-expression
- :errno nil
- :error "Query result set failed"))))
-
-(defmethod database-dump-result-set (result-set (database aodbc-database))
- #+aodbc-v2
- (dbi:close-query (aodbc-result-set-query result-set))
- t)
-
-(defmethod database-store-next-row (result-set
- (database aodbc-database)
- list)
- #+aodbc-v2
- (let ((row (dbi:fetch-row (aodbc-result-set-query result-set) nil 'eof)))
- (if (eq row 'eof)
- nil
- (progn
- (loop for elem in row
- for rest on list
- do
- (setf (car rest) elem))
- list))))
;;; 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
(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-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"
+ (format nil "UPDATE ~A SET last_value=~A,is_called='t'"
(%sequence-name-to-table sequence-name)
position)
database)
(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
(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."))
(defmethod database-probe (connection-spec (type (eql :aodbc)))
(warn "Not implemented."))
-#+ignore
-(when (clsql-base-sys:database-type-library-loaded :aodbc)
- (clsql-base-sys:initialize-database-type :database-type :aodbc))
+;;; Backend capabilities
+
+(defmethod database-underlying-type ((database aodbc-database))
+ (database-aodbc-db-type database))
+
+(defmethod db-backend-has-create/destroy-db? ((db-type (eql :aodbc)))
+ nil)
+
+(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))
projects / clsql.git / blobdiff