From c304e0f8f8fef0acaa876d39c2ce09b34a46be4f Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 17 Dec 2019 17:40:57 +0100 Subject: [PATCH] misc: add slug to cubes (#38597) This also reverts commit 084b0d06b4e8bf5f9eeaee02cd71623e527ca68b, which has never been actually used. --- tests/conftest.py | 1 + tests/olap.model | 1 + wcs_olap/feeder.py | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 64ce440..8d81619 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -224,6 +224,7 @@ pg_dsn = {dsn} orig = olap key = olap schema = olap +cubes_slug = olap-slug '''.format(wcs=wcs, model_dir=model_dir, dsn=postgres_db.dsn)) from wcs_olap import cmd diff --git a/tests/olap.model b/tests/olap.model index 2d5ab9f..da11c68 100644 --- a/tests/olap.model +++ b/tests/olap.model @@ -420,6 +420,7 @@ ], "label" : "olap", "name" : "olap", + "slug" : "olap-slug", "pg_dsn" : "dbname=db660834", "search_path" : [ "olap", diff --git a/wcs_olap/feeder.py b/wcs_olap/feeder.py index ca5d77c..e1cafb0 100644 --- a/wcs_olap/feeder.py +++ b/wcs_olap/feeder.py @@ -105,11 +105,13 @@ class WcsOlapFeeder(object): self.config = config or {} self.model = { 'label': self.config.get('cubes_label', schema), - 'name': self.config.get('cubes_slug', schema), + 'name': schema, 'search_path': [schema, 'public'], 'pg_dsn': pg_dsn, 'cubes': [], } + if 'cubes_slug' in self.config: + self.model['slug'] = self.config['cubes_slug'] cube = { 'name': 'all_formdata', 'label': 'Tous les formulaires', -- 2.20.1