From dd786d6fc4b4e1165d192870c1a09bf854038822 Mon Sep 17 00:00:00 2001 From: Anthony Nemitz Date: Wed, 9 May 2012 02:54:08 -0700 Subject: [PATCH] fix for #494 --- mongoengine/connection.py | 2 ++ tests/connection.py | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/mongoengine/connection.py b/mongoengine/connection.py index 7585c734..1ccbbe31 100644 --- a/mongoengine/connection.py +++ b/mongoengine/connection.py @@ -65,6 +65,8 @@ def register_connection(alias, name, host='localhost', port=27017, }) if "replicaSet" in host: conn_settings['replicaSet'] = True + + conn_settings.update(kwargs) _connection_settings[alias] = conn_settings diff --git a/tests/connection.py b/tests/connection.py index 9aad142f..91bba55e 100644 --- a/tests/connection.py +++ b/tests/connection.py @@ -65,6 +65,16 @@ class ConnectionTest(unittest.TestCase): self.assertTrue(isinstance(db, pymongo.database.Database)) self.assertEqual(db.name, 'mongoenginetest2') + def test_connection_kwargs(self): + """Ensure that connection kwargs get passed to pymongo. + """ + connect('mongoenginetest', alias='t1', tz_aware=True) + conn = get_connection('t1') + self.assertTrue(conn.tz_aware) + + connect('mongoenginetest2', alias='t2') + conn = get_connection('t2') + self.assertFalse(conn.tz_aware) if __name__ == '__main__': unittest.main()