From 67e60b9cd9a90394280974b3c47b202d62e2b888 Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Tue, 19 Apr 2022 10:49:12 +0200
Subject: [PATCH] Masken DB-Test angelegt, Build korrigiert

---
 build.xml                                     |   2 +-
 src-modules/module/qa/conf/qa.xml             | 218 ++++++++++++++----
 .../module/qa/masken/37100_felderinfo.unl     |   2 +
 .../qa/masken/37100_masken_felder_bez.unl     |   1 +
 .../module/qa/masken/37100_maskeninfo.unl     |  22 +-
 .../module/qa/masken/37120_felderinfo.unl     |   2 +-
 .../module/qa/masken/37120_maskeninfo.unl     |  24 +-
 .../module/qa/masken/37140_felderinfo.unl     |   2 +
 .../qa/masken/37140_maske_system_bez.unl      |   1 +
 .../qa/masken/37140_masken_felder_bez.unl     |   2 +
 .../module/qa/masken/37140_maskeninfo.unl     | 117 ++++++++++
 .../qa/masken/37140_sachgeb_maske_bez.unl     |   1 +
 12 files changed, 325 insertions(+), 69 deletions(-)
 create mode 100644 src-modules/module/qa/masken/37140_felderinfo.unl
 create mode 100644 src-modules/module/qa/masken/37140_maske_system_bez.unl
 create mode 100644 src-modules/module/qa/masken/37140_masken_felder_bez.unl
 create mode 100644 src-modules/module/qa/masken/37140_maskeninfo.unl
 create mode 100644 src-modules/module/qa/masken/37140_sachgeb_maske_bez.unl

diff --git a/build.xml b/build.xml
index bffc4a2..e9fa700 100644
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,7 @@ ant  -DMODULE_PATH=$QA_PFAD -DWEBAPP_DIR=$WEBAPP -DMODULE=qa dist
 			<!--<property name="basedir" value="${MODULE_PATH}/../../conf/" />-->
 			<property name="MODULE" value="${MODULE}" />
 			<property name="DATABASE" value="POSTGRES" />
-			<property name="WEBAPP_EXT_MODULE" value="${MODULE_PATH}/../../../webserver/tomcat/webapps/superx" />
+			<property name="WEBAPP_EXT_MODULE" value="${WEBAPP}" /><!--${MODULE_PATH}/../../../webserver/tomcat/webapps/superx-->
 			<property name="WEBAPP" value="${MODULE_PATH}/../../../webserver/tomcat/webapps/superx" />
 			<property name="SUPERX_BASE" value="${WEBAPP}/WEB-INF" />
 			<fileset dir="${MODULE_PATH}/../../conf" includes="module_scripts_create_ant.xml" />
diff --git a/src-modules/module/qa/conf/qa.xml b/src-modules/module/qa/conf/qa.xml
index 209dff5..e916eb6 100644
--- a/src-modules/module/qa/conf/qa.xml
+++ b/src-modules/module/qa/conf/qa.xml
@@ -409,15 +409,15 @@ notnull="false">
  </rs></primaryKeys>
 <!-- TODO indices-->
 </table>
-<table name="qa_project" thema="Qualitätssicherung" typ="Schlüsseltabelle">
-<columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" />
-<column name="uniquename" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="systeminfo_id" type ="INTEGER" size ="10" default ="" notnull ="false" />
-<column name="sachgebiete_id" type ="INTEGER" size ="10" default ="" notnull ="false" />
-<column name="active" type ="SMALLINT" size ="5" default ="" notnull ="false" />
-<column name="created_at" type ="DATE" size ="13" default ="" notnull ="false" />
-<column name="created_from" type ="INTEGER" size ="10" default ="" notnull ="false" />
+<table name="qa_project" caption="Test-Projekt" 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"/>
+<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="sachgebiete_id" type ="INTEGER" size ="10" default ="" notnull ="false" description="Sachgebiet"/>
+<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"/>
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@@ -436,14 +436,19 @@ notnull="false">
 </rs></privileges>
 </table>
 
