ZFIN-9449 remove zf-espresso foreign db

ZFIN · Dec 19, 2024 · 326ca39 · 326ca39
1 parent f3a2477
commit 326ca39
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/source/org/zfin/db/postGmakePostloaddb/1165/ZFIN-9449.sql b/source/org/zfin/db/postGmakePostloaddb/1165/ZFIN-9449.sql
@@ -0,0 +1,31 @@
+--liquibase formatted sql
+--changeset cmpich:ZFIN-9449.sql
+
+delete
+from foreign_db_contains_display_group_member
+where fdbcdgm_fdbcont_zdb_id  in (select fdbcont_zdb_id
+                                 from foreign_db_contains
+                                 where fdbcont_fdb_db_id = 45);
+
+delete
+from foreign_db_contains
+where fdbcont_fdb_db_id = 45;
+
+delete
+from foreign_db
+where fdb_db_name = 'WashU';
+
+delete
+from foreign_db_contains_display_group_member
+where fdbcdgm_fdbcont_zdb_id  in (select fdbcont_zdb_id
+                                  from foreign_db_contains
+                                  where fdbcont_fdb_db_id = 47);
+
+delete
+from foreign_db_contains
+where fdbcont_fdb_db_id = 47;
+
+
+delete
+from foreign_db
+where fdb_db_name = 'ZF-Espresso';
diff --git a/source/org/zfin/db/postGmakePostloaddb/1165/db.changelog.master.xml b/source/org/zfin/db/postGmakePostloaddb/1165/db.changelog.master.xml
@@ -6,5 +6,6 @@
                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
 
     <include file="source/org/zfin/db/postGmakePostloaddb/1165/ZFIN-9444.sql" />
+    <include file="source/org/zfin/db/postGmakePostloaddb/1165/ZFIN-9449.sql" />
 
 </databaseChangeLog>
diff --git a/source/org/zfin/expression/repository/HibernateExpressionRepository.java b/source/org/zfin/expression/repository/HibernateExpressionRepository.java
@@ -271,7 +271,7 @@ public List<BasicExpressionDTO> getBasicExpressionDTOObjects() {
                         when container.stg_name_long like 'Larval%' then 'post embryonic, pre-adult'
                         when container.stg_name_long like 'Juvenile%' then 'post embryonic, pre-adult'
                         when container.stg_name = 'Adult' then 'UBERON:0000113'
-                   else null end as uberon_stage, 
+                   end as uberon_stage,
                    container.stg_name as stage_name
               from expression_experiment
               join expression_result on xpatex_zdb_id = xpatres_xpatex_zdb_id