Fixes for Oracle.

thehyve · Apr 15, 2016 · c362a54 · c362a54
1 parent 8fff877
commit c362a54
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...ain/groovy/org/transmartproject/batch/browsetag/BrowseTagAssociationDatabaseReader.groovy b/...ain/groovy/org/transmartproject/batch/browsetag/BrowseTagAssociationDatabaseReader.groovy
@@ -114,7 +114,7 @@ class BrowseTagAssociationDatabaseReader implements ItemStreamReader<BrowseTagAs
                 INNER JOIN $Tables.AM_TAG_ITEM ati
                 ON ata.tag_item_id = ati.tag_item_id
                 INNER JOIN $Tables.BIO_CONCEPT_CODE bcc
-                ON ata.object_uid = concat(bcc.code_type_name, ':', bcc.bio_concept_code)
+                ON ata.object_uid = concat(bcc.code_type_name, concat(':', bcc.bio_concept_code))
                 LEFT OUTER JOIN $Tables.FM_FOLDER fp
                 ON f.parent_id = fp.folder_id
                 WHERE ata.object_type = 'BIO_CONCEPT_CODE')

diff --git a/src/main/groovy/org/transmartproject/batch/browsetag/BrowseTagTypeDatabaseReader.groovy b/src/main/groovy/org/transmartproject/batch/browsetag/BrowseTagTypeDatabaseReader.groovy
@@ -70,6 +70,7 @@ class BrowseTagTypeDatabaseReader implements ItemStreamReader<BrowseTagType> {
                 ON bcc.code_type_name = ati.code_type_name
                 INNER JOIN $Tables.AM_TAG_TEMPLATE att
                 ON ati.tag_template_id = att.tag_template_id
+                ORDER BY display_name ASC
         """
     }
 
@@ -112,6 +113,7 @@ class BrowseTagTypeDatabaseReader implements ItemStreamReader<BrowseTagType> {
                 INNER JOIN $Tables.AM_TAG_TEMPLATE att
                 ON ati.tag_template_id = att.tag_template_id
                 WHERE ati.tag_item_id = $tagType.id
+                ORDER BY bcc.code_description ASC
         """
     }
 

diff --git a/src/test-func/groovy/org/transmartproject/batch/browsetag/BrowseTagExportJobTests.groovy b/src/test-func/groovy/org/transmartproject/batch/browsetag/BrowseTagExportJobTests.groovy
@@ -71,8 +71,8 @@ class BrowseTagExportJobTests {
                         'Lead optimization',
                         'Hit finding',
                         'Target identification / validation'
-                ].join(','),
-                '4'
+                ].sort().join(','),
+                '9'
         ].join('\t')
         assertThat readExportedTagTypes(), hasItems(
             expected