-<table name="qa_resultset" thema="Qualitätssicherung" typ="Schlüsseltabelle">
-<columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" />
-<column name="uniquename" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="systeminfo_id" type ="INTEGER" size ="10" default ="" notnull ="false" />
-<column name="fromclause" type ="TEXT" size ="32255" default ="" notnull ="false" />
+<table name="qa_resultset" caption="Datenbanktest Ergebnistabelle" 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 ="true" description="Komponente"/>
+<column name="fromclause" type ="TEXT" size ="32255" default ="" notnull ="false" description="Quelltabellen"><comment>formuliert als SQL-from-Ausdruck</comment></column>
 </columns>
-<indexes></indexes>
+<indexes>
+<index name="ix_qa_resultset_id" type="unique">
+<index-column name="uniquename"/>
+<index-column name="systeminfo_id"/>
+</index>
+</indexes>
 <primaryKeys><rs>
 <row>
 <fld name='table_cat'></fld>
@@ -460,12 +465,12 @@ notnull="false">
 </rs></privileges>
 </table>
 
-<table name="qa_resultset_field" thema="Qualitätssicherung" typ="Schlüsseltabelle">
-<columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" />
-<column name="uniquename" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="fieldclause" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="resultset_id" type ="INTEGER" size ="10" default ="" notnull ="false" />
+<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"/>
+<column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Name"/>
+<column name="fieldclause" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Felder"><comment>formuliert als SQL-select-Ausdruck</comment></column>
+<column name="resultset_id" type ="INTEGER" size ="10" default ="" notnull ="false" isKey="true" description="Ergebnistabelle"/>
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@@ -484,16 +489,21 @@ notnull="false">
 </rs></privileges>
 </table>
 
-<table name="qa_dbtest" thema="Qualitätssicherung" typ="Schlüsseltabelle">
-<columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" />
-<column name="uniquename" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="project_id" type ="INTEGER" size ="10" default ="" notnull ="false" currentlyUsed="false" />
-<column name="resultset_field_id" type ="INTEGER" size ="10" default ="" notnull ="false" />
-<column name="whereclause" type ="TEXT" size ="2147483647" default ="" notnull ="false" />
-<column name="active" type ="SMALLINT" size ="5" default ="" notnull ="false" />
+<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 ="true" description="Komponente"/>
+<column name="resultset_field_id" type ="INTEGER" size ="10" default ="" notnull ="false" 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"/>
 </columns>
-<indexes></indexes>
+<indexes>
+<index name="ix_qa_dbtest_id" type="unique">
+<index-column name="uniquename"/>
+<index-column name="systeminfo_id"/>
+</index>
+</indexes>
 <primaryKeys><rs>
 <row>
 <fld name='table_cat'></fld>
@@ -509,14 +519,39 @@ notnull="false">
 <privileges><rs>
 </rs></privileges>
 </table>
-
-<table name="qa_dbtest_assertion" thema="Qualitätssicherung" typ="Schlüsseltabelle">
-<columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" />
-<column name="dbtest_id" type ="INTEGER" size ="10" default ="" notnull ="false" />
-<column name="rownr" type ="INTEGER" size ="10" default ="" notnull ="false" />
-<column name="def_col_caption" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="def_col_name" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="def_col_value" type ="VARCHAR" size ="255" default ="" notnull ="false" />
+<table name="qa_dbtest2project" caption="Datenbank-Test zu Projekt" thema="Qualitätssicherung" typ="Schlüsseltabelle">
+<columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/>
+<column name="dbtest_id" type ="INTEGER" size ="255" default ="" notnull ="true" description="DB-Test"/>
+<column name="project_id" type ="INTEGER" size ="10" default ="" notnull ="true" description="Projekt"/>
+</columns>
+<indexes>
+<index name="ix_qa_dbtest2project_id" type="unique">
+<index-column name="dbtest_id"/>
+<index-column name="project_id"/>
+</index>
+</indexes>
+<primaryKeys><rs>
+<row>
+<fld name='table_cat'></fld>
+<fld name='table_schem'></fld>
+<fld name='table_name'>qa_dbtest2project</fld>
+<fld name='column_name'>tid</fld>
+<fld name='key_seq'>1</fld>
+<fld name='pk_name'>pk_qa_dbtest2project</fld>
+</row>
+</rs></primaryKeys>
+<foreignKeys></foreignKeys>
+<importedKeys></importedKeys>
+<privileges><rs>
+</rs></privileges>
+</table>
+<table name="qa_dbtest_assertion" caption="Datenbank Test Erwartung" thema="Qualitätssicherung" typ="Schlüsseltabelle">
+<columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/>
+<column name="dbtest_id" type ="INTEGER" size ="10" default ="" notnull ="false" description="Datenbank-Test" isKey="true"/>
+<column name="rownr" type ="INTEGER" size ="10" default ="" notnull ="false" description="Zeilennr."/>
+<column name="def_col_caption" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Spalte Beschriftung"/>
+<column name="def_col_name" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Spalte Name"/>
+<column name="def_col_value" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Zellwert"/>
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@@ -535,13 +570,13 @@ notnull="false">
 </rs></privileges>
 </table>
 
