X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-odbc%2Fodbc-sql.lisp;h=227c217c4392810866a447451eac104065e913ed;hb=8c6c643e3debe875bd14408cc3129d8148dfd125;hp=bfc6d892b4faf0c838749cba697dbf202ca9fa5a;hpb=8b5250e14e3280bdc4641c3b35a8dc68ca4dbde7;p=clsql.git diff --git a/db-odbc/odbc-sql.lisp b/db-odbc/odbc-sql.lisp index bfc6d89..227c217 100644 --- a/db-odbc/odbc-sql.lisp +++ b/db-odbc/odbc-sql.lisp @@ -17,7 +17,7 @@ ;;;; ************************************************************************* (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.")) @@ -50,15 +50,14 @@ :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)) @@ -92,29 +91,27 @@ (odbc-dbi:sql query-expression :db (database-odbc-conn database) :result-types result-types :column-names field-names) - (clsql-error (e) - (error e)) #+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) @@ -138,13 +135,11 @@ (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)) @@ -201,11 +196,11 @@ (mapcan #'(lambda (s) (let ((sn (%table-name-to-sequence-name (car s)))) (and sn (list sn)))) - (database-query "SHOW TABLES" database nil))) + (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 nil nil))))) (defmethod database-list-tables ((database odbc-database) &key (owner nil)) @@ -238,20 +233,32 @@ (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) @@ -270,8 +277,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 @@ -290,13 +296,14 @@ (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))) @@ -347,5 +354,5 @@ ;; 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))