diff options
| author | Pjotr Prins | 2016-10-02 11:06:56 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2016-10-02 11:06:56 +0000 |
| commit | 98a5a2bb69f0a340c12bb8126902e393dabd5dce (patch) | |
| tree | f7814340304c7dc9132903c3be6d7bf505449aea | |
| parent | 3496c5eeae6d9d6064188720902b0cc1b415f610 (diff) | |
| parent | bb2505109f589e713730c1e2396ac9ffe5032efd (diff) | |
| download | genenetwork2-98a5a2bb69f0a340c12bb8126902e393dabd5dce.tar.gz | |
Merge branch 'master' of github.com:genenetwork/genenetwork2
| -rw-r--r-- | wqflask/base/trait.py | 2 | ||||
| -rw-r--r-- | wqflask/maintenance/__init__.py | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 900e050c..32032ba7 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -363,7 +363,7 @@ class GeneralTrait(object): FROM Homologene, Species, InbredSet WHERE - Homologene.GeneId =%s AND + Homologene.GeneId ='%s' AND InbredSet.Name = '%s' AND InbredSet.SpeciesId = Species.Id AND Species.TaxonomyId = Homologene.TaxonomyId diff --git a/wqflask/maintenance/__init__.py b/wqflask/maintenance/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/wqflask/maintenance/__init__.py |