-<table name="qa_dbtest_result" thema="Qualitätssicherung" typ="Datentabelle">
+<table name="qa_dbtest_result" caption="Datenbank-Testergebnis" thema="Qualitätssicherung" typ="Datentabelle">
 <columns>
-<column name="dbtest_assertion_id" type ="INTEGER" size ="10" default ="" notnull ="false" />
-<column name="execution_start" type ="DATETIME" size ="35" default ="" notnull ="false" />
-<column name="execution_end" type ="DATETIME" size ="35" default ="" notnull ="false" />
-<column name="result_code" type ="SMALLINT" size ="5" default ="" notnull ="false" />
-<column name="result_value" type ="VARCHAR" size ="255" default ="" notnull ="false" />
+<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"/>
+<column name="result_code" type ="SMALLINT" size ="5" default ="" notnull ="false" description="Ausführung Ergebniscode"><comment>0=Erfolg</comment></column>
+<column name="result_value" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Ergebnis"/>
 </columns>
 <indexes></indexes>
 
@@ -620,6 +655,12 @@ parent="Qualitätssicherung">Abfragen zur Administration</thema>
 					<path>$QA_PFAD/masken</path>
 				</src>
 			</maske>
+<maske tid="37140" name="Datenbank-Test ausführen" thema="Administration Qualitätssicherung">
+				<description>Datenbank-Tests ausführen</description>
+				<src>
+					<path>$QA_PFAD/masken</path>
+				</src>
+			</maske>
 </masken>
 <data-integrity>
 <!-- qa_mask_execution -->
@@ -708,10 +749,15 @@ delete="FALSE" displayType="select" visibleFields="name"
 format="%s">
 <relation-column from="tid" to="systeminfo_id" />
 </relation>
-<relation from="sachgebiete_id" to="qa_project"
+<relation from="sachgebiete" to="qa_project"
 delete="FALSE" displayType="select" visibleFields="name"
 format="%s">
-<relation-column from="tid" to="sachgebiete_id_id" />
+<relation-column from="tid" to="sachgebiete_id" />
+</relation>
+<relation from="userinfo" to="qa_project"
+delete="FALSE" displayType="select" visibleFields="benutzer"
+format="%s">
+<relation-column from="tid" to="created_from" />
 </relation>
 <!--qa_resultset-->
 <relation from="systeminfo" to="qa_resultset"
@@ -932,7 +978,7 @@ mode="update_insert_delete_copy">
  helpfile=""
 
 maxRows="1"
-mode="update_insert_delete_copy">
+mode="full">
 <description>In diesem Formular können Sie Datenbanktests  verwalten.</description>
 <filters>
 <filter mandatory="true" type="equals">tid</filter>
@@ -943,6 +989,21 @@ mode="update_insert_delete_copy">
 <customfield name="uniquename" visibleSize="50" nullFieldValue="" />
 <customfield name="resultset_field_id" visibleSize="50" nullFieldValue="" />
 <customfield name="whereclause" visibleSize="80" nullFieldValue="" />
