diff options
| author | zsloan | 2020-07-24 15:18:44 -0500 |
|---|---|---|
| committer | zsloan | 2020-07-24 15:18:44 -0500 |
| commit | e8ca99cc7a8e3fd9af0c477da423b60cc1eb654c (patch) | |
| tree | c85415da3c5da9c7fc077553f9d4617334904ada /wqflask | |
| parent | 880aa1cab6de4983414a2bbddfc557a10e02e1d3 (diff) | |
| download | genenetwork2-e8ca99cc7a8e3fd9af0c477da423b60cc1eb654c.tar.gz | |
Fixed queries that were wrongly returning Data IDs as Ns
Diffstat (limited to 'wqflask')
| -rw-r--r-- | wqflask/base/data_set.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 2272b6ee..e9deb8a9 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -939,7 +939,7 @@ class GenotypeDataSet(DataSet): def retrieve_sample_data(self, trait): query = """ SELECT - Strain.Name, GenoData.value, GenoSE.error, GenoData.Id, Strain.Name2 + Strain.Name, GenoData.value, GenoSE.error, "N/A", Strain.Name2 FROM (GenoData, GenoFreeze, Strain, Geno, GenoXRef) left join GenoSE on @@ -1107,11 +1107,14 @@ class MrnaAssayDataSet(DataSet): def retrieve_sample_data(self, trait): query = """ SELECT - Strain.Name, ProbeSetData.value, ProbeSetSE.error, ProbeSetData.Id, Strain.Name2 + Strain.Name, ProbeSetData.value, ProbeSetSE.error, NStrain.count, Strain.Name2 FROM (ProbeSetData, ProbeSetFreeze, Strain, ProbeSet, ProbeSetXRef) left join ProbeSetSE on (ProbeSetSE.DataId = ProbeSetData.Id AND ProbeSetSE.StrainId = ProbeSetData.StrainId) + left join NStrain on + (NStrain.DataId = ProbeSetData.Id AND + NStrain.StrainId = ProbeSetData.StrainId) WHERE ProbeSet.Name = '%s' AND ProbeSetXRef.ProbeSetId = ProbeSet.Id AND ProbeSetXRef.ProbeSetFreezeId = ProbeSetFreeze.Id AND |