Merge pull request #277 from BarrusInvestments/fix/connection_regressions

Fix for connection regressions

Author: wojcikstefan

flask_mongoengine/connection.py

@@ -254,28 +254,44 @@ def _register_test_connection(port, db_alias, preserved):
         return _conn
 
 
-def _resolve_settings(conn_setting, remove_pass=True):
-
-    if conn_setting and isinstance(conn_setting, dict):
-        conn_setting = dict(((k[8:] if k.startswith("MONGODB_") else k), v) for k, v in conn_setting.items() if v is not None)
-        conn_setting = dict((k.lower(), v) for k, v in conn_setting.items())
-
-        resolved = {
-            'alias': conn_setting.get('alias', DEFAULT_CONNECTION_NAME),
-            'name': conn_setting.get('db', 'test'),
-            'host': conn_setting.get('host', 'localhost'),
-            'port': conn_setting.get('port', 27017),
-            'username': conn_setting.get('username'),
-            # default to ReadPreference.PRIMARY if no read_preference is supplied
-            'read_preference': conn_setting.get('read_preference', ReadPreference.PRIMARY),
-        }
-        if 'replicaset' in conn_setting:
-            resolved['replicaSet'] = conn_setting.pop('replicaset')
-        if not remove_pass:
-            resolved['password'] = conn_setting.get('password')
-        return resolved
-
-    return conn_setting
+def _resolve_settings(settings, settings_prefix=None, remove_pass=True):
+
+    if settings and isinstance(settings, dict):
+        resolved_settings = dict()
+        for k, v in settings.items():
+            if settings_prefix:
+                # Only resolve parameters that contain the prefix, ignoring the rest.
+                if k.startswith(settings_prefix):
+                    resolved_settings[k[len(settings_prefix):].lower()] = v
+            else:
+                # If no prefix is provided then we assume that all parameters are relevant for the DB connection string.
+                resolved_settings[k.lower()] = v
+
+        # Add various default values.
+        resolved_settings['alias'] = resolved_settings.get('alias', DEFAULT_CONNECTION_NAME)
+        if 'db' in resolved_settings:
+            resolved_settings['name'] = resolved_settings.pop('db')
+        else:
+            resolved_settings['name'] = 'test'
+
+        resolved_settings['host'] = resolved_settings.get('host', 'localhost')
+        resolved_settings['port'] = resolved_settings.get('port', 27017)
+        resolved_settings['username'] = resolved_settings.get('username', None)
+
+        # default to ReadPreference.PRIMARY if no read_preference is supplied
+        resolved_settings['read_preference'] = resolved_settings.get('read_preference', ReadPreference.PRIMARY)
+        if 'replicaset' in resolved_settings:
+            resolved_settings['replicaSet'] = resolved_settings.pop('replicaset')
+        if remove_pass:
+            try:
+                del resolved_settings['password']
+            except KeyError:
+                # Password not specified, ignore.
+                pass
+
+        return resolved_settings
+
+    return settings
 
 
 def fetch_connection_settings(config, remove_pass=True):
@@ -306,14 +322,14 @@ def fetch_connection_settings(config, remove_pass=True):
             # List of connection settings.
             settings_list = []
             for setting in settings:
-                settings_list.append(_resolve_settings(setting, remove_pass))
+                settings_list.append(_resolve_settings(setting, remove_pass=remove_pass))
             return settings_list
         else:
             # Connection settings provided as a dictionary.
-            return _resolve_settings(settings, remove_pass)
+            return _resolve_settings(settings, remove_pass=remove_pass)
     else:
         # Connection settings provided in standard format.
-        return _resolve_settings(config, remove_pass)
+        return _resolve_settings(config, settings_prefix='MONGODB_', remove_pass=remove_pass)
 
 
 def create_connection(config, app):

tests/__init__.py

@@ -9,7 +9,7 @@ class FlaskMongoEngineTestCase(unittest.TestCase):
 
     def setUp(self):
         self.app = flask.Flask(__name__)
-        self.app.config['MONGODB_DB'] = 'testing'
+        self.app.config['MONGODB_DB'] = 'test_db'
         self.app.config['TESTING'] = True
         self.ctx = self.app.app_context()
         self.ctx.push()

tests/test_connection.py