+<!--<customfield name="Feld-Vorbelegung" type="include" path="/edit/qa/qa_mask_execution_felderinfo_edit.inc"/>-->
+<!--<customfield name="Erwartetes Ergebnis" type="include" path="/edit/qa/qa_dbtest_assertion_edit.inc"/>-->
+<customfield name="Erwartetes Ergebnis" type="subform"  multipart="false" autoUpdate="false" 
+ maxRows="*" table="qa_dbtest_assertion" parentField="tid" childField="dbtest_id"
+ orderBy="" allowNew="true"
+ mode="full">
+ <field-selection  complete="false"  />
+<customfield name="dbtest_id" type="hidden" overrideValue="tid" />
+<customfield name="rownr" nullFieldValue=""  visibleSize="5" />
+<customfield name="def_col_name" nullFieldValue=""  visibleSize="10" />
+<customfield name="def_col_caption" nullFieldValue=""  visibleSize="20" />
+<customfield name="def_col_value" nullFieldValue=""  visibleSize="5" />
+
+  </customfield>
+
 <customfield name="active" visibleSize="10" nullFieldValue="" />
 <!--<customfield name="stylesheet_id" visibleSize="50" nullFieldValue="" />
 <customfield name="contenttype" visibleSize="50" nullFieldValue="" />
@@ -960,7 +1021,7 @@ mode="update_insert_delete_copy">
  helpfile=""
  maxRows="*"
  mode="full">
-<description>In diesem Formular können Sie Ausgabetabellen verwalten. Im Details-Formular können Sie Tabellen und Felder zuordnen.</description>
+<description>In diesem Formular können Sie Ergebnistabellen verwalten. Im Details-Formular können Sie Tabellen und Felder zuordnen.</description>
 <filters>
 </filters>
 <field-selection  complete="false"  />
@@ -981,7 +1042,7 @@ mode="update_insert_delete_copy">
 
 maxRows="1"
 mode="full">
-<description>In diesem Formular können Sie Ausgabetabellen für Datenbanktests  verwalten.</description>
+<description>In diesem Formular können Sie Ergebnistabellen für Datenbanktests  verwalten.</description>
 <filters>
 <filter mandatory="true" type="equals">tid</filter>
 </filters>
@@ -992,7 +1053,17 @@ mode="full">
 <customfield name="uniquename" visibleSize="50" nullFieldValue="" />
 <customfield name="active" visibleSize="10" nullFieldValue="" />
 <customfield name="fromclause" visibleSize="10" nullFieldValue="" />
+<customfield name="Felder" type="subform"  multipart="false" autoUpdate="false" 
+ maxRows="*" table="qa_resultset_field" parentField="tid" childField="resultset_id"
+ 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"
@@ -1037,6 +1108,53 @@ mode="full">
 <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"
+ followUp=""
+ caption="Projekte verwalten"
+ orderBy="name"
+ gotoHt=""
+ helpfile=""
+ maxRows="*"
+ mode="full">
+<description>In diesem Formular können Sie Projekte verwalten.</description>
+<filters>
+</filters>
+<field-selection  complete="false"  />
+<customfield name="tid" nullFieldValue="" />
+<customfield name="name" nullFieldValue="" visibleSize="30" />
+<customfield name="uniquename" nullFieldValue="" visibleSize="20" />
+<customfield name="systeminfo_id" nullFieldValue="" visibleSize="30" />
+<customfield name="active" nullFieldValue="" pattern="" visibleSize="10" />
+<customfield type="link" name="Details" path="/superx/edit/qa/qa_project_edit.jsp" linkid="tid"/>
+</form>
+<form name="qa_project_edit"
+ table="qa_project"
+ path="/edit/qa/qa_project_edit.jsp"
+ followUp=""
+ caption="Projekte verwalten"
+ orderBy="name"
+ gotoHt=""
+ helpfile=""
+
+maxRows="1"
+mode="full">
+<description>In diesem Formular können Sie Projekte für Datenbanktests  verwalten.</description>
+<filters>
+<filter mandatory="true" type="equals">tid</filter>
+</filters>
+<field-selection complete="false" />
+<customfield name="tid"  />
+<customfield name="systeminfo_id" visibleSize="50" nullFieldValue="" />
+<customfield name="sachgebiete_id" visibleSize="50" nullFieldValue="" />
+<customfield name="name" visibleSize="50" nullFieldValue="" />
+<customfield name="uniquename" visibleSize="50" nullFieldValue="" />
+<customfield name="active" visibleSize="10" nullFieldValue="" />
+<customfield name="created_at" visibleSize="10" nullFieldValue="" />
+<customfield name="created_from" visibleSize="10" nullFieldValue="" />
+
 </form>
 
 </dbforms>
