switch columns

data_managers/data_manager_checkm2/data_manager_conf.xml

@@ -4,6 +4,7 @@
             <output>
                 <column name="value"/>
                 <column name="name"/>
+                <column name="version"/>
                 <column name="path" output_ref="out_file">
                     <move type="file">
                         <source>${path}</source>
@@ -12,7 +13,6 @@
                     <value_translation>${GALAXY_DATA_MANAGER_DATA_PATH}/checkm2/${value}/${path}</value_translation>
                     <value_translation type="function">abspath</value_translation>
                 </column>
-                <column name="version"/>
             </output>
         </data_table>
     </data_manager>

data_managers/data_manager_checkm2/test-data/checkm2.loc

@@ -1,3 +1,2 @@
 
-1.0.2		CheckM2 reference data downloaded with version 1.0.2	/tmp/tmpnr4n1xeu/galaxy-dev/tool-data/checkm2/1.0.2/uniref100.KO.1.dmnd	1.0.2
-1.0.2		CheckM2 diamond DB downloaded with version 1.0.2	/tmp/tmpf_hplx2a/galaxy-dev/tool-data/checkm2/1.0.2/uniref100.KO.1.dmnd	1.0.2
+1.0.2	CheckM2 diamond DB downloaded with version 1.0.2	1.0.2	/tmp/tmpf_hplx2a/galaxy-dev/tool-data/checkm2/1.0.2/uniref100.KO.1.dmnd

data_managers/data_manager_checkm2/tool-data/checkm2.loc.sample

@@ -10,9 +10,9 @@
 #The checkm2_db_versioned.loc file has this format (longer white space
 #characters are TAB characters):
 #
-#<unique_build_id>	<display_name>	<file_base_path>	<version>
+#<unique_build_id>	<display_name>	<version>	<file_base_path>
 
 #The <version> column indicates the checkm2 version that generated the database
 
 #
-#diamond_db_1.0.2	Diamond database	/mnt/galaxyIndices/Checkm2_database/uniref100.KO.1.dmnd	1.0.2
+#diamond_db_1.0.2	Diamond database	1.0.2	/mnt/galaxyIndices/Checkm2_database/uniref100.KO.1.dmnd

data_managers/data_manager_checkm2/tool_data_table_conf.xml.sample

@@ -1,6 +1,6 @@
 <tables>
     <table name="checkm2" comment_char="#" allow_duplicate_entries="False">
-        <columns>value, dbkey, name, path, version</columns>
+        <columns>value, dbkey, name, version, path</columns>
         <file path="tool-data/checkm2.loc" />
     </table>
 </tables>

data_managers/data_manager_checkm2/tool_data_table_conf.xml.test

@@ -1,7 +1,7 @@
 <tables>
     <!-- Location of rnastar indexes for testing -->
     <table name="checkm2" comment_char="#" allow_duplicate_entries="False">
-        <columns>value, dbkey, name, path, version</columns>
+        <columns>value, dbkey, name, version, path</columns>
         <file path="${__HERE__}/test-data/checkm2.loc" />
     </table>
 </tables>

tools/checkm2/test-data/checkm2.loc

@@ -1,3 +1,3 @@
 ##Checkm2 versioned indexes
 #build_id	display_name	path	version
-001	test_db	${__HERE__}/Checkm2_database/uniref100.KO.1.dmnd	1.0.2
+001	test_db	1.0.2	${__HERE__}/Checkm2_database/uniref100.KO.1.dmnd

tools/checkm2/tool-data/checkm2.loc.sample

@@ -10,9 +10,9 @@
 #The checkm2_db_versioned.loc file has this format (longer white space
 #characters are TAB characters):
 #
-#<unique_build_id>	<display_name>	<file_base_path>	<version>
+#<unique_build_id>	<display_name>	<version>	<file_base_path>
 
 #The <version> column indicates the checkm2 version that generated the database
 
 #
-#diamond_db_1.0.2	Diamond database	/mnt/galaxyIndices/Checkm2_database/uniref100.KO.1.dmnd	1.0.2
+#diamond_db_1.0.2	Diamond database	1.0.2	/mnt/galaxyIndices/Checkm2_database/uniref100.KO.1.dmnd

tools/checkm2/tool_data_table_conf.xml.sample

@@ -1,6 +1,6 @@
 <tables>
     <table name="checkm2" comment_char="#" allow_duplicate_entries="False">
-        <columns>value, name, path, version</columns>
+        <columns>value, name, version, path</columns>
         <file path="tool-data/checkm2.loc" />
     </table>
 </tables>

tools/checkm2/tool_data_table_conf.xml.test

@@ -1,6 +1,6 @@
 <tables>
     <table name="checkm2" comment_char="#" allow_duplicate_entries="False">
-        <columns>value, name, path, version</columns>
+        <columns>value, name, version, path</columns>
         <file path="${__HERE__}/test-data/checkm2.loc" />
     </table>
 </tables>