about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi2024-03-26 10:26:18 +0300
committerFrederick Muriuki Muriithi2024-03-26 10:26:18 +0300
commitc87dc8facf9c2442e2d340336d63a0b2f3772e40 (patch)
tree6d73ae0622ae8d09c617bd3eef7545c4ddf72e93
parentdf32b162a8fb7ad9ab884e77e07a3b64e81e2922 (diff)
downloadgenenetwork2-c87dc8facf9c2442e2d340336d63a0b2f3772e40.tar.gz
Revert "Disable CaseAttributeId - because it needs an update to the database"
This reverts commit 4539ef0297bb4b8c2954f250697c237069a16d64.

This commit was ignoring the historical context that led to the
changes in the schema of the `CaseAttribute*` tables, and leads to
errors when the database schema is updated.
-rw-r--r--gn2/wqflask/show_trait/SampleList.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gn2/wqflask/show_trait/SampleList.py b/gn2/wqflask/show_trait/SampleList.py
index 111537c1..64fc8fe6 100644
--- a/gn2/wqflask/show_trait/SampleList.py
+++ b/gn2/wqflask/show_trait/SampleList.py
@@ -125,13 +125,13 @@ class SampleList:
         # Get attribute names and distinct values for each attribute
         with database_connection(get_setting("SQL_URI")) as conn, conn.cursor() as cursor:
             cursor.execute(
-                "SELECT DISTINCT CaseAttribute.Id, "
+                "SELECT DISTINCT CaseAttribute.CaseAttributeId, "
                 "CaseAttribute.Name, CaseAttribute.Description, "
                 "CaseAttributeXRefNew.Value FROM "
                 "CaseAttribute, CaseAttributeXRefNew WHERE "
-                "CaseAttributeXRefNew.CaseAttributeId = CaseAttribute.Id "
+                "CaseAttributeXRefNew.CaseAttributeId = CaseAttribute.CaseAttributeId "
                 "AND CaseAttributeXRefNew.InbredSetId = %s "
-                "ORDER BY CaseAttribute.Id", (str(self.dataset.group.id),)
+                "ORDER BY CaseAttribute.CaseAttributeId", (str(self.dataset.group.id),)
             )
 
             self.attributes = {}