diff --git a/src-modules/module/qa/masken/37100_felderinfo.unl b/src-modules/module/qa/masken/37100_felderinfo.unl
index 0b3b35c..45f6981 100644
--- a/src-modules/module/qa/masken/37100_felderinfo.unl
+++ b/src-modules/module/qa/masken/37100_felderinfo.unl
@@ -5,3 +5,5 @@
 37104^Komponente^10^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from systeminfo order by 2;^^^
 37105^Nur aktive^30^0^0^150^80^1^integer^200^0^1^<<SQL>> select 1,'Ja' from xdummy union select 0,'nein' from xdummy order by 1 desc;^^<<SQL>>select 1,'Ja' from xdummy^
 37106^Ab Datum^40^0^0^150^80^1^date^200^0^0^ ^^<<SQL>> select today()-3 from  xdummy^
+37107^DB-Test^100^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from qa_dbtest where 1=1 \
+/* and project_id=<<Projekt>> */ order by 2^ ^ ^
diff --git a/src-modules/module/qa/masken/37100_masken_felder_bez.unl b/src-modules/module/qa/masken/37100_masken_felder_bez.unl
index ae6e247..e25cd7e 100644
--- a/src-modules/module/qa/masken/37100_masken_felder_bez.unl
+++ b/src-modules/module/qa/masken/37100_masken_felder_bez.unl
@@ -5,3 +5,4 @@
 37100^37104^
 37100^37105^
 37100^37106^
+37100^37107^
diff --git a/src-modules/module/qa/masken/37100_maskeninfo.unl b/src-modules/module/qa/masken/37100_maskeninfo.unl
index 038f81c..97bef67 100644
--- a/src-modules/module/qa/masken/37100_maskeninfo.unl
+++ b/src-modules/module/qa/masken/37100_maskeninfo.unl
@@ -40,20 +40,24 @@ target="tmp_qa_dbtest">\
  /* and E.userinfo_id=<<Benutzer/in>> */\
  /* and P.systeminfo_id=<<Komponente>> */\
  /* and T.name ilike '%<<Testfall-Name (Stichwort)>>%' */\
+ /* and T.tid=<<DB-Test>> */\
  </@selectintotmp>\
  <@informixnolog/>;\
 \
- \
-update tmp_qa_dbtest set result_status=2,\
-result_status_str='Fehler'\
-where result_code!=0;\
 \
-update tmp_qa_dbtest set result_status=0,\
-result_status_str='Erfolg'\
-where result_code=0\
-;\
+update tmp_qa_dbtest set --result_status=1,\
+result_status_str='Warnung'\
+ where result_code=1;\
+update tmp_qa_dbtest set result_status=2,\
+ result_status_str='Fehler'\
+ where result_code is null;\
+-- \
+update tmp_qa_dbtest set \
+ result_status_str='Erfolg'\
+ where result_code=0\
+ ;\
 \
