diff --git a/scripts/groovy/groovyJobsStrip.x b/scripts/groovy/groovyJobsStrip.x new file mode 100755 index 0000000..5186cee --- /dev/null +++ b/scripts/groovy/groovyJobsStrip.x @@ -0,0 +1,10 @@ +#!/bin/bash +#bitte im Verzeichnis des Scripts ausführen +mkdir -p tmp_testfall_import +groovy ~/git/superx/scripts/groovy/copy_kettlejob.groovy --strip-connections ../../src-modules/module/qa/etl/testfall_import/testfall_import.kjb tmp_testfall_import +groovy ~/git/superx/scripts/groovy/copy_kettlejob.groovy --strip-connections ../../src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.kjb tmp_testfall_import +groovy ~/git/superx/scripts/groovy/copy_kettlejob.groovy --strip-connections ../../src-modules/module/qa/etl/testfall_import/testfall_import_xml.kjb tmp_testfall_import + +#Wenn man die Entwicklung beendet hat, kann man diese Dateien ins richtige git Verzeichnis kopieren und committen: +#cp -a tmp_testfall_import/* ../../src-modules/module/qa/etl/testfall_import + diff --git a/src-modules/module/qa/conf/qa.xml b/src-modules/module/qa/conf/qa.xml index 83f9b84..8a762d3 100644 --- a/src-modules/module/qa/conf/qa.xml +++ b/src-modules/module/qa/conf/qa.xml @@ -585,7 +585,8 @@ notnull="false"> - +Standardmäßig vom Typ STRING, wenn nicht füllen Sie "Funktion" +z.B. "decval", um Zahlen mit Nachkommastellen zu erhalten, oder "val", um INTEGER zu erhalten. @@ -1089,7 +1090,7 @@ mode="full"> - + diff --git a/src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql b/src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql index e219420..8189514 100644 --- a/src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql +++ b/src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql @@ -28,7 +28,8 @@ A.tid, A.rownr , A.def_col_caption, A.def_col_name, -A.def_col_value +A.def_col_value, +A.def_col_function FROM qa_dbtest_assertion A where A.dbtest_id in (select T.tid from qa_dbtest T where T.active=1) @@ -88,7 +89,13 @@ select ${dbtest_assertion.tid}, A.beginn, now(), -case when T.${dbtest_assertion.def_col_name}='${dbtest_assertion.def_col_value}' then 0 +case when T.${dbtest_assertion.def_col_name}= +<#if dbtest_assertion.def_col_function !=""> +${dbtest_assertion.def_col_function}('${dbtest_assertion.def_col_value}') +<#else> +'${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 diff --git a/src-modules/module/qa/etl/testfall_import/qa_importdatei_dbtest.xlsx b/src-modules/module/qa/etl/testfall_import/qa_importdatei_dbtest.xlsx new file mode 100644 index 0000000..d954d62 Binary files /dev/null and b/src-modules/module/qa/etl/testfall_import/qa_importdatei_dbtest.xlsx differ diff --git a/src-modules/module/qa/etl/testfall_import/testfall_import.kjb b/src-modules/module/qa/etl/testfall_import/testfall_import.kjb index 582a038..5ec553b 100644 --- a/src-modules/module/qa/etl/testfall_import/testfall_import.kjb +++ b/src-modules/module/qa/etl/testfall_import/testfall_import.kjb @@ -1,299 +1,325 @@ - + + testfall_import 0 - / + / - - 2020/02/23 21:14:53.737 + 2020/02/23 21:14:53.737 - - 2020/02/23 21:14:53.737 - - - PATH_TO_UPLOADFILE - file:///home/superx/git/Memtext-Interna/Projekte/duisburg-essen_uni/impl/db_module/qa/ects_testfaelle/qa_importdatei.xlsx - - - - userid - 803 - - - - - - - - - - - - - ID_JOB - Y - ID_JOB - - - CHANNEL_ID - Y - CHANNEL_ID - - - JOBNAME - Y - JOBNAME - - - STATUS - Y - STATUS - - - LINES_READ - Y - LINES_READ - - - LINES_WRITTEN - Y - LINES_WRITTEN - - - LINES_UPDATED - Y - LINES_UPDATED - - - LINES_INPUT - Y - LINES_INPUT - - - LINES_OUTPUT - Y - LINES_OUTPUT - - - LINES_REJECTED - Y - LINES_REJECTED - - - ERRORS - Y - ERRORS - - - STARTDATE - Y - STARTDATE - - - ENDDATE - Y - ENDDATE - - - LOGDATE - Y - LOGDATE - - - DEPDATE - Y - DEPDATE - - - REPLAYDATE - Y - REPLAYDATE - - - LOG_FIELD - Y - LOG_FIELD - - - EXECUTING_SERVER - N - EXECUTING_SERVER - - - EXECUTING_USER - N - EXECUTING_USER - - - START_JOB_ENTRY - N - START_JOB_ENTRY - - - CLIENT - N - CLIENT - - - - - -
- - - ID_BATCH - Y - ID_BATCH - - - CHANNEL_ID - Y - CHANNEL_ID - - - LOG_DATE - Y - LOG_DATE - - - JOBNAME - Y - TRANSNAME - - - JOBENTRYNAME - Y - STEPNAME - - - LINES_READ - Y - LINES_READ - - - LINES_WRITTEN - Y - LINES_WRITTEN - - - LINES_UPDATED - Y - LINES_UPDATED - - - LINES_INPUT - Y - LINES_INPUT - - - LINES_OUTPUT - Y - LINES_OUTPUT - - - LINES_REJECTED - Y - LINES_REJECTED - - - ERRORS - Y - ERRORS - - - RESULT - Y - RESULT - - - NR_RESULT_ROWS - Y - NR_RESULT_ROWS - - - NR_RESULT_FILES - Y - NR_RESULT_FILES - - - LOG_FIELD - N - LOG_FIELD - - - COPY_NR - N - COPY_NR - - - - - -
- - - ID_BATCH - Y - ID_BATCH - - - CHANNEL_ID - Y - CHANNEL_ID - - - LOG_DATE - Y - LOG_DATE - - - LOGGING_OBJECT_TYPE - Y - LOGGING_OBJECT_TYPE - - - OBJECT_NAME - Y - OBJECT_NAME - - - OBJECT_COPY - Y - OBJECT_COPY - - - REPOSITORY_DIRECTORY - Y - REPOSITORY_DIRECTORY - - - FILENAME - Y - FILENAME - - - OBJECT_ID - Y - OBJECT_ID - - - OBJECT_REVISION - Y - OBJECT_REVISION - - - PARENT_CHANNEL_ID - Y - PARENT_CHANNEL_ID - - - ROOT_CHANNEL_ID - Y - ROOT_CHANNEL_ID - - - N - + 2020/02/23 21:14:53.737 + + + PATH_TO_UPLOADFILE + file:///home/superx/git/Memtext-Interna/Projekte/duisburg-essen_uni/impl/db_module/qa/ects_testfaelle/qa_importdatei.xlsx + + + + userid + 803 + + + + + eduetl + localhost + POSTGRESQL + Native + eduetl_ude + 9998 + superx + Encrypted 2be98afc86aa7f292a20aa77fd0c3fa9e + superx_host_iso + + + + FORCE_IDENTIFIERS_TO_LOWERCASEN + FORCE_IDENTIFIERS_TO_UPPERCASEN + IS_CLUSTEREDN + PORT_NUMBER9998 + PRESERVE_RESERVED_WORD_CASEY + QUOTE_ALL_FIELDSN + SUPPORTS_BOOLEAN_DATA_TYPEY + SUPPORTS_TIMESTAMP_DATA_TYPEY + USE_POOLINGN + + + + + + + +
+ + + + + ID_JOB + Y + ID_JOB + + + CHANNEL_ID + Y + CHANNEL_ID + + + JOBNAME + Y + JOBNAME + + + STATUS + Y + STATUS + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + STARTDATE + Y + STARTDATE + + + ENDDATE + Y + ENDDATE + + + LOGDATE + Y + LOGDATE + + + DEPDATE + Y + DEPDATE + + + REPLAYDATE + Y + REPLAYDATE + + + LOG_FIELD + Y + LOG_FIELD + + + EXECUTING_SERVER + N + EXECUTING_SERVER + + + EXECUTING_USER + N + EXECUTING_USER + + + START_JOB_ENTRY + N + START_JOB_ENTRY + + + CLIENT + N + CLIENT + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + JOBNAME + Y + TRANSNAME + + + JOBENTRYNAME + Y + STEPNAME + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + RESULT + Y + RESULT + + + NR_RESULT_ROWS + Y + NR_RESULT_ROWS + + + NR_RESULT_FILES + Y + NR_RESULT_FILES + + + LOG_FIELD + N + LOG_FIELD + + + COPY_NR + N + COPY_NR + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + LOGGING_OBJECT_TYPE + Y + LOGGING_OBJECT_TYPE + + + OBJECT_NAME + Y + OBJECT_NAME + + + OBJECT_COPY + Y + OBJECT_COPY + + + REPOSITORY_DIRECTORY + Y + REPOSITORY_DIRECTORY + + + FILENAME + Y + FILENAME + + + OBJECT_ID + Y + OBJECT_ID + + + OBJECT_REVISION + Y + OBJECT_REVISION + + + PARENT_CHANNEL_ID + Y + PARENT_CHANNEL_ID + + + ROOT_CHANNEL_ID + Y + ROOT_CHANNEL_ID + + + N + START @@ -321,7 +347,7 @@ TRANS filename - ${Internal.Job.Filename.Directory}/testfall_import.ktr + ${Internal.Job.Filename.Directory}/testfall_import.ktr N N @@ -354,36 +380,7 @@ create table tmp_testfall_import SQL - -drop table if exists tmp_testfall_import_felder; -drop table if exists tmp_testfall_import_feldwerte; -drop table if exists tmp_testfall_import_erg; - -create table tmp_testfall_import_felder( -testfall_schluessel varchar(255), -feldnr integer, -feldname varchar(255) -); - -create table tmp_testfall_import_feldwerte( -systeminfo_id integer, -testfall_schluessel varchar(255), -maskeninfo_id integer, -feldnr integer, -feldwert varchar(255) -); - -create table tmp_testfall_import_erg( -testfall_schluessel varchar(255), -systeminfo_id integer, -mask_execution_id INTEGER , -rownr INTEGER , -colnr INTEGER , -result_value_min FLOAT , -result_value_max FLOAT , -is_active smallint default 1 not null, -caption varchar(255) -); + drop table if exists tmp_testfall_import_felder; drop table if exists tmp_testfall_import_feldwerte; drop table if exists tmp_testfall_import_erg; drop table if exists tmp_testfall_import_felder; create table tmp_testfall_import_felder( testfall_schluessel varchar(255), feldnr integer, feldname varchar(255) ); create table tmp_testfall_import_felder( testfall_schluessel varchar(255), feldnr integer, feldname varchar(255) ); create table tmp_testfall_import_feldwerte( systeminfo_id integer, testfall_schluessel varchar(255), maskeninfo_id integer, feldnr integer, feldwert varchar(255) ); create table tmp_testfall_import_erg( testfall_schluessel varchar(255), systeminfo_id integer, mask_execution_id INTEGER , rownr INTEGER , colnr INTEGER , result_value_min FLOAT , result_value_max FLOAT , is_active smallint default 1 not null, caption varchar(255) ); F F @@ -402,7 +399,7 @@ caption varchar(255) T T - ${Internal.Job.Filename.Directory}/testfall_import.sql + ${Internal.Job.Filename.Directory}/testfall_import.sql F eduetl N @@ -443,7 +440,7 @@ caption varchar(255) - TODO: Parameter userid aus Maskenfeld + TODO: Parameter userid aus Maskenfeld 472 234 273 diff --git a/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.kjb b/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.kjb new file mode 100644 index 0000000..4f392e7 --- /dev/null +++ b/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.kjb @@ -0,0 +1,508 @@ + + + testfall_import + + + + 0 + / + - + 2020/02/23 21:14:53.737 + - + 2020/02/23 21:14:53.737 + + + PATH_TO_UPLOADFILE + file:///home/superx/git/Memtext-Interna/Projekte/duisburg-essen_uni/impl/db_module/qa/ects_testfaelle/qa_importdatei_dbtest.xlsx + + + + userid + 803 + + + + + eduetl + localhost + POSTGRESQL + Native + eduetl_ude + 9998 + superx + Encrypted 2be98afc86aa7f292a20aa77fd0c3fa9e + superx_host_iso + + + + FORCE_IDENTIFIERS_TO_LOWERCASEN + FORCE_IDENTIFIERS_TO_UPPERCASEN + IS_CLUSTEREDN + PORT_NUMBER9998 + PRESERVE_RESERVED_WORD_CASEY + QUOTE_ALL_FIELDSN + SUPPORTS_BOOLEAN_DATA_TYPEY + SUPPORTS_TIMESTAMP_DATA_TYPEY + USE_POOLINGN + + + + + + + +
+ + + + + ID_JOB + Y + ID_JOB + + + CHANNEL_ID + Y + CHANNEL_ID + + + JOBNAME + Y + JOBNAME + + + STATUS + Y + STATUS + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + STARTDATE + Y + STARTDATE + + + ENDDATE + Y + ENDDATE + + + LOGDATE + Y + LOGDATE + + + DEPDATE + Y + DEPDATE + + + REPLAYDATE + Y + REPLAYDATE + + + LOG_FIELD + Y + LOG_FIELD + + + EXECUTING_SERVER + N + EXECUTING_SERVER + + + EXECUTING_USER + N + EXECUTING_USER + + + START_JOB_ENTRY + N + START_JOB_ENTRY + + + CLIENT + N + CLIENT + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + JOBNAME + Y + TRANSNAME + + + JOBENTRYNAME + Y + STEPNAME + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + RESULT + Y + RESULT + + + NR_RESULT_ROWS + Y + NR_RESULT_ROWS + + + NR_RESULT_FILES + Y + NR_RESULT_FILES + + + LOG_FIELD + N + LOG_FIELD + + + COPY_NR + N + COPY_NR + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + LOGGING_OBJECT_TYPE + Y + LOGGING_OBJECT_TYPE + + + OBJECT_NAME + Y + OBJECT_NAME + + + OBJECT_COPY + Y + OBJECT_COPY + + + REPOSITORY_DIRECTORY + Y + REPOSITORY_DIRECTORY + + + FILENAME + Y + FILENAME + + + OBJECT_ID + Y + OBJECT_ID + + + OBJECT_REVISION + Y + OBJECT_REVISION + + + PARENT_CHANNEL_ID + Y + PARENT_CHANNEL_ID + + + ROOT_CHANNEL_ID + Y + ROOT_CHANNEL_ID + + + N + + + + START + + SPECIAL + Y + N + N + 0 + 0 + 60 + 12 + 0 + 1 + 1 + N + Y + 0 + 112 + 80 + + + testfall_import_def + + TRANS + filename + + ${Internal.Job.Filename.Directory}/testfall_import_dbtest_def.ktr + + N + N + N + N + N + N + + + N + N + Basic + N + + N + Y + N + N + N + + Y + + N + Y + 0 + 448 + 80 + + + create table tmp_testfall_import + + SQL + drop table if exists tmp_qa_dbtest; drop table if exists tmp_qa_dbtest_assertion; drop TABLE if exists tmp_qa_resultset; drop table if exists tmp_testfall_import_felder; drop table if exists tmp_testfall_import_feldwerte; CREATE TABLE tmp_qa_dbtest ( tid serial NOT NULL, uniquename varchar(255) NOT NULL, name varchar(255), systeminfo_id integer, resultset_id integer , resultset_uniquename varchar(255), whereclause text, description text, active smallint DEFAULT 1 ); CREATE TABLE tmp_qa_dbtest_assertion ( tid serial NOT NULL, dbtest_id integer, dbtest_uniquename varchar(255), systeminfo_id integer, rownr integer, def_col_caption varchar(255), def_col_name varchar(255), def_col_value varchar(255) ); CREATE TABLE tmp_qa_resultset ( tid serial NOT NULL, uniquename varchar(255) NOT NULL, name varchar(255), systeminfo_id integer NOT NULL, fromclause text, fieldclause text, groupbyclause varchar(255), orderbyclause varchar(255) ); create table tmp_testfall_import_felder( feldnr integer, feldname varchar(255) ); create table tmp_testfall_import_erg( feldnr integer, feldname varchar(255) ); create table tmp_testfall_import_feldwerte( systeminfo_id integer, testfall_schluessel varchar(255), resultset_uniquename varchar(255), feldnr integer, feldwert varchar(255) ); + F + F + + F + eduetl + N + Y + 0 + 256 + 80 + + + finalize + + SQL + + T + T + ${Internal.Job.Filename.Directory}/testfall_import_dbtest.sql + F + eduetl + N + Y + 0 + 816 + 80 + + + testfall_import 2 + + TRANS + filename + + ${Internal.Job.Filename.Directory}/testfall_import_dbtest.ktr + + N + N + N + N + N + N + + + N + N + Basic + N + + N + Y + N + N + N + + Y + + N + Y + 0 + 608 + 80 + + + + + START + create table tmp_testfall_import + 0 + 0 + Y + Y + Y + + + create table tmp_testfall_import + testfall_import_def + 0 + 0 + Y + Y + N + + + testfall_import_def + testfall_import 2 + 0 + 0 + Y + Y + N + + + testfall_import 2 + finalize + 0 + 0 + Y + Y + N + + + + + TODO: Parameter userid aus Maskenfeld + 472 + 234 + 273 + 27 + + -1 + N + N + 0 + 0 + 0 + 255 + 205 + 112 + 100 + 100 + 100 + Y + + + diff --git a/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.ktr b/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.ktr new file mode 100644 index 0000000..f059a2e --- /dev/null +++ b/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.ktr @@ -0,0 +1,1511 @@ + + + + testfall_import + + + + Normal + 0 + / + + + PATH_TO_UPLOADFILE + file:///home/superx/git/Memtext-Interna/Projekte/duisburg-essen_uni/impl/db_module/qa/ects_testfaelle/qa_importdatei_dbtest.xlsx + + + + userid + 803 + + + + + + + +
+ + + + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + TRANSNAME + Y + TRANSNAME + + + STATUS + Y + STATUS + + + LINES_READ + Y + LINES_READ + + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + + LINES_UPDATED + Y + LINES_UPDATED + + + + LINES_INPUT + Y + LINES_INPUT + + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + + LINES_REJECTED + Y + LINES_REJECTED + + + + ERRORS + Y + ERRORS + + + STARTDATE + Y + STARTDATE + + + ENDDATE + Y + ENDDATE + + + LOGDATE + Y + LOGDATE + + + DEPDATE + Y + DEPDATE + + + REPLAYDATE + Y + REPLAYDATE + + + LOG_FIELD + Y + LOG_FIELD + + + EXECUTING_SERVER + N + EXECUTING_SERVER + + + EXECUTING_USER + N + EXECUTING_USER + + + CLIENT + N + CLIENT + + + + + +
+ + + + ID_BATCH + Y + ID_BATCH + + + SEQ_NR + Y + SEQ_NR + + + LOGDATE + Y + LOGDATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + INPUT_BUFFER_ROWS + Y + INPUT_BUFFER_ROWS + + + OUTPUT_BUFFER_ROWS + Y + OUTPUT_BUFFER_ROWS + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + LOGGING_OBJECT_TYPE + Y + LOGGING_OBJECT_TYPE + + + OBJECT_NAME + Y + OBJECT_NAME + + + OBJECT_COPY + Y + OBJECT_COPY + + + REPOSITORY_DIRECTORY + Y + REPOSITORY_DIRECTORY + + + FILENAME + Y + FILENAME + + + OBJECT_ID + Y + OBJECT_ID + + + OBJECT_REVISION + Y + OBJECT_REVISION + + + PARENT_CHANNEL_ID + Y + PARENT_CHANNEL_ID + + + ROOT_CHANNEL_ID + Y + ROOT_CHANNEL_ID + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + LOG_FIELD + N + LOG_FIELD + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + METRICS_DATE + Y + METRICS_DATE + + + METRICS_CODE + Y + METRICS_CODE + + + METRICS_DESCRIPTION + Y + METRICS_DESCRIPTION + + + METRICS_SUBJECT + Y + METRICS_SUBJECT + + + METRICS_TYPE + Y + METRICS_TYPE + + + METRICS_VALUE + Y + METRICS_VALUE + + + + + +
+ + 0.0 + 0.0 + + 10000 + 50 + 50 + N + Y + 50000 + Y + + N + 1000 + 100 + + + + + + + + + - + 2020/02/23 11:24:17.033 + - + 2020/02/23 11:24:17.033 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= + N + + + + + eduetl + localhost + POSTGRESQL + Native + eduetl_ude + 9998 + superx + Encrypted 2be98afc86aa7f292a20aa77fd0c3fa9e + superx_host_iso + + + + FORCE_IDENTIFIERS_TO_LOWERCASEN + FORCE_IDENTIFIERS_TO_UPPERCASEN + IS_CLUSTEREDN + PORT_NUMBER9998 + PRESERVE_RESERVED_WORD_CASEY + QUOTE_ALL_FIELDSN + SUPPORTS_BOOLEAN_DATA_TYPEY + SUPPORTS_TIMESTAMP_DATA_TYPEY + USE_POOLINGN + + + + + Sort rows + Unique rows + Y + + + Unique rows + write qa_resultset + Y + + + Select resultset + Add fieldclause + Y + + + Add fieldclause + Sort rows + Y + + + Filter rows 3 2 + write tmp_testfall_import_feldwerte + Y + + + Row Normaliser 2 + Select values 2 + Y + + + Select values 2 + Filter rows 3 2 + Y + + + Microsoft Excel Input + Select resultset + Y + + + Microsoft Excel Input + Row Normaliser 2 + Y + + + Microsoft Excel Input + write tmp_qa_dbtest + Y + + + Row Normaliser 2 2 + erg nicht leer + Y + + + Select values + Row Normaliser 2 2 + Y + + + erg nicht leer + write tmp_testfall_import_erg + Y + + + Microsoft Excel Input + Select values + Y + + + + Add fieldclause + Constant + + Y + + 1 + + none + + + + + fieldclause + String + + + + + * + -1 + -1 + N + + + + + + + + + + + 512 + 64 + Y + + + + + Filter rows 3 2 + FilterRows + + Y + + 1 + + none + + +write tmp_testfall_import_feldwerte + + + + N + Feldwert + IS NOT NULL + + + + + + + + + + + + 832 + 272 + Y + + + + + Microsoft Excel Input + ExcelInput + + N + + 1 + + none + + +
Y
+ Y + N + + + + zeilennr + + + 0 + + Y + N + + + + ${PATH_TO_UPLOADFILE} + + + N + N + + + + Komponente + Integer + -1 + -1 + none + N + # + + + + + + Testfall Name + String + -1 + -1 + none + N + + + + + + + Testfall Schlüssel + String + -1 + -1 + none + N + + + + + + + Tabelle + String + -1 + -1 + none + N + # + + + + + + Feld 1 + String + -1 + -1 + none + N + # + + + + + + Feld 2 + String + -1 + -1 + none + N + # + + + + + + Feld 3 + String + -1 + -1 + none + N + # + + + + + + Feld 4 + String + -1 + -1 + none + N + # + + + + + + Feld 5 + String + -1 + -1 + none + N + # + + + + + + Feld 6 + String + -1 + -1 + none + N + # + + + + + + Feld 7 + String + -1 + -1 + none + N + # + + + + + + Feld 8 + String + -1 + -1 + none + N + # + + + + + + Feld 9 + String + -1 + -1 + none + N + # + + + + + + Feld 10 + String + -1 + -1 + none + N + # + + + + + + Ergebnis 1 + String + -1 + -1 + none + N + + + + + + + Ergebnis 2 + String + -1 + -1 + none + N + # + + + + + + + + Tabelle1 + 1 + 0 + + + N + N + N + + warning + + error + + line + + + + + + + + + POI + + + + + + + + + 128 + 64 + Y + + + + + Row Normaliser 2 + Normaliser + + Y + + 1 + + none + + + feldnr + Feld 1 + 1 + Feldwert + Feld 2 + 2 + Feldwert + Feld 3 + 3 + Feldwert + Feld 4 + 4 + Feldwert + Feld 5 + 5 + Feldwert + Feld 6 + 6 + Feldwert + Feld 7 + 7 + Feldwert + Feld 8 + 8 + Feldwert + Feld 9 + 9 + Feldwert + Feld 10 + 10 + Feldwert + + + + + + + + + 544 + 272 + Y + + + + + Select resultset + SelectValues + + Y + + 1 + + none + + + Tabelle + resultset + Komponente + systeminfo_id + N + + + + + + + + + 368 + 64 + Y + + + + + Select values 2 + SelectValues + + Y + + 1 + + none + + + Y + feldnr + feldnr_int + Integer + -2 + -2 + # + false + + + false + + + + + + + + + + + + + + 688 + 272 + Y + + + + + Sort rows + SortRows + + Y + + 1 + + none + + + %%java.io.tmpdir%% + out + 1000000 + + N + + N + + + resultset + Y + N + N + 0 + N + + + systeminfo_id + Y + N + N + 0 + N + + + fieldclause + Y + N + N + 0 + N + + + + + + + + + + + 624 + 64 + Y + + + + + Unique rows + Unique + + Y + + 1 + + none + + + N + + N + + resultset + N + systeminfo_id + N + fieldclause + Y + + + + + + + + + 832 + 64 + Y + + + + + write qa_resultset + TableOutput + + Y + + 1 + + none + + + eduetl + +
tmp_qa_resultset
+ 1000 + Y + N + N + Y + N + + N + Y + N + + Y + N + + + + uniquename + resultset + + + name + resultset + + + systeminfo_id + systeminfo_id + + + fieldclause + fieldclause + + + fromclause + resultset + + + + + + + + + + + 1088 + 64 + Y + + + + + write tmp_qa_dbtest + TableOutput + + Y + + 1 + + none + + + eduetl + + tmp_qa_dbtest
+ 1000 + Y + N + Y + Y + N + + N + Y + N + + Y + N + + + + systeminfo_id + Komponente + + + name + Testfall Name + + + uniquename + Testfall Schlüssel + + + resultset_uniquename + Tabelle + + + + + + + + + + + 816 + 160 + Y + + + + + write tmp_testfall_import_feldwerte + TableOutput + + Y + + 1 + + none + + + eduetl + + tmp_testfall_import_feldwerte
+ 10000 + Y + N + N + Y + N + + N + Y + N + + Y + N + + + + testfall_schluessel + Testfall Schlüssel + + + feldnr + feldnr_int + + + feldwert + Feldwert + + + resultset_uniquename + Tabelle + + + systeminfo_id + Komponente + + + + + + + + + + + 1040 + 272 + Y + + + + + Row Normaliser 2 2 + Normaliser + + Y + + 1 + + none + + + ergnr + erg1 + 1 + erg + erg2 + 2 + erg + + + + + + + + + 112 + 288 + Y + + + + + Select values + SelectValues + + N + + 1 + + none + + + Y + Testfall Schlüssel + Testfall Schlüssel + String + -2 + -2 + # + false + + + true + + + + + + Ergebnis 1 + erg1 + String + -2 + -2 + # + false + + + true + + + + + + Ergebnis 2 + erg2 + String + -2 + -2 + # + false + + + true + + + + + + Komponente + Komponente + Integer + -2 + -2 + + false + + + false + + + + + + + + + + + + + + 256 + 240 + Y + + + + + erg nicht leer + FilterRows + + Y + + 1 + + none + + +write tmp_testfall_import_erg + + + + N + erg + IS NOT NULL + + + + + + + + + + + + 64 + 368 + Y + + + + + write tmp_testfall_import_erg + TableOutput + + Y + + 1 + + none + + + eduetl + + tmp_qa_dbtest_assertion
+ 1000 + Y + N + N + Y + N + + N + Y + N + + Y + N + tid + + + dbtest_uniquename + Testfall Schlüssel + + + def_col_name + ergnr + + + def_col_value + erg + + + systeminfo_id + Komponente + + + + + + + + + + + 32 + 464 + Y + + + + + + + + N + diff --git a/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.sql b/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.sql new file mode 100644 index 0000000..acfa1b3 --- /dev/null +++ b/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest.sql @@ -0,0 +1,126 @@ + +delete from qa_resultset +where (systeminfo_id,uniquename) +in (select systeminfo_id,uniquename +from tmp_qa_resultset ); + +insert into qa_resultset +( + uniquename, + name, + systeminfo_id, + fromclause, + fieldclause, + groupbyclause, + orderbyclause + ) +SELECT + uniquename, + name, + systeminfo_id, + fromclause, + fieldclause, + groupbyclause, + orderbyclause +FROM tmp_qa_resultset + ; + +update tmp_qa_dbtest +set whereclause=''; + +update tmp_qa_dbtest +set whereclause=whereclause || F.feldname || '::varchar(255)='''|| W.feldwert || '''' +from tmp_testfall_import_felder F, tmp_testfall_import_feldwerte W +where F.feldnr=W.feldnr +and W.testfall_schluessel=tmp_qa_dbtest.uniquename +and W.feldnr=1; + +update tmp_qa_dbtest +set whereclause=whereclause || ' and ' || F.feldname || '::varchar(255)='''|| W.feldwert || '''' +from tmp_testfall_import_felder F, tmp_testfall_import_feldwerte W +where F.feldnr=W.feldnr +and W.testfall_schluessel=tmp_qa_dbtest.uniquename +and W.feldnr=2; + + +update tmp_qa_dbtest +set whereclause=whereclause || ' and ' || F.feldname || '::varchar(255)='''|| W.feldwert || '''' +from tmp_testfall_import_felder F, tmp_testfall_import_feldwerte W +where F.feldnr=W.feldnr +and W.testfall_schluessel=tmp_qa_dbtest.uniquename +and W.feldnr=3; + + +update tmp_qa_dbtest +set whereclause=whereclause || ' and ' || F.feldname || '::varchar(255)='''|| W.feldwert || '''' +from tmp_testfall_import_felder F, tmp_testfall_import_feldwerte W +where F.feldnr=W.feldnr +and W.testfall_schluessel=tmp_qa_dbtest.uniquename +and W.feldnr=4; + + +delete from qa_dbtest_assertion +where dbtest_id in (select D.tid + from qa_dbtest D, tmp_qa_dbtest T +where D.systeminfo_id=T.systeminfo_id +and D.uniquename=T.uniquename +); + + +delete from qa_dbtest +where (systeminfo_id,uniquename) in +(select systeminfo_id,uniquename +from tmp_qa_dbtest T +); + +insert into qa_dbtest( uniquename, + name, + systeminfo_id, + resultset_id, + whereclause, + description, + active + ) +select distinct +T.uniquename, +T.name, +T.systeminfo_id, +R.tid, +T.whereclause, +T.description, +T.active +FROM tmp_qa_dbtest T, qa_resultset R +where R.uniquename=T.resultset_uniquename + ; + +insert into qa_dbtest_assertion +( dbtest_id, + rownr, + def_col_caption, + def_col_name, + def_col_value, + def_col_function) + select + D.tid, + 1, + E.feldname, + E.feldname, + A.def_col_value, + 'decval' + + from qa_dbtest D ,tmp_qa_dbtest_assertion A, tmp_testfall_import_erg E +where E.feldnr::varchar(255)=A.def_col_name +and D.uniquename=A.dbtest_uniquename +and D.systeminfo_id=A.systeminfo_id +; + + +drop table tmp_qa_dbtest_assertion; +drop table tmp_testfall_import_erg; + +drop table tmp_qa_dbtest; +drop table tmp_testfall_import_felder ; +drop table tmp_testfall_import_feldwerte; + + + diff --git a/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest_def.ktr b/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest_def.ktr new file mode 100644 index 0000000..a0c4b1e --- /dev/null +++ b/src-modules/module/qa/etl/testfall_import/testfall_import_dbtest_def.ktr @@ -0,0 +1,1130 @@ + + + + testfall_import + + + + Normal + 0 + / + + + PATH_TO_UPLOADFILE + file:///home/superx/git/Memtext-Interna/Projekte/duisburg-essen_uni/impl/db_module/qa/ects_testfaelle/qa_importdatei_dbtest.xlsx + + + + userid + 803 + + + + + + + + + + + + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + TRANSNAME + Y + TRANSNAME + + + STATUS + Y + STATUS + + + LINES_READ + Y + LINES_READ + + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + + LINES_UPDATED + Y + LINES_UPDATED + + + + LINES_INPUT + Y + LINES_INPUT + + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + + LINES_REJECTED + Y + LINES_REJECTED + + + + ERRORS + Y + ERRORS + + + STARTDATE + Y + STARTDATE + + + ENDDATE + Y + ENDDATE + + + LOGDATE + Y + LOGDATE + + + DEPDATE + Y + DEPDATE + + + REPLAYDATE + Y + REPLAYDATE + + + LOG_FIELD + Y + LOG_FIELD + + + EXECUTING_SERVER + N + EXECUTING_SERVER + + + EXECUTING_USER + N + EXECUTING_USER + + + CLIENT + N + CLIENT + + + + + +
+ + + + ID_BATCH + Y + ID_BATCH + + + SEQ_NR + Y + SEQ_NR + + + LOGDATE + Y + LOGDATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + INPUT_BUFFER_ROWS + Y + INPUT_BUFFER_ROWS + + + OUTPUT_BUFFER_ROWS + Y + OUTPUT_BUFFER_ROWS + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + LOGGING_OBJECT_TYPE + Y + LOGGING_OBJECT_TYPE + + + OBJECT_NAME + Y + OBJECT_NAME + + + OBJECT_COPY + Y + OBJECT_COPY + + + REPOSITORY_DIRECTORY + Y + REPOSITORY_DIRECTORY + + + FILENAME + Y + FILENAME + + + OBJECT_ID + Y + OBJECT_ID + + + OBJECT_REVISION + Y + OBJECT_REVISION + + + PARENT_CHANNEL_ID + Y + PARENT_CHANNEL_ID + + + ROOT_CHANNEL_ID + Y + ROOT_CHANNEL_ID + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + LOG_FIELD + N + LOG_FIELD + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + METRICS_DATE + Y + METRICS_DATE + + + METRICS_CODE + Y + METRICS_CODE + + + METRICS_DESCRIPTION + Y + METRICS_DESCRIPTION + + + METRICS_SUBJECT + Y + METRICS_SUBJECT + + + METRICS_TYPE + Y + METRICS_TYPE + + + METRICS_VALUE + Y + METRICS_VALUE + + + + + +
+ + 0.0 + 0.0 + + 10000 + 50 + 50 + N + Y + 50000 + Y + + N + 1000 + 100 + + + + + + + + + - + 2020/02/23 11:24:17.033 + - + 2020/02/23 11:24:17.033 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= + N + + + + + eduetl + localhost + POSTGRESQL + Native + eduetl_ude + 9998 + superx + Encrypted 2be98afc86aa7f292a20aa77fd0c3fa9e + superx_host_iso + + + + FORCE_IDENTIFIERS_TO_LOWERCASEN + FORCE_IDENTIFIERS_TO_UPPERCASEN + IS_CLUSTEREDN + PORT_NUMBER9998 + PRESERVE_RESERVED_WORD_CASEY + QUOTE_ALL_FIELDSN + SUPPORTS_BOOLEAN_DATA_TYPEY + SUPPORTS_TIMESTAMP_DATA_TYPEY + USE_POOLINGN + + + + + Filter rows 2 + write tmp_testfall_import_felder + Y + + + Row Normaliser + feldnr_int + Y + + + feldnr_int + Filter rows 2 + Y + + + Row Normaliser 3 + feldnr_int 2 + Y + + + feldnr_int 2 + Filter rows 2 2 + Y + + + Filter rows 2 2 + write tmp_testfall_import_erg + Y + + + Microsoft Excel Input + Row Normaliser 3 + Y + + + Microsoft Excel Input + Row Normaliser + Y + + + + Filter rows 2 + FilterRows + + Y + + 1 + + none + + +write tmp_testfall_import_felder + + + + N + Feldname + IS NOT NULL + + + + + + + + + + + + 416 + 384 + Y + + + + + Filter rows 2 2 + FilterRows + + Y + + 1 + + none + + +write tmp_testfall_import_erg + + + + N + ergname + IS NOT NULL + + + + + + + + + + + + 96 + 448 + Y + + + + + Microsoft Excel Input + ExcelInput + + N + + 1 + + none + + +
Y
+ Y + N + + + + zeilennr + + + 2 + + Y + N + + + + ${PATH_TO_UPLOADFILE} + + + N + N + + + + Komponente + Integer + -1 + -1 + none + N + # + + + + + + Testfall Name + String + -1 + -1 + none + N + + + + + + + Testfall Schlüssel + String + -1 + -1 + none + N + + + + + + + Tabelle + String + -1 + -1 + none + N + # + + + + + + Feld 1 + String + -1 + -1 + none + N + # + + + + + + Feld 2 + String + -1 + -1 + none + N + # + + + + + + Feld 3 + String + -1 + -1 + none + N + # + + + + + + Feld 4 + String + -1 + -1 + none + N + # + + + + + + Feld 5 + String + -1 + -1 + none + N + # + + + + + + Feld 6 + String + -1 + -1 + none + N + # + + + + + + Feld 7 + String + -1 + -1 + none + N + # + + + + + + Feld 8 + String + -1 + -1 + none + N + # + + + + + + Feld 9 + String + -1 + -1 + none + N + # + + + + + + Feld 10 + String + -1 + -1 + none + N + # + + + + + + Ergebnis 1 + String + -1 + -1 + none + N + + + + + + + Ergebnis 2 + String + -1 + -1 + none + N + # + + + + + + + + Tabelle1 + 0 + 0 + + + N + N + N + + warning + + error + + line + + + + + + + + + POI + + + + + + + + + 128 + 64 + Y + + + + + Row Normaliser + Normaliser + + Y + + 1 + + none + + + feldnr + Feld 1 + 1 + Feldname + Feld 2 + 2 + Feldname + Feld 3 + 3 + Feldname + Feld 4 + 4 + Feldname + Feld 5 + 5 + Feldname + Feld 6 + 6 + Feldname + Feld 7 + 7 + Feldname + Feld 8 + 8 + Feldname + Feld 9 + 9 + Feldname + Feld 10 + 10 + Feldname + + + + + + + + + 368 + 80 + Y + + + + + Row Normaliser 3 + Normaliser + + Y + + 1 + + none + + + feldnr + Ergebnis 1 + 1 + ergname + Ergebnis 2 + 2 + ergname + + + + + + + + + 176 + 208 + Y + + + + + feldnr_int + SelectValues + + Y + + 1 + + none + + + Y + feldnr + feldnr_int + Integer + -2 + -2 + # + false + + + false + + + + + + + + + + + + + + 336 + 272 + Y + + + + + feldnr_int 2 + SelectValues + + Y + + 1 + + none + + + Y + feldnr + feldnr_int + Integer + -2 + -2 + # + false + + + false + + + + + + + + + + + + + + 96 + 368 + Y + + + + + write tmp_testfall_import_erg + TableOutput + + Y + + 1 + + none + + + eduetl + +
tmp_testfall_import_erg
+ 1000 + Y + N + Y + Y + N + + N + Y + N + + Y + N + + + + feldnr + feldnr_int + + + feldname + ergname + + + + + + + + + + + 272 + 512 + Y + + + + + write tmp_testfall_import_felder + TableOutput + + Y + + 1 + + none + + + eduetl + + tmp_testfall_import_felder
+ 1000 + Y + N + Y + Y + N + + N + Y + N + + Y + N + + + + feldnr + feldnr_int + + + feldname + Feldname + + + + + + + + + + + 592 + 384 + Y + + + + + + + + N +