X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-odbc%2Fodbc-sql.lisp;h=1f00008493be1d9ccaf7375c70f6cfd977bc3895;hp=0ed1ebeb5042712d8f1d200cc3c07d90b86aafaf;hb=26cfa48009c72652e0ba8ce9aed8c53216e9a3d3;hpb=7308bdf188da6424e615ca14096ef53cfb845a90 diff --git a/db-odbc/odbc-sql.lisp b/db-odbc/odbc-sql.lisp index 0ed1ebe..1f00008 100644 --- a/db-odbc/odbc-sql.lisp +++ b/db-odbc/odbc-sql.lisp @@ -3,11 +3,11 @@ ;;;; FILE IDENTIFICATION ;;;; ;;;; Name: odbc-sql.cl -;;;; Purpose: Low-level interface for CLSQL ODBC backend +;;;; Purpose: Medium-level interface for CLSQL ODBC backend ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: odbc-sql.lisp 8983 2004-04-12 21:16:48Z kevin $ +;;;; $Id$ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -26,8 +26,7 @@ ;; ODBC interface (defclass odbc-database (generic-odbc-database) - ((odbc-conn :accessor database-odbc-conn :initarg :odbc-conn) - (odbc-db-type :accessor database-odbc-db-type))) + ((odbc-db-type :accessor database-odbc-db-type))) (defmethod database-name-from-spec (connection-spec (database-type (eql :odbc))) @@ -40,19 +39,20 @@ (check-connection-spec connection-spec database-type (dsn user password)) (destructuring-bind (dsn user password) connection-spec (handler-case - (let ((db - (make-instance 'odbc-database - :name (database-name-from-spec connection-spec :odbc) - :database-type :odbc - :odbc-conn - (odbc-dbi:connect :user user - :password password - :data-source-name dsn)))) + (let ((db (make-instance 'odbc-database + :name (database-name-from-spec connection-spec :odbc) + :database-type :odbc + :dbi-package (find-package '#:odbc-dbi) + :odbc-conn + (odbc-dbi:connect :user user + :password password + :data-source-name dsn)))) (store-type-of-connected-database db) + ;; Ensure this database type is initialized so can check capabilities of + ;; underlying database + (initialize-database-type :database-type database-type) db) #+ignore - (sql-condition (e) - (error e)) (error () ;; Init or Connect failed (error 'sql-connection-error :database-type database-type @@ -63,7 +63,7 @@ (database-odbc-db-type database)) (defun store-type-of-connected-database (db) - (let* ((odbc-conn (database-odbc-conn db)) + (let* ((odbc-conn (clsql-sys::odbc-conn db)) (server-name (odbc-dbi::get-odbc-info odbc-conn odbc::$SQL_SERVER_NAME)) (dbms-name (odbc-dbi::get-odbc-info odbc-conn odbc::$SQL_DBMS_NAME)) (type @@ -71,232 +71,21 @@ (cond ((or (search "postgresql" server-name :test #'char-equal) (search "postgresql" dbms-name :test #'char-equal)) + (unless (find-package 'clsql-postgresql) + (ignore-errors (asdf:operate 'asdf:load-op 'clsql-postgresql-socket))) :postgresql) ((or (search "mysql" server-name :test #'char-equal) (search "mysql" dbms-name :test #'char-equal)) + (unless (find-package 'clsql-mysql) + ;; ignore errors on platforms where the shared libraries are not available + (ignore-errors (asdf:operate 'asdf:load-op 'clsql-mysql))) :mysql) ((or (search "oracle" server-name :test #'char-equal) (search "oracle" dbms-name :test #'char-equal)) :oracle)))) (setf (database-odbc-db-type db) type))) -(defmethod database-disconnect ((database odbc-database)) - (odbc-dbi:disconnect (database-odbc-conn database)) - (setf (database-odbc-conn database) nil) - t) - -(defmethod database-query (query-expression (database odbc-database) - result-types field-names) - (handler-case - (odbc-dbi:sql query-expression :db (database-odbc-conn database) - :result-types result-types - :column-names field-names) - #+ignore - (sql-error (e) - (error e)) - (error () - (error 'sql-database-data-error - :database database - :expression query-expression - :message "Query failed")))) - -(defmethod database-execute-command (sql-expression - (database odbc-database)) - (handler-case - (odbc-dbi:sql sql-expression :db (database-odbc-conn database)) - #+ignore - (sql-error (e) - (error e)) - (error () - (error 'sql-database-data-error - :database database - :expression sql-expression - :message "Execute command failed")))) - -(defstruct odbc-result-set - (query nil) - (types nil) - (full-set nil :type boolean)) - -(defmethod database-query-result-set ((query-expression string) - (database odbc-database) - &key full-set result-types) - (handler-case - (multiple-value-bind (query column-names) - (odbc-dbi:sql query-expression - :db (database-odbc-conn database) - :row-count nil - :column-names t - :query t - :result-types result-types) - (values - (make-odbc-result-set :query query :full-set full-set - :types result-types) - (length column-names) - nil ;; not able to return number of rows with odbc - )) - (error () - (error 'sql-database-data-error - :database database - :expression query-expression - :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)) - t) - -(defmethod database-store-next-row (result-set - (database odbc-database) - list) - (let ((row (odbc-dbi:fetch-row (odbc-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))) - -(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 odbc-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 odbc-database)) - (database-execute-command - (concatenate 'string "DROP TABLE " (%sequence-name-to-table sequence-name)) - database)) - -(defmethod database-list-sequences ((database odbc-database) - &key (owner nil)) - (declare (ignore owner)) - ;; FIXME: Underlying database backend stuff should come from that backend - - (case (database-odbc-db-type database) - (:mysql - (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 nil))))) - -(defmethod database-list-tables ((database odbc-database) - &key (owner nil)) - (declare (ignore owner)) - (multiple-value-bind (rows col-names) - (odbc-dbi:list-all-database-tables :db (database-odbc-conn database)) - (declare (ignore col-names)) - ;; TABLE_SCHEM is hard-coded in second column by ODBC Driver Manager - ;; TABLE_NAME in third column, TABLE_TYPE in fourth column - (loop for row in rows - when (and (not (string-equal "information_schema" (nth 1 row))) - (string-equal "TABLE" (nth 3 row))) - collect (nth 2 row)))) - -(defmethod database-list-views ((database odbc-database) - &key (owner nil)) - (declare (ignore owner)) - (multiple-value-bind (rows col-names) - (odbc-dbi:list-all-database-tables :db (database-odbc-conn database)) - (declare (ignore col-names)) - ;; TABLE_SCHEM is hard-coded in second column by ODBC Driver Manager - ;; TABLE_NAME in third column, TABLE_TYPE in fourth column - (loop for row in rows - when (and (not (string-equal "information_schema" (nth 1 row))) - (string-equal "VIEW" (nth 3 row))) - collect (nth 2 row)))) -(defmethod database-list-attributes ((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)) - (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)) - (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) - (database odbc-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 odbc-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 odbc-database)) - (without-interrupts - (caar (database-query - (concatenate 'string "SELECT last_value FROM " - (%sequence-name-to-table sequence-name)) - database :auto nil)))) (defmethod database-create (connection-spec (type (eql :odbc))) (declare (ignore connection-spec)) @@ -326,13 +115,10 @@ (defmethod database-list-table-indexes (table (database odbc-database) &key (owner nil)) (declare (ignore owner)) - (odbc-list-table-indexes table database)) - -(defun odbc-list-table-indexes (table database) (multiple-value-bind (rows col-names) (odbc-dbi:list-table-indexes table - :db (database-odbc-conn database)) + :db (clsql-sys::odbc-conn database)) (declare (ignore col-names)) ;; INDEX_NAME is hard-coded in sixth position by ODBC driver ;; FIXME: ??? is hard-coded in the fourth position