221 config.cubicweb_appobject_path = set(('hooks', 'entities')) |
221 config.cubicweb_appobject_path = set(('hooks', 'entities')) |
222 self.set_schema(config.load_schema()) |
222 self.set_schema(config.load_schema()) |
223 config['connections-pool-size'] = 1 |
223 config['connections-pool-size'] = 1 |
224 # will be reinitialized later from cubes found in the database |
224 # will be reinitialized later from cubes found in the database |
225 config._cubes = None |
225 config._cubes = None |
226 elif config.read_instance_schema: |
226 elif config.creating or not config.read_instance_schema: |
227 # normal start: load the instance schema from the database |
|
228 self.fill_schema() |
|
229 else: |
|
230 if not config.creating: |
227 if not config.creating: |
231 # test start: use the file system schema (quicker) |
228 # test start: use the file system schema (quicker) |
232 self.warning("set fs instance'schema") |
229 self.warning("set fs instance'schema") |
233 config.bootstrap_cubes() |
230 config.bootstrap_cubes() |
234 self.set_schema(config.load_schema()) |
231 self.set_schema(config.load_schema()) |
|
232 else: |
|
233 # normal start: load the instance schema from the database |
|
234 self.fill_schema() |
235 if not config.creating: |
235 if not config.creating: |
236 self.init_sources_from_database() |
236 self.init_sources_from_database() |
237 if 'CWProperty' in self.schema: |
237 if 'CWProperty' in self.schema: |
238 self.vreg.init_properties(self.properties()) |
238 self.vreg.init_properties(self.properties()) |
239 else: |
239 else: |