diff options
| author | Pjotr Prins | 2016-05-29 17:20:20 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2016-05-29 17:20:20 +0000 |
| commit | 4b083f2cdfa493f7b2ccc3c30cc5bb6cad694d3a (patch) | |
| tree | c2c2503d88868f13b06dd66328720486e72f647a /wqflask/base/data_set.py | |
| parent | 33d817c81b4b22bc051dbde2b26c5d4de028369e (diff) | |
| parent | 0d22d3bc72cfc35cb23efce3d1687477880a5b3e (diff) | |
| download | genenetwork2-4b083f2cdfa493f7b2ccc3c30cc5bb6cad694d3a.tar.gz | |
Merge branch 'master' of github.com:genenetwork/genenetwork2
Diffstat (limited to 'wqflask/base/data_set.py')
| -rw-r--r-- | wqflask/base/data_set.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 053b45fc..4953e728 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -711,7 +711,7 @@ class PhenotypeDataSet(DataSet): def retrieve_sample_data(self, trait): query = """ SELECT - Strain.Name, PublishData.value, PublishSE.error, NStrain.count + Strain.Name, PublishData.value, PublishSE.error, NStrain.count, Strain.Name2 FROM (PublishData, Strain, PublishXRef, PublishFreeze) left join PublishSE on @@ -803,7 +803,7 @@ class GenotypeDataSet(DataSet): def retrieve_sample_data(self, trait): query = """ SELECT - Strain.Name, GenoData.value, GenoSE.error, GenoData.Id + Strain.Name, GenoData.value, GenoSE.error, GenoData.Id, Sample.Name2 FROM (GenoData, GenoFreeze, Strain, Geno, GenoXRef) left join GenoSE on @@ -1031,7 +1031,7 @@ class MrnaAssayDataSet(DataSet): def retrieve_sample_data(self, trait): query = """ SELECT - Strain.Name, ProbeSetData.value, ProbeSetSE.error, ProbeSetData.Id + Strain.Name, ProbeSetData.value, ProbeSetSE.error, ProbeSetData.Id, Strain.Name2 FROM (ProbeSetData, ProbeSetFreeze, Strain, ProbeSet, ProbeSetXRef) left join ProbeSetSE on |