From 60a05d74984f65371859906760f7c648597886e4 Mon Sep 17 00:00:00 2001 From: Valentin Kuznetsov Date: Sun, 6 Dec 2020 17:28:04 -0500 Subject: [PATCH] Add dataset_access_type join to datasets api --- dbs/datasets.go | 6 ++++++ static/sql/datasets_short.sql | 1 + 2 files changed, 7 insertions(+) diff --git a/dbs/datasets.go b/dbs/datasets.go index 5549b0d9..b67bf102 100644 --- a/dbs/datasets.go +++ b/dbs/datasets.go @@ -21,7 +21,13 @@ func (API) Datasets(params Record) []Record { if isValid == "" { isValid = "1" } + // parse dataset_id argument + dataset_access_type := getSingleValue(params, "dataset_access_type") + if dataset_access_type == "" { + dataset_access_type = "VALID" + } where += fmt.Sprintf("D.IS_DATASET_VALID = %s", placeholder("is_dataset_valid")) + where += fmt.Sprintf("AND DP.DATASET_ACCESS_TYPE = %s", placeholder("dataset_access_type")) args = append(args, isValid) // parse dataset argument diff --git a/static/sql/datasets_short.sql b/static/sql/datasets_short.sql index eee5fccb..00adacd8 100644 --- a/static/sql/datasets_short.sql +++ b/static/sql/datasets_short.sql @@ -1,3 +1,4 @@ SELECT D.DATASET FROM {{.Owner}}.DATASETS D + JOIN {{.Owner}}.DATASET_ACCESS_TYPES DP on DP.DATASET_ACCESS_TYPE_ID= D.DATASET_ACCESS_TYPE_ID