From c87dc8facf9c2442e2d340336d63a0b2f3772e40 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Tue, 26 Mar 2024 10:26:18 +0300 Subject: 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. --- gn2/wqflask/show_trait/SampleList.py | 6 +++--- 1 file 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 = {} -- cgit v1.2.3