Bläddra i källkod

Merge branch 'develop' of github.com:tracim/tracim_backend into feature/614_file_content_endpoints

Guénaël Muller 6 år sedan
förälder
incheckning
ade72cb4fe
1 ändrade filer med 5 tillägg och 0 borttagningar
  1. 5 0
      tracim/command/database.py

+ 5 - 0
tracim/command/database.py Visa fil

@@ -46,6 +46,10 @@ class InitializeDBCommand(AppContextCommand):
46 46
         config_uri = parsed_args.config_file
47 47
         setup_logging(config_uri)
48 48
         settings = get_appsettings(config_uri)
49
+        # INFO - G.M - 2018-06-178 - We need to add info from [DEFAULT]
50
+        # section of config file in order to have both global and
51
+        # web app specific param.
52
+        settings.update(settings.global_conf)
49 53
         self._create_schema(settings)
50 54
         self._populate_database(settings, add_test_data=parsed_args.test_data)
51 55
 
@@ -113,6 +117,7 @@ class DeleteDBCommand(AppContextCommand):
113 117
         config_uri = parsed_args.config_file
114 118
         setup_logging(config_uri)
115 119
         settings = get_appsettings(config_uri)
120
+        settings.update(settings.global_conf)
116 121
         engine = get_engine(settings)
117 122
         app_config = CFG(settings)
118 123
         app_config.configure_filedepot()