pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make uri style connections use parameters not specified in the uri, as well as other keyword arguments

Browse Source
This commit is contained in:
Robert Kajic 2012-02-28 23:18:22 +01:00
parent 32fc4152a7
commit 3c7bf50089
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mongoengine/connection.py
View File

@ -45,14 +45,12 @@ def register_connection(alias, name, host='localhost', port=27017,
if uri_dict.get('database') is None:
raise ConnectionError("If using URI style connection include "\
"database name in string")
uri_dict['name'] = uri_dict.get('database')
_connection_settings[alias] = {
'host': host,
'name': uri_dict.get('database'),
'username': uri_dict.get('username'),
'password': uri_dict.get('password')
}
return
node = uri_dict['nodelist'][0]
host = node[0]
port = node[1]
name = uri_dict.get('database')
username = uri_dict.get('username') or username
password = uri_dict.get('password') or password
_connection_settings[alias] = {
'name': name,

2
tests/connection.py
View File

@ -41,7 +41,7 @@ class ConnectionTest(unittest.TestCase):
c.admin.authenticate("admin", "password")
c.mongoenginetest.add_user("username", "password")
self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost/mongoenginetest')
self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
connect("testdb_uri", host='mongodb://username:password@localhost/mongoenginetest')