Merge branch 'develop' into fix/better_content_types_and_status_code

tracim/command/database.py

@@ -46,6 +46,10 @@ class InitializeDBCommand(AppContextCommand):
         config_uri = parsed_args.config_file
         setup_logging(config_uri)
         settings = get_appsettings(config_uri)
+        # INFO - G.M - 2018-06-178 - We need to add info from [DEFAULT]
+        # section of config file in order to have both global and
+        # web app specific param.
+        settings.update(settings.global_conf)
         self._create_schema(settings)
         self._populate_database(settings, add_test_data=parsed_args.test_data)
 
@@ -113,6 +117,7 @@ class DeleteDBCommand(AppContextCommand):
         config_uri = parsed_args.config_file
         setup_logging(config_uri)
         settings = get_appsettings(config_uri)
+        settings.update(settings.global_conf)
         engine = get_engine(settings)
         app_config = CFG(settings)
         app_config.configure_filedepot()