Skip to content

add new metadata tables #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
steve-fischer-200 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add new metadata tables #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76aa333
add new metadata tables
steve-fischer-200 Jan 31, 2026
7b38a9c
Species -> Outcome
steve-fischer-200 Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 62 additions & 5 deletions Model/lib/wdk/model/records/userDatasetRecord.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,13 @@
</table>

<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<!-- Species -->
<!-- Outcome -->
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<table name="Species"
displayName="Species"
queryRef="UserDatasetTables.Species">
<table name="Outcome"
displayName="Outcome"
queryRef="UserDatasetTables.Outcome">
<columnAttribute name="dataset_id" inReportMaker="false" internal="true"/>
<columnAttribute name="species" displayName="Species"/>
<columnAttribute name="outcome" displayName="Outcome"/>
</table>

<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
Expand Down Expand Up @@ -276,6 +276,63 @@
<columnAttribute name="identifier_value" displayName="Identifier"/>
</table>

<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<!-- Dependencies -->
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<!-- not needed in UI
<table name="Dependencies"
displayName="Dependencies"
queryRef="UserDatasetTables.Dependencies">
<columnAttribute name="dataset_id" inReportMaker="false" internal="true"/>
<columnAttribute name="identifier" displayName="Identifier"/>
<columnAttribute name="display_name" displayName="Name"/>
<columnAttribute name="version" displayName="Version"/>
</table>
-->
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<!-- Associated Factors -->
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<table name="AssociatedFactors"
displayName="Associated Factors"
queryRef="UserDatasetTables.AssociatedFactors">
<columnAttribute name="dataset_id" inReportMaker="false" internal="true"/>
<columnAttribute name="factor" displayName="Factor"/>
</table>

<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<!-- Sample Types -->
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<table name="SampleTypes"
displayName="Sample Types"
queryRef="UserDatasetTables.SampleTypes">
<columnAttribute name="dataset_id" inReportMaker="false" internal="true"/>
<columnAttribute name="type" displayName="Sample Type"/>
</table>

<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<!-- Dataset Links -->
<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
<table name="DatasetLinks"
displayName="Dataset Links"
queryRef="UserDatasetTables.DatasetLinks">
<columnAttribute name="dataset_id" inReportMaker="false" internal="true"/>
<columnAttribute name="dataset_uri" displayName="URI" internal="true"/>
<columnAttribute name="shares_records" displayName="Shares Records"/>

<linkAttribute name="dataset_link" displayName="Link">
<displayText>
<![CDATA[
$$dataset_uri$$
]]>
</displayText>
<url>
<![CDATA[
$$dataset_uri$$
]]>
</url>
</linkAttribute>
</table>

</recordClass>

</recordClassSet>
Expand Down
82 changes: 75 additions & 7 deletions Model/lib/wdk/model/records/userDatasetRecordQueries.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,17 +246,17 @@
</sql>
</sqlQuery>

<!-- Species table -->
<sqlQuery name="Species" isCacheable='false'>
<!-- Outcome table -->
<sqlQuery name="Outcome" isCacheable='false'>
<column name="dataset_id"/>
<column name="species"/>
<column name="outcome"/>
<sql>
<![CDATA[
SELECT
dataset_id,
species
FROM @VDI_CONTROL_SCHEMA@.dataset_species
ORDER BY species
outcome
FROM @VDI_CONTROL_SCHEMA@.dataset_outcome
ORDER BY outcome
]]>
</sql>
</sqlQuery>
Expand Down Expand Up @@ -302,11 +302,13 @@
<sqlQuery name="Projects" isCacheable='false'>
<column name="dataset_id"/>
<column name="project_id"/>
<column name="project_display_name"/>
<sql>
<![CDATA[
SELECT
dataset_id,
project_id
project_id,
project_display_name
FROM @VDI_CONTROL_SCHEMA@.dataset_project
ORDER BY project_id
]]>
Expand All @@ -332,6 +334,72 @@
</sql>
</sqlQuery>

<!-- Dependencies table -->
<sqlQuery name="Dependencies" isCacheable='false'>
<column name="dataset_id"/>
<column name="identifier"/>
<column name="display_name"/>
<column name="version"/>
<sql>
<![CDATA[
SELECT
dataset_id,
identifier,
display_name,
version
FROM @VDI_CONTROL_SCHEMA@.dataset_dependency
ORDER BY display_name, identifier
]]>
</sql>
</sqlQuery>

<!-- Associated Factors table -->
<sqlQuery name="AssociatedFactors" isCacheable='false'>
<column name="dataset_id"/>
<column name="factor"/>
<sql>
<![CDATA[
SELECT
dataset_id,
factor
FROM @VDI_CONTROL_SCHEMA@.dataset_associated_factor
ORDER BY factor
]]>
</sql>
</sqlQuery>

<!-- Sample Types table -->
<sqlQuery name="SampleTypes" isCacheable='false'>
<column name="dataset_id"/>
<column name="type"/>
<sql>
<![CDATA[
SELECT
dataset_id,
type
FROM @VDI_CONTROL_SCHEMA@.dataset_sample_type
ORDER BY type
]]>
</sql>
</sqlQuery>

<!-- Dataset Links table -->
<sqlQuery name="DatasetLinks" isCacheable='false'>
<column name="dataset_id"/>
<column name="dataset_uri"/>
<column name="shares_records"/>
<sql>
<![CDATA[
SELECT
dataset_id,
dataset_uri,
CASE WHEN shares_records THEN 'Yes' ELSE 'No' END as shares_records
FROM @VDI_CONTROL_SCHEMA@.dataset_link
ORDER BY dataset_uri
]]>
</sql>
</sqlQuery>

</querySet>

</wdkModel>