(no commit message)

diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index d989d1d663710c9bc25b860b1cde634d827de08c..6a1b58da9335c666b32293765977729a985833a7 100644 (file)
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -40,16 +40,17 @@ colspecs = {
     schema.BOOLEAN : "BOOLEAN",
 }
 
-def engine(filename, **params):
-    return SQLiteSQLEngine(filename, **params)
+def engine(filename, opts, **params):
+    return SQLiteSQLEngine(filename, opts, **params)
     
 class SQLiteSQLEngine(ansisql.ANSISQLEngine):
-    def __init__(self, filename, **params):
+    def __init__(self, filename, opts, **params):
         self.filename = filename
+        self.opts = opts or {}
         ansisql.ANSISQLEngine.__init__(self, **params)
     
     def connect_args(self):
-        return ([self.filename], {})
+        return ([self.filename], self.opts)
         
     def dbapi(self):
         return sqlite

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 0a6e9fde40ac36efbf434fc6a286dfe601a4cd9b..b26f3fc93936d1c1a3efa0152a7640ac380625df 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -256,16 +256,13 @@ class BinaryClause(ClauseElement):
         self.left = left
         self.right = right
         self.operator = operator
-        self.fromobj = []
         self.parens = False
-        self.fromobj += left._get_from_objects()
-        self.fromobj += right._get_from_objects()
 
     def copy_structure(self):
         return BinaryClause(self.left, self.right, self.operator)
         
     def _get_from_objects(self):
-        return self.fromobj
+        return self.left._get_from_objects() + self.right._get_from_objects()
 
     def accept_visitor(self, visitor):
         self.left.accept_visitor(visitor)