From: Nathan Bird <nathan@acceleration.net>
Date: Fri, 29 Jan 2010 19:22:04 +0000 (-0500)
Subject: Merge commit 'master' into development
X-Git-Tag: v4.3.3~8
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=90ce2284fab5f1daedb8aa6aba3008a5c3651e30

Merge commit 'master' into development

Conflicts:
	tests/test-init.lisp  --pretty small.
---

90ce2284fab5f1daedb8aa6aba3008a5c3651e30
diff --cc tests/test-init.lisp
index e64a2ac,fd61e92..500b898
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@@ -226,32 -221,24 +226,32 @@@
            ((and (eq *test-database-type* :oracle)
                  (clsql-sys:in test :fdml/query/8 :fdml/select/21
                                :fddl/table/6))
-            (push (cons test "syntax not supported") skip-tests))
+            (push (cons test "syntax not supported.") skip-tests))
            ((and (eq *test-database-type* :odbc)
                  (eq *test-database-underlying-type* :postgresql)
 -                (clsql-sys:in test :fddl/owner/1))
 -           (push (cons test "table ownership not supported by postgresql odbc driver.") skip-tests))
 +                (clsql-sys:in test :fddl/owner/1 :fddl/owner/table
 +			      :fddl/owner/attributes
 +			      :fddl/owner/attribute-types
 +			      :fddl/owner/index
 +			      :fddl/owner/sequence))
-            (push (cons test "table ownership not supported by postgresql odbc driver") skip-tests))
++          (push (cons test "table ownership not supported by postgresql odbc driver.") skip-tests))
            ((and (not (member *test-database-underlying-type*
                               '(:postgresql :oracle)))
 -                (clsql-sys:in test :fddl/owner/1))
 -           (push (cons test "table ownership not supported.") skip-tests))
 +                (clsql-sys:in test :fddl/owner/1 :fddl/owner/table
 +			      :fddl/owner/attributes
 +			      :fddl/owner/attribute-types
 +			      :fddl/owner/index
 +			      :fddl/owner/sequence))
-            (push (cons test "table ownership not supported") skip-tests))
++	   (push (cons test "table ownership not supported.") skip-tests))
            ((and (null (clsql-sys:db-type-has-intersect? db-underlying-type))
                  (clsql-sys:in test :fdml/query/7))
-            (push (cons test "intersect not supported") skip-tests))
+            (push (cons test "intersect not supported.") skip-tests))
            ((and (null (clsql-sys:db-type-has-except? db-underlying-type))
                  (clsql-sys:in test :fdml/query/8))
-            (push (cons test "except not supported") skip-tests))
+            (push (cons test "except not supported.") skip-tests))
            ((and (eq *test-database-underlying-type* :mssql)
                  (clsql-sys:in test :fdml/select/9))
-            (push (cons test "mssql uses integer math for AVG") skip-tests))
+            (push (cons test "mssql uses integer math for AVG.") skip-tests))
            ((and (not (member *test-database-underlying-type*
                               '(:postgresql :mysql :sqlite3)))
                  (clsql-sys:in test :fdml/select/37 :fdml/select/38))