-/* delete from tmp_qa_dbtest where result_status!= <<Ausführungs-Status>> ; */\
+/* delete from tmp_qa_dbtest where result_code!= <<Ausführungs-Status>> ; */\
 \
 \
 update tmp_qa_dbtest set systeminfo_id_str=(select name from systeminfo S\
diff --git a/src-modules/module/qa/masken/37120_felderinfo.unl b/src-modules/module/qa/masken/37120_felderinfo.unl
index da348ff..b3308b0 100644
--- a/src-modules/module/qa/masken/37120_felderinfo.unl
+++ b/src-modules/module/qa/masken/37120_felderinfo.unl
@@ -3,4 +3,4 @@
 37122^Ausgabetabellen^100^0^0^150^300^1^char^30^0^18^^^<<SQL>> select '../edit/qa/qa_resultset_list.jsp' from xdummy;^
 37123^Name^20^0^0^150^150^1^sql^50^0^0^^^^
 37124^Komponente^30^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from systeminfo order by 2;^hidden^^
-37125^Felder in Ausgabetabellen^110^0^0^150^300^1^char^30^0^18^^^<<SQL>> select '../edit/qa/qa_resultset_field_list.jsp' from xdummy;^
+37125^Projekte^200^0^0^150^300^1^char^30^0^18^^^<<SQL>> select '../edit/qa/qa_project_list.jsp' from xdummy;^
diff --git a/src-modules/module/qa/masken/37120_maskeninfo.unl b/src-modules/module/qa/masken/37120_maskeninfo.unl
index ab7f42d..eab5abe 100644
--- a/src-modules/module/qa/masken/37120_maskeninfo.unl
+++ b/src-modules/module/qa/masken/37120_maskeninfo.unl
@@ -14,7 +14,8 @@ resultset_field_str varchar(255) , \
 whereclause TEXT , \
 active SMALLINT , \
 letzter_lauf date,\
-nextedit varchar(255)\
+nextedit varchar(255),\
+nexttable varchar(255)\
 );\
 insert into tmp_qa_dbtest (ord,\
  tid,\
@@ -24,7 +25,8 @@ insert into tmp_qa_dbtest (ord,\
        resultset_field_id,\
        whereclause,\
        active,\
-       nextedit) \
+       nextedit,\
+       nexttable) \
 select 1 as ord,\
  tid,\
        uniquename,\
@@ -33,7 +35,8 @@ select 1 as ord,\
        resultset_field_id,\
        whereclause,\
        active,\
