X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-odbc%2Fodbc-sql.lisp;h=656e8f43c13a0388d2d9697f76462cfc8bb08359;hp=825b7430aec134225b28acd4244c8f59c78f6f91;hb=8a8ee2d7d791b7a3efaed06420802a925d16fca3;hpb=23b76563b25a517ad20f29d6dc5a65c8b958a042

diff --git a/db-odbc/odbc-sql.lisp b/db-odbc/odbc-sql.lisp
index 825b743..656e8f4 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."))
 
@@ -87,10 +87,11 @@
   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)
+		    :result-types result-types
+                    :column-names field-names)
     (clsql-error (e)
       (error e))
     #+ignore
@@ -165,11 +166,11 @@
 ;;; 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
@@ -194,17 +195,17 @@
                                     &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))
@@ -237,20 +238,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)
@@ -269,8 +282,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
@@ -289,13 +301,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)))
@@ -318,9 +331,12 @@
 (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 
-       (string-downcase table)
+       table
        :db (database-odbc-conn database))
     (declare (ignore col-names))
     ;; INDEX_NAME is hard-coded in sixth position by ODBC driver
@@ -343,5 +359,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))