;;;; *************************************************************************
(defpackage #:clsql-odbc
- (:use #:common-lisp #:clsql-base-sys)
+ (:use #:common-lisp #:clsql-sys)
(:export #:odbc-database)
(:documentation "This is the CLSQL interface to ODBC."))
:data-source-name dsn))))
(store-type-of-connected-database db)
db)
- (clsql-error (e)
- (error e))
- #+ignore
- (error () ;; Init or Connect failed
- (error 'clsql-connect-error
- :database-type database-type
- :connection-spec connection-spec
- :errno nil
- :error "Connection failed")))))
+ #+ignore
+ (sql-condition (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-underlying-type ((database odbc-database))
(database-odbc-db-type database))
t)
(defmethod database-query (query-expression (database odbc-database)
- result-types)
+ result-types field-names)
(handler-case
(odbc-dbi:sql query-expression :db (database-odbc-conn database)
- :result-types result-types)
- (clsql-error (e)
- (error e))
+ :result-types result-types
+ :column-names field-names)
#+ignore
+ (sql-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 odbc-database))
(handler-case
(odbc-dbi:sql sql-expression :db (database-odbc-conn database))
- (clsql-error (e)
- (error e))
#+ignore
+ (sql-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"))))
+ :message "Execute command failed"))))
(defstruct odbc-result-set
(query nil)
(length column-names)
nil ;; not able to return number of rows with odbc
))
- #+ignore
(error ()
- (error 'clsql-sql-error
+ (error 'sql-database-data-error
:database database
:expression query-expression
- :errno nil
- :error "Query result set failed"))))
+ :message "Query result set failed"))))
(defmethod database-dump-result-set (result-set (database odbc-database))
(odbc-dbi:close-query (odbc-result-set-query result-set))
;;; Sequence functions
(defun %sequence-name-to-table (sequence-name)
- (concatenate 'string "_CLSQL_SQL__" (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
&key (owner nil))
(declare (ignore owner))
;; FIXME: Underlying database backend stuff should come from that backend
- ;; Would need to use ASDF to ensure underlying backend was loaded
(case (database-odbc-db-type database)
(:mysql
- (mapcar #'(lambda (s) (%table-name-to-sequence-name (car s)))
- (database-query "SHOW TABLES LIKE '%clsql_seq%'"
- database nil)))
+ (mapcan #'(lambda (s)
+ (let ((sn (%table-name-to-sequence-name (car s))))
+ (and sn (list sn))))
+ (database-query "SHOW TABLES" database nil nil)))
((:postgresql :postgresql-socket)
(mapcar #'(lambda (s) (%table-name-to-sequence-name (car s)))
- (database-query "SELECT RELNAME FROM pg_class WHERE RELNAME LIKE '%clsql_seq%'"
- database nil)))))
+ (database-query "SELECT RELNAME FROM pg_class WHERE RELNAME LIKE '%clsql_seq%'"
+ database nil nil)))))
(defmethod database-list-tables ((database odbc-database)
&key (owner nil))
(declare (ignore owner))
(multiple-value-bind (rows col-names)
(odbc-dbi:list-all-table-columns table :db (database-odbc-conn database))
- (let ((pos (position "COLUMN_NAME" col-names :test #'string-equal)))
- (when pos
- (loop for row in rows
- collect (nth pos row))))))
+ (declare (ignore col-names))
+ ;; COLUMN_NAME is hard-coded by odbc spec as fourth position
+ (loop for row in rows
+ collect (fourth row))))
(defmethod database-attribute-type ((attribute string) (table string) (database odbc-database)
&key (owner nil))
(declare (ignore owner))
(multiple-value-bind (rows col-names)
(odbc-dbi:list-all-table-columns table :db (database-odbc-conn database))
- (let ((pos (position "TYPE_NAME" col-names :test #'string-equal)))
- (when pos
- (loop for row in rows
- collect (nth pos row))))))
+ (declare (ignore col-names))
+ ;; COLUMN_NAME is hard-coded by odbc spec as fourth position
+ ;; TYPE_NAME is the sixth column
+ ;; PRECISION/COLUMN_SIZE is the seventh column
+ ;; SCALE/DECIMAL_DIGITS is the ninth column
+ ;; NULLABLE is the eleventh column
+ (loop for row in rows
+ when (string-equal attribute (fourth row))
+ do
+ (let ((size (seventh row))
+ (precision (ninth row))
+ (scale (nth 10 row)))
+ (return (values (ensure-keyword (sixth row))
+ (when size (parse-integer size))
+ (when precision (parse-integer precision))
+ (when scale (parse-integer scale))))))))
(defmethod database-set-sequence-position (sequence-name
(position integer)
(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 :odbc)))
+ (declare (ignore connection-spec))
(warn "Not implemented."))
(defmethod database-destroy (connection-spec (type (eql :odbc)))
+ (declare (ignore connection-spec))
(warn "Not implemented."))
(defmethod database-probe (connection-spec (type (eql :odbc)))
(defmethod database-list-table-indexes (table (database odbc-database)
&key (owner nil))
(declare (ignore owner))
- (if (eq :mysql (database-odbc-db-type database))
- (mysql-workaround-bug-list-table-indexes table database)
- (odbc-list-table-indexes table database)))
-
-(defun mysql-workaround-bug-list-table-indexes (table database)
- ;; MyODBC 3.52 does not properly return results from SQLStatistics
- (do ((results nil)
- (rows (database-query
- (format nil "SHOW INDEX FROM ~A" (string-upcase table))
- database nil)
- (cdr rows)))
- ((null rows) (nreverse results))
- (let ((col (nth 2 (car rows))))
- (unless (find col results :test #'string-equal)
- (push col results)))))
+ (odbc-list-table-indexes table database))
(defun odbc-list-table-indexes (table database)
(multiple-value-bind (rows col-names)
;; nothing to do
t)
-(when (clsql-base-sys:database-type-library-loaded :odbc)
- (clsql-base-sys:initialize-database-type :database-type :odbc))
+(when (clsql-sys:database-type-library-loaded :odbc)
+ (clsql-sys:initialize-database-type :database-type :odbc))
projects / clsql.git / blobdiff