Skip to content

Commit af2e6ba

Browse files
committed
Resolved issue #235
1 parent abe18d5 commit af2e6ba

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

flask_mongoengine/connection.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,12 @@ def _resolve_settings(conn_setting, removePass=True):
241241

242242
if conn_setting and isinstance(conn_setting, dict):
243243
alias = conn_setting.get('MONGODB_ALIAS',
244-
conn_setting.get('alias', DEFAULT_CONNECTION_NAME))
245-
db = conn_setting.get('MONGODB_DB', conn_setting.get('db', 'test'))
246-
host = conn_setting.get('MONGODB_HOST', conn_setting.get('host', 'localhost'))
247-
port = conn_setting.get('MONGODB_PORT', conn_setting.get('port', 27017))
248-
username = conn_setting.get('MONGODB_USERNAME', conn_setting.get('username', None))
249-
password = conn_setting.get('MONGODB_PASSWORD', conn_setting.get('password', None))
244+
conn_setting.get('alias', conn_setting.get('ALIAS', DEFAULT_CONNECTION_NAME)))
245+
db = conn_setting.get('MONGODB_DB', conn_setting.get('db', conn_setting.get('DB', 'test')))
246+
host = conn_setting.get('MONGODB_HOST', conn_setting.get('host', conn_setting.get('HOST', 'localhost')))
247+
port = conn_setting.get('MONGODB_PORT', conn_setting.get('port', conn_setting.get('PORT', 27017)))
248+
username = conn_setting.get('MONGODB_USERNAME', conn_setting.get('username', conn_setting.get('USERNAME', None)))
249+
password = conn_setting.get('MONGODB_PASSWORD', conn_setting.get('password', conn_setting.get('PASSWORD', None)))
250250
# Default to ReadPreference.PRIMARY if no read_preference is supplied
251251
read_preference = conn_setting.get('MONGODB_READ_PREFERENCE',
252252
conn_setting.get('read_preference', ReadPreference.PRIMARY))

tests/test_connection.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ def test_live_connection(self):
3333
db = MongoEngine()
3434
self.app.config['TEMP_DB'] = True
3535
self.app.config['MONGODB_SETTINGS'] = {
36-
'host' : 'localhost',
37-
'port' : 27017
36+
'HOST' : 'localhost',
37+
'PORT' : 27017,
38+
'USERNAME': None,
39+
'PASSWORD': None,
40+
'DB': 'test'
3841
}
3942
class Todo(db.Document):
4043
title = db.StringField(max_length=60)

0 commit comments

Comments
 (0)