From 19f2cad196831a53becdb5fad538ba72e9755662 Mon Sep 17 00:00:00 2001
From: ShixiangWang <wangshx@shanghaitech.edu.cn>
Date: Mon, 21 Aug 2023 18:17:53 +0800
Subject: [PATCH] add two new queries from xenaPython

---
 DESCRIPTION                    | 4 ++--
 NEWS.md                        | 4 ++++
 inst/queries/datasetSources.xq | 7 +++++++
 inst/queries/datasetStatus.xq  | 3 +++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 inst/queries/datasetSources.xq
 create mode 100644 inst/queries/datasetStatus.xq

diff --git a/DESCRIPTION b/DESCRIPTION
index 6bc8e86..4b05c87 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: UCSCXenaTools
 Title: Download and Explore Datasets from UCSC Xena Data Hubs
-Version: 1.4.8
+Version: 1.5.0
 Authors@R: 
     c(person(given = "Shixiang",
              family = "Wang",
@@ -57,4 +57,4 @@ VignetteBuilder:
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.3
diff --git a/NEWS.md b/NEWS.md
index 7530287..fd08603 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+# UCSCXenaTools 1.5.0
+
+- Added two new queries from xenaPython
+
 # UCSCXenaTools 1.4.8
 
 - Updated to latest Xena dataset list.
diff --git a/inst/queries/datasetSources.xq b/inst/queries/datasetSources.xq
new file mode 100644
index 0000000..52a5e21
--- /dev/null
+++ b/inst/queries/datasetSources.xq
@@ -0,0 +1,7 @@
+; datasetSources
+(fn [dataset]
+  (query {:select [:source.name :source.hash]
+          :from [:dataset]
+          :join [:dataset_source [:= :dataset.id :dataset_id]
+                 :source [:= :source.id :source_id]]
+          :where [:= :dataset.name dataset]}))
diff --git a/inst/queries/datasetStatus.xq b/inst/queries/datasetStatus.xq
new file mode 100644
index 0000000..7315c9c
--- /dev/null
+++ b/inst/queries/datasetStatus.xq
@@ -0,0 +1,3 @@
+; datasetStatus
+(fn [dataset]
+	 (query {:select [:status :text] :from [:dataset] :where [:= :name dataset]}))