X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-odbc%2Fodbc-sql.lisp;h=bfc6d892b4faf0c838749cba697dbf202ca9fa5a;hb=8b5250e14e3280bdc4641c3b35a8dc68ca4dbde7;hp=2fad84805755c8c3b029d553b899f8d677812978;hpb=db9892632e6eb7869aea7a94c16b523a82de1501;p=clsql.git

diff --git a/db-odbc/odbc-sql.lisp b/db-odbc/odbc-sql.lisp
index 2fad848..bfc6d89 100644
--- a/db-odbc/odbc-sql.lisp
+++ b/db-odbc/odbc-sql.lisp
@@ -60,6 +60,9 @@
 	     :errno nil
 	     :error "Connection failed")))))
 
+(defmethod database-underlying-type ((database odbc-database))
+  (database-odbc-db-type database))
+
 (defun store-type-of-connected-database (db)
   (let* ((odbc-conn (database-odbc-conn db))
 	 (server-name (odbc-dbi::get-odbc-info odbc-conn odbc::$SQL_SERVER_NAME))
@@ -84,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
@@ -162,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
@@ -190,9 +194,18 @@
 (defmethod database-list-sequences ((database odbc-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)))
+  ;; 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)))
+    ((: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)))))
 
 (defmethod database-list-tables ((database odbc-database)
 				 &key (owner nil))
@@ -207,6 +220,19 @@
 		    (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))
@@ -286,17 +312,40 @@
                                   &key (owner nil))
   (let ((result '()))
     (dolist (table (database-list-tables database :owner owner) result)
-      (append (database-list-table-indexes table database :owner owner)
-	      result))))
+      (setq result
+	(append (database-list-table-indexes table database :owner owner)
+		result)))))
 
 (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))
+      (odbc-dbi:list-table-indexes 
+       table
+       :db (database-odbc-conn database))
     (declare (ignore col-names))
     ;; INDEX_NAME is hard-coded in sixth position by ODBC driver
-    (loop for row in rows collect (nth 5 row))))
+    ;; FIXME: ??? is hard-coded in the fourth position
+    (do ((results nil)
+	 (loop-rows rows (cdr loop-rows)))
+	((null loop-rows) (nreverse results))
+      (let* ((row (car loop-rows))
+	     (col (nth 5 row)))
+	(unless (find col results :test #'string-equal)
+	  (push col results))))))
+
+;;; Database capabilities
+
+(defmethod db-backend-has-create/destroy-db? ((db-type (eql :odbc)))
+  nil)
+
+
+(defmethod database-initialize-database-type ((database-type (eql :odbc)))
+  ;; nothing to do
+  t)
 
-#+ignore
 (when (clsql-base-sys:database-type-library-loaded :odbc)
   (clsql-base-sys:initialize-database-type :database-type :odbc))