Refactoring DB-Tests, Link auf Ticketsystem ergänzt #4

src-modules/module/qa/conf/qa.xml

@@ -418,6 +418,7 @@ notnull="false">
 <column name="active" type ="SMALLINT" size ="5" default ="" notnull ="false" description="Aktiv"/>
 <column name="created_at" type ="DATE" size ="13" default ="" notnull ="false" description="Erzeugt am"/>
 <column name="created_from" type ="INTEGER" size ="10" default ="" notnull ="false" description="Erzeugt von"/>
+<column name="issue_link" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Link zum Ticketsystem"/>
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@@ -442,6 +443,9 @@ notnull="false">
 <column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Name"/>
 <column name="systeminfo_id" type ="INTEGER" size ="10" default ="" notnull ="true" description="Komponente"/>
 <column name="fromclause" type ="TEXT" size ="32255" default ="" notnull ="false" description="Quelltabellen"><comment>formuliert als SQL-from-Ausdruck</comment></column>
+<column name="fieldclause" type ="TEXT" size ="255" default ="" notnull ="false" description="Felder"><comment>formuliert als SQL-select-Ausdruck</comment></column>
+<column name="groupbyclause" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Gruppierung"><comment>formuliert als SQL-group by -Ausdruck</comment></column>
+<column name="orderbyclause" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Sortierung"><comment>formuliert als SQL-order by-Ausdruck</comment></column>
 </columns>
 <indexes>
 <index name="ix_qa_resultset_id" type="unique">
@@ -464,7 +468,7 @@ notnull="false">
 <privileges><rs>
 </rs></privileges>
 </table>
-
+<!--
 <table name="qa_resultset_field" caption="Datenbanktest Ergebnistabelle Felder" thema="Qualitätssicherung" typ="Schlüsseltabelle">
 <columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/>
 <column name="uniquename" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Schlüssel"/>
@@ -488,15 +492,16 @@ notnull="false">
 <privileges><rs>
 </rs></privileges>
 </table>
-
+-->
 <table name="qa_dbtest" caption="Datenbank-Test" thema="Qualitätssicherung" typ="Schlüsseltabelle">
 <columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/>
 <column name="uniquename" type ="VARCHAR" size ="255" default ="" notnull ="true" description="Schlüssel"/>
 <column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Name"/>
 <column name="systeminfo_id" type ="INTEGER" size ="10" default ="" notnull ="false" description="Komponente"/>
-<column name="resultset_field_id" type ="INTEGER" size ="10" default ="" notnull ="false" description="Ergebnistabelle"/>
+<column name="resultset_id" type ="INTEGER" size ="10" default ="" notnull ="true" description="Ergebnistabelle"/>
 <column name="whereclause" type ="TEXT" size ="2147483647" default ="" notnull ="false" description="Bedingung"><comment>formuliert als SQL-where-Ausdruck</comment></column>
-<column name="active" type ="SMALLINT" size ="5" default ="" notnull ="false" description="Aktiv"/>
+<column name="description" type ="TEXT" size ="2147483647" default ="" notnull ="false" description="Beschreibung"><comment></comment></column>
+<column name="active" type ="SMALLINT" size ="5" default ="1" notnull ="false" description="Aktiv"/>
 </columns>
 <indexes>
 <index name="ix_qa_dbtest_id" type="unique">
@@ -523,6 +528,7 @@ notnull="false">
 <columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/>
 <column name="dbtest_id" type ="INTEGER" size ="255" default ="" notnull ="true" isKey="true" description="DB-Test"/>
 <column name="project_id" type ="INTEGER" size ="10" default ="" notnull ="true" description="Projekt"/>
+<column name="issue_id" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Ticketnummer"><comment></comment></column>
 </columns>
 <indexes>
 <index name="ix_qa_dbtest2project_id" type="unique">