@@ -45,6 +45,13 @@ def test_live_connection(self):
 
         self._do_persist(db)
 
+    def test_uri_connection_string(self):
+        db = MongoEngine()
+        self.app.config['TEMP_DB'] = True
+        self.app.config['MONGO_URI'] = 'mongodb://localhost:27017/test_uri'
+
+        self._do_persist(db)
+
     def _do_persist(self, db):
         class Todo(db.Document):
             title = db.StringField(max_length=60)
@@ -67,16 +74,17 @@ class Todo(db.Document):
     def test_multiple_connections(self):
         db = MongoEngine()
         self.app.config['TESTING'] = True
+        self.app.config['TEMP_DB'] = True
         self.app.config['MONGODB_SETTINGS'] = [
             {
                 'ALIAS': 'default',
-                'DB': 'my_db1',
+                'DB': 'testing_db1',
                 'HOST': 'localhost',
                 'PORT': 27017
             },
             {
-                "ALIAS": "my_db2",
-                "DB": 'my_db2',
+                "ALIAS": "testing_db2",
+                "DB": 'testing_db2',
                 "HOST": 'localhost',
                 "PORT": 27017
             },
@@ -86,7 +94,7 @@ class Todo(db.Document):
             title = db.StringField(max_length=60)
             text = db.StringField()
             done = db.BooleanField(default=False)
-            meta = {"db_alias": "my_db2"}
+            meta = {"db_alias": "testing_db2"}
 
         db.init_app(self.app)
         Todo.drop_collection()
@@ -133,3 +141,10 @@ def test_temp_db_with_false_testing(self):
         self.app.config['TEMP_DB'] = True
         self.app.config['MONGODB_ALIAS'] = 'unittest_4'
         self.assertRaises(InvalidSettingsError, MongoEngine, self.app)
+
+    def test_connection_kwargs(self):
+        self.app.config['MONGODB_SETTINGS'] = {'DB': 'testing_tz_aware', 'alias': 'tz_aware_true', 'TZ_AWARE': True}
+        self.app.config['TESTING'] = True
+        db = MongoEngine()
+        db.init_app(self.app)
+        self.assertTrue(db.connection.client.codec_options.tz_aware)

tests/test_forms.py

@@ -17,7 +17,7 @@ class WTFormsAppTestCase(FlaskMongoEngineTestCase):
 
     def setUp(self):
         super(WTFormsAppTestCase, self).setUp()
-        self.db_name = 'testing'
+        self.db_name = 'test_db'
         self.app.config['MONGODB_DB'] = self.db_name
         self.app.config['TESTING'] = True
         # For Flask-WTF < 0.9

tests/test_json.py

@@ -25,7 +25,7 @@ def assertDictContains(self, superset, subset):
 
     def setUp(self):
         super(JSONAppTestCase, self).setUp()
-        self.app.config['MONGODB_DB'] = 'testing'
+        self.app.config['MONGODB_DB'] = 'test_db'
         self.app.config['TESTING'] = True
         self.app.json_encoder = DummyEncoder
         db = MongoEngine()

tests/test_json_app.py

@@ -18,7 +18,7 @@ def assertDictContains(self, superset, subset):
 
     def setUp(self):
         super(JSONAppTestCase, self).setUp()
-        self.app.config['MONGODB_DB'] = 'testing'
+        self.app.config['MONGODB_DB'] = 'test_db'
         self.app.config['TESTING'] = True
         self.app.config['TEMP_DB'] = True
         db = MongoEngine()

tests/test_pagination.py

@@ -9,7 +9,7 @@ class PaginationTestCase(FlaskMongoEngineTestCase):
 
     def setUp(self):
         super(PaginationTestCase, self).setUp()
-        self.db_name = 'testing'
+        self.db_name = 'test_db'
         self.app.config['MONGODB_DB'] = self.db_name
         self.app.config['TESTING'] = True
         self.app.config['CSRF_ENABLED'] = False

tests/test_session.py

@@ -9,7 +9,7 @@ class SessionTestCase(FlaskMongoEngineTestCase):
 
     def setUp(self):
         super(SessionTestCase, self).setUp()
-        self.db_name = 'testing'
+        self.db_name = 'test_db'
         self.app.config['MONGODB_DB'] = self.db_name
         self.app.config['TESTING'] = True
         db = MongoEngine(self.app)