merging changelog

diff --cc ChangeLog
index a61f47d15fe32ee896b40b0c4d900fb36df09d38,8e01d8a2c9e9a256857b9d42fe838db526674ee8..37b7154f9eb032032f9ed42374c530b44e446302
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,11 +1,17 @@@
 -2012-03-25  Ryan Davis  <ryan@acceleration.net>
 -
 -      * sql/expressions.lisp:
 -
 -      Fixed bugs related to outputting where clauses in delete/updates
 -      using sql syntax. Previously subselects and where clauses without
 -      data (such as an empty or clause or and clause) would cause
 -      failures.
 +2012-03-27  Ryan Davis  <ryan@acceleration.net>
 +
 +      * sql/expressions.lisp: Fixed bug with subqueries in the where
 +      clause of update-records and delete-records generating invalid
-       SQL.
++      SQL. Previously subselects in where clauses would not have enough
++      parentheses, for example: "WHERE Id IN SELECT foo_id FROM bar"
++      vs. "WHERE Id IN (SELECT foo_id FROM bar)"
 +      * tests/test-syntax.lisp: Added tests for using subqueries in the
 +      where clause in update-records and delete-records. Moved asserts
 +      in the test-output-sql/sql-ident-table function into the standard
 +      test framework.
 +      * doc/appendix.xml: added :connection-string to the information on
 +      ODBC connection specs, and added example code connecting to ODBC
 +      databases.
  
  2012-02-22  Nathan Bird  <nathan@acceleration.net>