diff --git a/src-modules/module/qa/conf/qa.xml b/src-modules/module/qa/conf/qa.xml index b63ef1a..cfe41bf 100644 --- a/src-modules/module/qa/conf/qa.xml +++ b/src-modules/module/qa/conf/qa.xml @@ -418,6 +418,7 @@ notnull="false"> + @@ -442,6 +443,9 @@ notnull="false"> formuliert als SQL-from-Ausdruck +formuliert als SQL-select-Ausdruck +formuliert als SQL-group by -Ausdruck +formuliert als SQL-order by-Ausdruck @@ -464,7 +468,7 @@ notnull="false"> - + - + formuliert als SQL-where-Ausdruck - + + @@ -523,6 +528,7 @@ notnull="false"> + @@ -572,6 +578,7 @@ notnull="false">
+ @@ -579,7 +586,16 @@ notnull="false"> - + + + + +qa_dbtest_result +tid +1 +pk_qa_dbtest_result + + @@ -783,10 +799,10 @@ format="%s"> - - + - + + + + - - - - - - + + - - - -
-In diesem Formular können Sie Felder Ausgabetabellen verwalten. Im Details-Formular können Sie Tabellen und Felder zuordnen. - - - - - - - -
-In diesem Formular können Sie Felder für Ausgabetabellen für Datenbanktests verwalten. - -tid - - - - - - - - -
+ diff --git a/src-modules/module/qa/masken/37100_maskeninfo.unl b/src-modules/module/qa/masken/37100_maskeninfo.unl index 9c65a7e..41f88aa 100644 --- a/src-modules/module/qa/masken/37100_maskeninfo.unl +++ b/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(<>) */)"\ target="tmp_qa_dbtest">\ @@ -42,7 +43,11 @@ target="tmp_qa_dbtest">\ \ <@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\ diff --git a/src-modules/module/qa/masken/37120_maskeninfo.unl b/src-modules/module/qa/masken/37120_maskeninfo.unl index 2c2f187..cab85ec 100644 --- a/src-modules/module/qa/masken/37120_maskeninfo.unl +++ b/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=<> */\ +/* and D.resultset_id=<> */\ /* and D.name like '%<>%' */\ /* and D.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<> )*/\ /* and D.systeminfo_id=<> */\ /* and D.active=<> */\ ;\ \ -update tmp_qa_dbtest set resultset_id=R.resultset_id,\ -resultset_field_str=R.name\ -from qa_resultset_field R\ -where R.tid=tmp_qa_dbtest.resultset_field_id;\ +\ +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 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))\ -from qa_dbtest_result R\ -where R.dbtest_id=tmp_qa_dbtest.tid);\ +update tmp_qa_dbtest set letzter_lauf=(select max(date(R.execution_start))\ +from qa_dbtest_result R, qa_dbtest_assertion A\ +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\ diff --git a/src-modules/module/qa/masken/37140_maskeninfo.unl b/src-modules/module/qa/masken/37140_maskeninfo.unl index 3078fb3..0b957d7 100644 --- a/src-modules/module/qa/masken/37140_maskeninfo.unl +++ b/src-modules/module/qa/masken/37140_maskeninfo.unl @@ -5,18 +5,17 @@ \ \ select \ -F.uniquename as resultset_field_uniquename,\ -F.name as resultset_field_name,\ +R.fieldclause,\ 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\ -and R.tid=F.resultset_id\ +T.resultset_id=R.tid\ and T.tid=<>\ ;\ \ @@ -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 dbtest.groupbyclause !=''>\ +group by ${dbtest.whereclause}\ +\ +<#if dbtest.orderbyclause !=''>\ +order by ${dbtest.orderbyclause}\ +\ ;\ \ \ @@ -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 \ -<>,\ ${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\ -where T.tid=R.dbtest_id\ +FROM qa_dbtest T, qa_dbtest_result R,qa_dbtest_assertion A\ +where A.tid=R.dbtest_assertion_id\ +and T.tid=A.dbtest_id\ and T.tid=<>\ and R.tid in (select qa_dbtest_result_id from tmp_qa_dbtest_result_id)\ order by 4 desc;^XIL List\