@@ -572,6 +578,7 @@ notnull="false">
 
 <table name="qa_dbtest_result" caption="Datenbank-Testergebnis" thema="Qualitätssicherung" typ="Datentabelle">
 <columns>
+<column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/>
 <column name="dbtest_assertion_id" type ="INTEGER" size ="10" default ="" notnull ="false" description="Erwartetes Testergebnis"/>
 <column name="execution_start" type ="DATETIME" size ="35" default ="" notnull ="false" description="Ausführung Start"/>
 <column name="execution_end" type ="DATETIME" size ="35" default ="" notnull ="false" description="Ausführung Ende"/>
@@ -579,7 +586,16 @@ notnull="false">
 <column name="result_value" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Ergebnis"/>
 </columns>
 <indexes></indexes>
-
+<primaryKeys><rs>
+<row>
+<fld name='table_cat'></fld>
+<fld name='table_schem'></fld>
+<fld name='table_name'>qa_dbtest_result</fld>
+<fld name='column_name'>tid</fld>
+<fld name='key_seq'>1</fld>
+<fld name='pk_name'>pk_qa_dbtest_result</fld>
+</row>
+</rs></primaryKeys>
 <foreignKeys></foreignKeys>
 <importedKeys></importedKeys>
 <privileges><rs>
@@ -783,10 +799,10 @@ format="%s">
 <relation-column from="tid" to="dbtest_id" />
 </relation>
 <!--qa_dbtest-->
-<relation from="qa_resultset_field" to="qa_dbtest"
+<relation from="qa_resultset" to="qa_dbtest"
 delete="FALSE" displayType="select" visibleFields="name"
 format="%s">
-<relation-column from="tid" to="resultset_field_id" />
+<relation-column from="tid" to="resultset_id" />
 </relation>
 <relation from="systeminfo" to="qa_dbtest"
 delete="FALSE" displayType="select" visibleFields="name"
@@ -999,8 +1015,9 @@ mode="full">
 <customfield name="systeminfo_id" visibleSize="50" nullFieldValue="" />
 <customfield name="name" visibleSize="50" nullFieldValue="" />
 <customfield name="uniquename" visibleSize="50" nullFieldValue="" />
-<customfield name="resultset_field_id" visibleSize="50" nullFieldValue="" />
+<customfield name="resultset_id" visibleSize="50" nullFieldValue="" />
 <customfield name="whereclause" visibleSize="80" nullFieldValue="" />
+<customfield name="description" visibleSize="80" nullFieldValue="" />
 <customfield name="Projekt" type="subform"  multipart="false" autoUpdate="false" 
  maxRows="*" table="qa_dbtest2project" parentField="tid" childField="dbtest_id"
  orderBy="" allowNew="true"
@@ -1008,6 +1025,7 @@ mode="full">
  <field-selection  complete="false"  />
 <customfield name="dbtest_id" type="hidden" overrideValue="tid" />
 <customfield name="project_id" nullFieldValue=""  visibleSize="5" />
+<customfield name="issue_id" nullFieldValue=""  visibleSize="5" />
   </customfield>
   <customfield name="Erwartetes Ergebnis" type="subform"  multipart="false" autoUpdate="false" 
  maxRows="*" table="qa_dbtest_assertion" parentField="tid" childField="dbtest_id"
@@ -1070,63 +1088,14 @@ mode="full">
 <customfield name="name" visibleSize="50" nullFieldValue="" />
 <customfield name="uniquename" visibleSize="50" nullFieldValue="" />
 <customfield name="active" visibleSize="10" nullFieldValue="" />
+<customfield name="fieldclause" visibleSize="80" nullFieldValue="" />
 <customfield name="fromclause" visibleSize="10" nullFieldValue="" />
