objectstore unit tests run with postgres/sqlite

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index bcb02efa498b85b4dc104c8546c24dda5ad4d195..4ac3467b241b09c6addb4850eb92223a810645f9 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -283,7 +283,11 @@ class CompareMixin(object):
         return self._compare('LIKE', other)
 
     def in_(self, *other):
-        if _is_literal(other[0]):
+        if len(other) == 0:
+            return self.__eq__(None)
+        elif len(other) == 1:
+            return self.__eq__(other[0])
+        elif _is_literal(other[0]):
             return self._compare('IN', CompoundClause(',', other))
         else:
             return self._compare('IN', union(*other))

diff --git a/test/objectstore.py b/test/objectstore.py
index b8a29e55769fcde827f72c378f970becfe8d54f8..41c3dea8ecee2846079790615a8b80b8acb10904 100644 (file)
--- a/test/objectstore.py
+++ b/test/objectstore.py
@@ -268,8 +268,8 @@ class SaveTest(AssertMixin):
         objects[3].user.user_name = 'imnewlyadded'
         self.assert_sql(db, lambda: objectstore.uow().commit(), [
                 (
-                    "INSERT INTO users (user_id, user_name) VALUES (:user_id, :user_name)",
-                    {'user_id': None, 'user_name': 'imnewlyadded'}
+                    "INSERT INTO users (user_name) VALUES (:user_name)",
+                    {'user_name': 'imnewlyadded'}
                 ),
                 (
                     "UPDATE email_addresses SET user_id=:user_id, email_address=:email_address WHERE email_addresses.address_id = :email_addresses_address_id",
@@ -391,8 +391,8 @@ class SaveTest(AssertMixin):
         self.assert_sql(db, lambda: objectstore.commit(), 
                 [
                     (
-                    "INSERT INTO email_addresses (address_id, user_id, email_address) VALUES (:address_id, :user_id, :email_address)",
-                    {'email_address': 'hi', 'address_id': None, 'user_id': 7}
+                    "INSERT INTO email_addresses (user_id, email_address) VALUES (:user_id, :email_address)",
+                    {'email_address': 'hi', 'user_id': 7}
                     ),
                 ]
         )