X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fgeneric-odbc.lisp;h=563e1f8b1ba40513a2194a256f8b2bdcb5374621;hp=b83e8cacd854f9f370a238a8f3bf4fbd67f53a59;hb=1b07d2fd927cf8f1943ac0a0b8c980d1dc707076;hpb=5148be446aee32ec705beac3fbba35f499df4fd4

diff --git a/sql/generic-odbc.lisp b/sql/generic-odbc.lisp
index b83e8ca..563e1f8 100644
--- a/sql/generic-odbc.lisp
+++ b/sql/generic-odbc.lisp
@@ -27,6 +27,7 @@
 
 (defmethod initialize-instance :after ((db generic-odbc-database)
                                         &rest all-keys)
+  (declare (ignore all-keys))
   (unless (slot-boundp db 'dbi-package)
     (error "dbi-package not specified."))
   (let ((pkg (slot-value db 'dbi-package)))
@@ -52,7 +53,73 @@
 			   (db-type (eql :postgresql)))
   (if (string= "0" val) nil t))
 
-  
+(defmethod read-sql-value (val (type (eql 'generalized-boolean))
+			   (database generic-odbc-database)
+			   (db-type (eql :postgresql)))
+  (if (string= "0" val) nil t))
+
+(defmethod read-sql-value (val (type (eql 'boolean)) database
+			   (db-type (eql :mssql)))
+  (declare (ignore database))
+  (etypecase val
+    (string (if (string= "0" val) nil t))
+    (integer (if (zerop val) nil t))))
+
+(defmethod read-sql-value (val (type (eql 'generalized-boolean)) database
+			   (db-type (eql :mssql)))
+  (declare (ignore database))
+  (etypecase val
+    (string (if (string= "0" val) nil t))
+    (integer (if (zerop val) nil t))))
+
+;;; Type methods
+
+(defmethod database-get-type-specifier ((type (eql 'wall-time)) args database
+					(db-type (eql :mssql)))
+  (declare (ignore args database))
+  "DATETIME")
+
+(defmethod database-get-type-specifier ((type (eql 'boolean)) args database
+                                        (db-type (eql :mssql)))
+  (declare (ignore args database))
+  "BIT")
+
+(defmethod database-get-type-specifier ((type (eql 'generalized-boolean)) args database
+                                        (db-type (eql :mssql)))
+  (declare (ignore args database))
+  "BIT")
+
+;;; Generation of SQL strings from lisp expressions
+
+(defmethod database-output-sql ((tee (eql t)) (database generic-odbc-database))
+  (case (database-underlying-type database)
+    (:mssql "1")
+    (t "'Y'")))
+
+(defmethod database-output-sql-as-type ((type (eql 'boolean)) val database
+					(db-type (eql :mssql)))
+  (declare (ignore database))
+  (if val 1 0))
+
+(defmethod database-output-sql-as-type ((type (eql 'generalized-boolean)) val database
+					(db-type (eql :mssql)))
+  (declare (ignore database))
+  (if val 1 0))
+
+;;; Database backend capabilities
+
+(defmethod db-type-use-fully-qualified-column-on-drop-index? ((db-type (eql :mssql)))
+  t)
+
+(defmethod db-type-has-boolean-where? ((db-type (eql :mssql)))
+  nil)
+
+(defmethod db-type-has-intersect? ((db-type (eql :mssql)))
+  nil)
+
+(defmethod db-type-has-except? ((db-type (eql :mssql)))
+  nil)
+
 ;;; Backend methods
 
 (defmethod database-disconnect ((database generic-odbc-database))
@@ -60,13 +127,14 @@
   (setf (odbc-conn database) nil)
   t)
 
-(defmethod database-query (query-expression (database generic-odbc-database) 
-			   result-types field-names) 
+(defmethod database-query (query-expression (database generic-odbc-database)
+			   result-types field-names)
   (handler-case
       (funcall (sql-fn database)
 	       query-expression :db (odbc-conn database)
 	       :result-types result-types
 	       :column-names field-names)
+    #+ignore
     (error ()
       (error 'sql-database-data-error
 	     :database database
@@ -98,19 +166,19 @@
 
 
 (defmethod database-query-result-set ((query-expression string)
-				      (database generic-odbc-database) 
+				      (database generic-odbc-database)
 				      &key full-set result-types)
-  (handler-case 
+  (handler-case
       (multiple-value-bind (query column-names)
 	  (funcall (sql-fn database)
-		   query-expression 
-		   :db (odbc-conn database) 
+		   query-expression
+		   :db (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 
+	 (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
@@ -149,7 +217,9 @@
     ;; 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)))
+		    (string-equal "TABLE" (nth 3 row))
+                    (not (and (eq :mssql (database-underlying-type database))
+                              (string-equal "dtproperties" (nth 2 row)))))
 	  collect (nth 2 row))))
 
 
@@ -163,7 +233,9 @@
     ;; 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)))
+		    (string-equal "VIEW" (nth 3 row))
+                    (not (and (eq :mssql (database-underlying-type database))
+                              (member (nth 2 row) '("sysconstraints" "syssegments") :test #'string-equal))))
 	  collect (nth 2 row))))
 
 
@@ -178,8 +250,6 @@
     (loop for row in rows
 	collect (fourth row))))
 
-
-
 (defmethod database-attribute-type ((attribute string) (table string) (database generic-odbc-database)
 				    &key (owner nil))
   (declare (ignore owner))