-<customfield name="Felder" type="subform"  multipart="false" autoUpdate="false" 
+<customfield name="groupbyclause" visibleSize="80" nullFieldValue="" />
- maxRows="*" table="qa_resultset_field" parentField="tid" childField="resultset_id"
+<customfield name="orderbyclause" visibleSize="80" nullFieldValue="" />
- orderBy="" allowNew="true"
- mode="full">
- <field-selection  complete="false"  />
-<customfield name="resultset_id" type="hidden" overrideValue="tid" />
-<customfield name="name" nullFieldValue=""  visibleSize="20" />
-<customfield name="uniquename" nullFieldValue=""  visibleSize="20" />
-<customfield name="fieldclause" nullFieldValue=""  visibleSize="30" />
 
-  </customfield>
-</form>
-
-<form name="qa_resultset_field_list"
- table="qa_resultset_field"
- path="/edit/qa/qa_resultset_field_list.jsp"
- followUp=""
- caption="Felder in Ausgabetabellen verwalten"
- orderBy="name"
- gotoHt=""
- helpfile=""
- maxRows="*"
- mode="full">
-<description>In diesem Formular können Sie Felder Ausgabetabellen verwalten. Im Details-Formular können Sie Tabellen und Felder zuordnen.</description>
-<filters>
-</filters>
-<field-selection  complete="false"  />
-<customfield name="tid" nullFieldValue="" />
-<customfield name="name" nullFieldValue="" visibleSize="30" />
-<customfield name="uniquename" nullFieldValue="" visibleSize="30" />
-<customfield type="link" name="Details" path="/superx/edit/qa/qa_resultset_field_edit.jsp" linkid="tid"/>
 </form>
 
-<form name="qa_resultset_field_edit"
- table="qa_resultset_field"
- path="/edit/qa/qa_resultset_field_edit.jsp"
- followUp=""
- caption="Felder für Ausgabetabellen verwalten"
- orderBy="name"
- gotoHt=""
- helpfile=""
 
-maxRows="1"
-mode="full">
-<description>In diesem Formular können Sie Felder für Ausgabetabellen für Datenbanktests  verwalten.</description>
-<filters>
-<filter mandatory="true" type="equals">tid</filter>
-</filters>
-<field-selection complete="false" />
-<customfield name="tid"  />
-<customfield name="resultset_id" visibleSize="50" nullFieldValue="" />
-<customfield name="name" visibleSize="50" nullFieldValue="" />
-<customfield name="uniquename" visibleSize="50" nullFieldValue="" />
-<customfield name="fieldclause" visibleSize="10" nullFieldValue="" />
-
-</form>
 <form name="qa_project_list"
  table="qa_project"
  path="/edit/qa/qa_project_list.jsp"
@@ -1169,6 +1138,7 @@ mode="full">
 <customfield name="sachgebiete_id" visibleSize="50" nullFieldValue="" />
 <customfield name="name" visibleSize="50" nullFieldValue="" />
 <customfield name="uniquename" visibleSize="50" nullFieldValue="" />
+<customfield name="issue_link" visibleSize="50" nullFieldValue="" />
 <customfield name="active" visibleSize="10" nullFieldValue="" />
 <customfield name="created_at" visibleSize="10" nullFieldValue="" />
 <customfield name="created_from" visibleSize="10" nullFieldValue="" />

src-modules/module/qa/masken/37100_maskeninfo.unl

@@ -27,7 +27,8 @@ T.systeminfo_id,\
 A.tid as qa_dbtest_assertion_id,\
 A.def_col_caption,\
 A.def_col_name,\