-       ('../edit/qa/qa_dbtest_edit.jsp|tid=' || D.tid)::varchar(255)\
+       ('../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 T.resultset_field_id=<<Ausgabetabelle>> */\
@@ -51,8 +54,8 @@ 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_mask_execution_result R\
-where R.mask_execution_id=tmp_qa_dbtest.tid);\
+from qa_dbtest_result R\
+where R.dbtest_id=tmp_qa_dbtest.tid);\
 \
 \
 -- update tmp_qa_dbtest set nextedit=trim(nextedit) || trim('&rs=' || \
@@ -84,6 +87,7 @@ resultset_field_str,\
 active,\
 letzter_lauf,\
 nextedit,\
+nexttable,\
 ord"\
 source="tmp_qa_dbtest"\
 target="tmp_qa_dbtest2">\
@@ -100,7 +104,8 @@ resultset_str,\
 resultset_field_str,\
 active,\
 letzter_lauf,\
-nextedit \
+nextedit ,\
+nexttable\
 from tmp_qa_dbtest2\
 ;^XIL List\
    drop_and_delete movable_columns sizable_columns horizontal_scrolling\
@@ -112,10 +117,10 @@ Column CID=0 heading_text="Name" center_heading\
 Column CID=0 heading_text="Schlüssel" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=50 text_size=100\
-Column CID=1 heading_text="Ausgabetabelle" 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="Ausgabefeld" center_heading\
+Column CID=1 heading_text="Ergebnisfeld" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=150 text_size=200\
 Column CID=1 heading_text="Aktiv" center_heading\
@@ -127,4 +132,7 @@ Column CID=1 heading_text="Letzter Lauf" center_heading\
 Column CID=1 heading_text="Bearbeiten" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=5 text_size=200\
+Column CID=1 heading_text="Ausführen" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=5 text_size=200\
 @@@^^^Verwaltung von Datenbank Tests^drop table tmp_qa_dbtest2;^^1^440^360^0^1^^
diff --git a/src-modules/module/qa/masken/37140_felderinfo.unl b/src-modules/module/qa/masken/37140_felderinfo.unl
new file mode 100644
index 0000000..413b058
--- /dev/null
+++ b/src-modules/module/qa/masken/37140_felderinfo.unl
@@ -0,0 +1,2 @@
+37140^DB-Test^50^0^0^150^200^1^integer^200^1^1^<<SQL>> select tid,name from qa_dbtest order by 2^ ^ ^
+37144^Komponente^1^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from systeminfo order by 2;^hidden^ ^
diff --git a/src-modules/module/qa/masken/37140_maske_system_bez.unl b/src-modules/module/qa/masken/37140_maske_system_bez.unl
new file mode 100644
index 0000000..58e7a89
--- /dev/null
+++ b/src-modules/module/qa/masken/37140_maske_system_bez.unl
@@ -0,0 +1 @@
+37140^260^
diff --git a/src-modules/module/qa/masken/37140_masken_felder_bez.unl b/src-modules/module/qa/masken/37140_masken_felder_bez.unl
new file mode 100644
index 0000000..16766c8
--- /dev/null
+++ b/src-modules/module/qa/masken/37140_masken_felder_bez.unl
@@ -0,0 +1,2 @@
+37140^37140^
+37140^37144^
diff --git a/src-modules/module/qa/masken/37140_maskeninfo.unl b/src-modules/module/qa/masken/37140_maskeninfo.unl
new file mode 100644
index 0000000..df9b3c6
--- /dev/null
+++ b/src-modules/module/qa/masken/37140_maskeninfo.unl
@@ -0,0 +1,117 @@
+37140^Datenbank-Test ausführen^--Freemarker Template\
+<#include "SQL_lingua_franca"/>\
+<#include "SuperX_general"/>\
+<sqlvars>\
+\
+<sqlvar name="qa_dbtests" type='hashsequence'>\
+select \
+F.uniquename  as resultset_field_uniquename,\
+F.name as resultset_field_name,\
+R.fromclause,\
+F.fieldclause,\
+T.tid,\
+T.uniquename,\
+T.name,\
+T.whereclause\
+FROM qa_dbtest T, qa_resultset R, qa_resultset_field F\
+where \
+T.resultset_field_id=F.tid\
+and R.tid=F.resultset_id\
+and T.tid=<<DB-Test>>\
+;\
+\
+</sqlvar>\
+<sqlvar name="qa_dbtest_assertions" type='hashsequence'>\
+select \
+A.dbtest_id,\
+A.tid,\
+A.rownr ,\
+A.def_col_caption,\
+A.def_col_name,\
+A.def_col_value\
+FROM qa_dbtest_assertion A\
+where A.dbtest_id=<<DB-Test>>\
+ ;\
+\
+</sqlvar>\
+</sqlvars>\
+\
+<#foreach dbtest in qa_dbtests>\
+\
+\
+select now() as beginn\
+into temp tmp_anfang;\
+\
+select ${dbtest.fieldclause}\
+into temp tmp_rs\
+from ${dbtest.fromclause}\
+where ${dbtest.whereclause}\
+;\
+\
+\
+<#foreach dbtest_assertion in qa_dbtest_assertions>\
+<#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(),\
+case when T.${dbtest_assertion.def_col_name}='${dbtest_assertion.def_col_value}' then 0\
+else 1 end as result_code,\
+T.${dbtest_assertion.def_col_name} as result_value\
+from tmp_anfang A left outer join tmp_rs T\
+on (1=${dbtest_assertion.rownr})\
+;\
+\
+</#if>\
+</#foreach>\
+drop table tmp_rs;\
+drop table tmp_anfang;\
+</#foreach>\
+\
+\
+\
+select R.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\
+and T.tid=<<DB-Test>>\
+order by 4 desc;^XIL List\
+   drop_and_delete movable_columns sizable_columns horizontal_scrolling\
+   white_space_color=COLOR_WHITE fixed_columns=2\
+   min_heading_height=35\
+Column CID=0 heading_text="DB-Test ID" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=50 text_size=100\
+Column CID=0 heading_text="DB-Test Name" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=50 text_size=100\
+Column CID=1 heading_text="DB-Test Start" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=150 text_size=200\
+Column CID=1 heading_text="DB-Test Ende" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=150 text_size=200\
+Column CID=1 heading_text="DB-Test Ergebnis" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=5 text_size=200\
+Column CID=1 heading_text="DB-Test Ergebnis \\n Wert" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=5 text_size=200\
+Column CID=1 heading_text="DB-Test \\nProtokoll" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=9 text_size=200\
+@@@^^^Einen Datenbank-Test ausführen^ ^^1^440^360^0^1^^
diff --git a/src-modules/module/qa/masken/37140_sachgeb_maske_bez.unl b/src-modules/module/qa/masken/37140_sachgeb_maske_bez.unl
new file mode 100644
index 0000000..a494be8
--- /dev/null
+++ b/src-modules/module/qa/masken/37140_sachgeb_maske_bez.unl
@@ -0,0 +1 @@
+261^37140^