aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
authorLei Yan2017-05-04 15:53:31 +0000
committerLei Yan2017-05-04 15:53:31 +0000
commita68897dc7b56e3c36229ab1452de90ba87ff6223 (patch)
tree0404280aef9d6f1b554e0277273197705bd20e1b /wqflask/base
parent67218be3a181de7aad617237c11ee33436b8d762 (diff)
parent3c46a58f50f339ec56027db6d2108de5b21d63ac (diff)
downloadgenenetwork2-a68897dc7b56e3c36229ab1452de90ba87ff6223.tar.gz
Merge branch 'master' of github.com:genenetwork/genenetwork2
Diffstat (limited to 'wqflask/base')
-rw-r--r--wqflask/base/data_set.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 7f08135f..4959457a 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -893,7 +893,7 @@ class GenotypeDataSet(DataSet):
def retrieve_sample_data(self, trait):
query = """
SELECT
- Strain.Name, GenoData.value, GenoSE.error, GenoData.Id, Sample.Name2
+ Strain.Name, GenoData.value, GenoSE.error, GenoData.Id, Strain.Name2
FROM
(GenoData, GenoFreeze, Strain, Geno, GenoXRef)
left join GenoSE on