- some cleanup of reflection unit tests

- removed silly behavior where sqlite would reflect UNIQUE indexes
as part of the primary key (?!)
- added __contains__ support to ColumnCollection; contains_column() method should be removed

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 9270f2a5f..5140d865e 100644
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -281,9 +281,6 @@ class SQLiteDialect(ansisql.ANSIDialect):
                     break
                 cols.append(row[2])
                 col = table.columns[row[2]]
-            # unique index that includes the pk is considered a multiple primary key
-            for col in cols:
-                table.primary_key.add(table.columns[col])
 
 class SQLiteCompiler(ansisql.ANSICompiler):
     def visit_cast(self, cast):
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index f6c2315ae..4959c4e21 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -1130,6 +1130,9 @@ class ColumnCollection(util.OrderedProperties):
                     l.append(c==local)
         return and_(*l)
 
+    def __contains__(self, col):
+        return self.contains_column(col)
+        
     def contains_column(self, col):
         # have to use a Set here, because it will compare the identity
         # of the column, not just using "==" for comparison which will always return a