Don't require store to provide model provider; accept empty model in …

…import_model()
DataBrewery · Jun 3, 2015 · 9cb0797 · 9cb0797
1 parent 0816a20
commit 9cb0797
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/cubes/workspace.py b/cubes/workspace.py
@@ -356,7 +356,12 @@ def register_store(self, name, type_, include_model=True, **config):
 
         # Get related model provider or override it with configuration
         store_factory = ext.store.factory(type_)
-        provider = store_factory.related_model_provider
+
+        if hasattr(store_factory, "related_model_provider"):
+            provider = store_factory.related_model_provider
+        else:
+            provider = None
+
         provider = config.pop("model_provider", provider)
 
         nsname = config.pop("namespace", None)
@@ -433,7 +438,8 @@ def import_model(self, model=None, provider=None, store=None,
             self.logger.debug("Importing model from dictionary. "
                               "Provider: %s Store: %s NS: %s"
                               % (provider, store, namespace))
-
+        elif model is None:
+            model = {}
         else:
             raise ConfigurationError("Unknown model '%s' "
                                      "(should be a filename or a dictionary)"
@@ -457,7 +463,8 @@ def import_model(self, model=None, provider=None, store=None,
         # Link the model with store
         store = store or model.get("store")
 
-        if store or provider.requires_store():
+        if store or (hasattr(provider, "requires_store") \
+                        and provider.requires_store()):
             provider.bind(self.get_store(store))
 
         # 4. Namespace