-A.def_col_value\
+A.def_col_value,\
+''::varchar(255) as ticket_link\
 "\
 source="qa_dbtest T, qa_dbtest_assertion A left outer join qa_dbtest_result R on (R.dbtest_assertion_id=A.tid /* and date(R.execution_start) >= date_val(<<Ab Datum>>) */)"\
 target="tmp_qa_dbtest">\
@@ -42,7 +43,11 @@ target="tmp_qa_dbtest">\
  </@selectintotmp>\
  <@informixnolog/>;\
 \
-\
+update tmp_qa_dbtest set ticket_link=P.issue_link || TP.issue_id\
+from qa_dbtest2project TP, qa_project P\
+where TP.dbtest_id=tmp_qa_dbtest.tid\
+and P.tid=TP.project_id\
+;\
 update tmp_qa_dbtest set --result_status=1,\
 result_status_str='Warnung'\
  where result_code=1;\
@@ -64,6 +69,7 @@ where S.tid=tmp_qa_dbtest.systeminfo_id);\
 select systeminfo_id_str,\
 name,\
 uniquename,\
+case when ticket_link !='' then 'Ticket|' || ticket_link else '' end as nextserverlink,\
 def_col_caption,\
 execution_start,\
 <#if SQLdialect='Postgres'>\
@@ -90,6 +96,9 @@ Column CID=1 heading_text="Testfall" center_heading\
 Column CID=1 heading_text="Testfall\\nSchlüssel" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=10 text_size=200\
+Column CID=1 heading_text="Ticket" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=10 text_size=200\
 Column CID=1 heading_text="Annahme" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=50 text_size=200\

src-modules/module/qa/masken/37120_maskeninfo.unl

@@ -9,11 +9,10 @@ name VARCHAR(255) , \
 systeminfo_id INTEGER , \
 resultset_id INTEGER ,\
 resultset_str varchar(255) , \
-resultset_field_id INTEGER , \
-resultset_field_str varchar(255) , \
 whereclause TEXT , \
 active SMALLINT , \
 letzter_lauf date,\
+ticket_link varchar(255),\
 nextedit varchar(255),\
 nexttable varchar(255)\
 );\
