diff query_tabular.xml @ 15:cf4397560712 draft default tip

planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/query_tabular commit dd35055c76d86fe98985b5825c1751efb8208242
author iuc
date Thu, 27 Jun 2024 17:23:34 +0000
parents 3a6b78c39dca
children
line wrap: on
line diff
--- a/query_tabular.xml	Wed Sep 13 12:15:42 2023 +0000
+++ b/query_tabular.xml	Thu Jun 27 17:23:34 2024 +0000
@@ -1,4 +1,4 @@
-<tool id="query_tabular" name="Query Tabular" version="3.3.1">
+<tool id="query_tabular" name="Query Tabular" version="3.3.2">
     <description>using sqlite sql</description>
 
     <macros>
@@ -37,6 +37,7 @@
 #set $jtbls = []
 #set $jtbldef['tables'] = $jtbls
 #for $i,$tbl in enumerate($tables):
+  #set $table = $tbl.table
   #set $jtbl = dict()
   #set $jtbl['file_path'] = str($tbl.table)
   #if $tbl.tbl_opts.table_name:
@@ -137,7 +138,7 @@
                           You can override the default names by entering a comma -separated list of names, e.g. ',name1,,,name2' would rename the second and fifth columns.
                     </help>
                     <sanitizer sanitize="False"/>
-                    <validator type="regex" message="A List of names separated by commas: Column names should start with a letter and may contain additional letters, digits, and underscores. Otherwise, the name must be eclosed in: double quotes, back quotes, or square brackets.">^([A-Za-z]\w*|"\S+[^,"]*"|`\S+[^,`]*`|[[]\S+[^,"]*[]])?(,([A-Za-z]\w*|"\S+.*"|`\S+[^,`]*`|[[]\S+[^,"]*[]])?)*$</validator>
+                    <validator type="regex" message="A List of names separated by commas: Column names should start with a letter and may contain additional letters, digits, and underscores. Otherwise, the name must be eclosed in: double quotes, back quotes, or square brackets.">^([A-Za-z]\w*|"\S+[^,"]*"|`\S+[^,`]*`|\[\S+[^,"]*\])?(,([A-Za-z]\w*|"\S+[^,"]*"|`\S+[^,`]*`|\[\S+[^,"]*\])?)*$</validator>
                 </param>
                 <param name="load_named_columns" type="boolean" truevalue="load_named_columns" falsevalue="" checked="false" label="Only load the columns you have named into database"/>
                 <param name="pkey_autoincr" type="text" value="" optional="true" label="Add an auto increment primary key column with this name"
@@ -148,7 +149,7 @@
                     <param name="unique" type="boolean" truevalue="yes" falsevalue="no" checked="False" label="This is a unique index"/>
                     <param name="index_columns" type="text" value="" label="Index on Columns">
                         <help>Create an index on the column names: e.g. for default column names:  c1  or c2,c4 ( use the names you gave for columns)</help>
-                        <validator type="regex" message="Column name, separated by commes if more than one">^([A-Za-z]\w*|"\S+[^,"]*"|`\S+[^,`]*`|[[]\S+[^,"]*[]])(,([A-Za-z]\w*|"\S+.*"|`\S+[^,`]*`|[[]\S+[^,"]*[]])?)*$</validator>
+                        <validator type="regex" message="Column name, separated by commes if more than one">^([A-Za-z]\w*|"\S+[^,"]*"|`\S+[^,`]*`|\[\S+[^,"]*\])(,([A-Za-z]\w*|"\S+[^,"]"|`\S+[^,`]*`|\[\S+[^,"]*\])?)*$</validator>
                         <sanitizer sanitize="False"/>
                     </param>
                 </repeat>
@@ -192,7 +193,7 @@
     </outputs>
     <tests>
         <!-- Test 1 -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="customers.tsv"/>
                 <section name="input_opts">
@@ -228,7 +229,7 @@
         </test>
 
         <!-- Test 2 -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="customers.tsv"/>
                 <section name="input_opts">
@@ -259,7 +260,7 @@
         </test>
 
         <!-- Test 3 -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="customers.tsv"/>
                 <section name="input_opts">
@@ -279,7 +280,7 @@
         </test>
 
         <!-- Test 4 -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="IEDB.tsv"/>
                 <section name="input_opts">
@@ -315,7 +316,7 @@
         </test>
 
         <!-- Test 5 -->
-        <test>
+        <test expect_num_outputs="1">
             <section name="add_to_database">
                 <param name="withdb" ftype="sqlite" value="testdb.sqlite"/>
             </section>
@@ -365,7 +366,7 @@
         </test>
 
         <!-- Test 6 -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="pets.tsv"/>
                 <section name="input_opts">
@@ -446,7 +447,7 @@
         </test>
 
         <!-- Test 7 -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="psm_report.tsv"/>
                 <section name="input_opts">
@@ -472,7 +473,7 @@
         </test>
 
         <!-- Test 8 column_names_from_first_line -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="psm_report.tsv"/>
                 <section name="input_opts">
@@ -498,7 +499,7 @@
         </test>
 
         <!-- Test 9  modify database -->
-        <test>
+        <test expect_num_outputs="2">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="psm_report.tsv"/>
                 <section name="input_opts">
@@ -539,7 +540,7 @@
         </test>
 
         <!-- Test 10 column_names_from_first_line -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="netMHC_summary.tsv"/>
                 <section name="input_opts">
@@ -565,7 +566,7 @@
         </test>
 
         <!-- Test 11 -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="netMHC_summary.tsv"/>
                 <section name="input_opts">
@@ -592,7 +593,7 @@
         </test>
 
         <!-- Test 12 math functions -->
-        <test>
+        <test expect_num_outputs="1">
             <repeat name="tables">
                 <param name="table" ftype="tabular" value="math_input.tsv"/>
             </repeat>