@@ -22,7 +21,7 @@ insert into tmp_qa_dbtest (ord,\
        uniquename,\
        name,\
        systeminfo_id,\
-       resultset_field_id,\
+       resultset_id,\
        whereclause,\
        active,\
        nextedit,\
@@ -32,32 +31,35 @@ select 1 as ord,\
        uniquename,\
        name,\
        systeminfo_id,\
-       resultset_field_id,\
+       resultset_id,\
        whereclause,\
        active,\
        ('../edit/qa/qa_dbtest_edit.jsp|tid=' || D.tid)::varchar(255),\
        ('37140&DB-Test=' || D.tid)::varchar(255) as nexttable\
 FROM  qa_dbtest D\
 where 1=1\
-/* and D.resultset_field_id=<<Ausgabetabelle>> */\
+/* and D.resultset_id=<<Ausgabetabelle>> */\
 /* and D.name like '%<<Name>>%' */\
 /* and D.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<<Projekt>> )*/\
 /* and D.systeminfo_id=<<Komponente>> */\
 /* and D.active=<<Status Test>> */\
 ;\
 \
-update tmp_qa_dbtest set resultset_id=R.resultset_id,\
+\
-resultset_field_str=R.name\
+update tmp_qa_dbtest set ticket_link=P.issue_link || TP.issue_id\
-from qa_resultset_field R\
+from qa_dbtest2project TP, qa_project P\
-where R.tid=tmp_qa_dbtest.resultset_field_id;\
+where TP.dbtest_id=tmp_qa_dbtest.tid\
+and P.tid=TP.project_id\
+;\
 \
 update tmp_qa_dbtest set resultset_str=R.name\
 from qa_resultset R\
 where R.tid=tmp_qa_dbtest.resultset_id;\
 \
-update tmp_qa_dbtest set letzter_lauf=(select max(date(execution_start))\
+update tmp_qa_dbtest set letzter_lauf=(select max(date(R.execution_start))\
-from qa_dbtest_result R\
+from qa_dbtest_result R, qa_dbtest_assertion A\
-where R.dbtest_id=tmp_qa_dbtest.tid);\
+where R.dbtest_assertion_id=A.tid\
+and A.dbtest_id=tmp_qa_dbtest.tid);\
 \
 \
 -- update tmp_qa_dbtest set nextedit=trim(nextedit) || trim('&rs=' || \
@@ -85,9 +87,9 @@ from qa_dbtest\
 select="name,\
 uniquename,\
 resultset_str,\
-resultset_field_str,\
 active,\
 letzter_lauf,\
+ticket_link,\
 nextedit,\
 nexttable,\
 ord"\
@@ -103,7 +105,7 @@ select \
 name,\
 uniquename,\
 resultset_str,\
-resultset_field_str,\
+case when ticket_link !='' then 'Ticket|' || ticket_link else '' end as nextserverlink,\
 active,\
 letzter_lauf,\
 nextedit ,\
@@ -122,9 +124,9 @@ Column CID=0 heading_text="Schlüssel" center_heading\
 Column CID=1 heading_text="Ergebnistabelle" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=150 text_size=200\
-Column CID=1 heading_text="Ergebnisfeld" center_heading\
+Column CID=1 heading_text="Ticket" center_heading\
    row_selectable col_selectable heading_platform readonly\
-   width=150 text_size=200\
+   width=10 text_size=200\
 Column CID=1 heading_text="Aktiv" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=5 text_size=200\

src-modules/module/qa/masken/37140_maskeninfo.unl

@@ -5,18 +5,17 @@
 \
 <sqlvar name="qa_dbtests" type='hashsequence'>\
 select \
-F.uniquename  as resultset_field_uniquename,\
+R.fieldclause,\
-F.name as resultset_field_name,\
 R.fromclause,\
-F.fieldclause,\
+R.groupbyclause,\
+R.orderbyclause,\
 T.tid,\
 T.uniquename,\
 T.name,\
 T.whereclause\
-FROM qa_dbtest T, qa_resultset R, qa_resultset_field F\
+FROM qa_dbtest T, qa_resultset R\
 where \
-T.resultset_field_id=F.tid\
+T.resultset_id=R.tid\
-and R.tid=F.resultset_id\
 and T.tid=<<DB-Test>>\
 ;\
 \
@@ -49,7 +48,15 @@ into temp tmp_anfang;\
 select ${dbtest.fieldclause}\
 into temp tmp_rs\
 from ${dbtest.fromclause}\
+<#if dbtest.whereclause !=''>\
 where ${dbtest.whereclause}\
+</#if>\
+<#if dbtest.groupbyclause !=''>\
+group by ${dbtest.whereclause}\
+</#if>\
+<#if dbtest.orderbyclause !=''>\
+order by ${dbtest.orderbyclause}\
+</#if>\
 ;\
 \
 \
@@ -58,14 +65,12 @@ where ${dbtest.whereclause}\
 <#if dbtest_assertion.dbtest_id==dbtest.tid>\
 \
 insert into qa_dbtest_result(\
-dbtest_id,\
 dbtest_assertion_id,\
 execution_start  , \
 execution_end  , \
 result_code  , \
 result_value )\
 select \
-<<DB-Test>>,\
 ${dbtest_assertion.tid},\
 A.beginn,\
 now(),\
@@ -91,15 +96,16 @@ drop table tmp_anfang;\
 \
 \
 \
-select R.dbtest_id,\
+select T.tid as dbtest_id,\
       T.name,\
       R.execution_start,\
       R.execution_end,\
       case when R.result_code=0 then 'Erfolg' else 'Warnung' end as result_str,\
       R.result_value,\
       '37100&DB-Test=' || T.tid as nexttable\
-FROM qa_dbtest T, qa_dbtest_result R\
+FROM qa_dbtest T, qa_dbtest_result R,qa_dbtest_assertion A\
-where T.tid=R.dbtest_id\
+where A.tid=R.dbtest_assertion_id\
+and T.tid=A.dbtest_id\
 and T.tid=<<DB-Test>>\
 and R.tid in (select qa_dbtest_result_id from tmp_qa_dbtest_result_id)\
 order by 4 desc;^XIL List\