From 68e2f248825fb74bc208ce2c5370d9b8929cfb5e Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Mon, 11 Oct 2021 07:16:01 +0000 Subject: [PATCH] Oracle Testscript updates svn path=/Database/trunk/; revision=53323 --- _UTIL/TestOracle/CreateUserWORK.sql | 2 +- _UTIL/TestOracle/testSVN31Branch.bat | 43 ---------------------- _UTIL/TestOracle/testSVN32.bat | 43 ---------------------- _UTIL/TestOracle/testSVN33aBranch.bat | 44 ----------------------- _UTIL/TestOracle/testbranch40.bat | 4 +++ _UTIL/TestOracle/testwork37.bat | 52 --------------------------- _UTIL/TestOracle/testwork40.bat | 2 +- _UTIL/TestOracle/testwork41.bat | 5 +++ 8 files changed, 11 insertions(+), 184 deletions(-) delete mode 100644 _UTIL/TestOracle/testSVN31Branch.bat delete mode 100644 _UTIL/TestOracle/testSVN32.bat delete mode 100644 _UTIL/TestOracle/testSVN33aBranch.bat create mode 100644 _UTIL/TestOracle/testbranch40.bat delete mode 100644 _UTIL/TestOracle/testwork37.bat create mode 100644 _UTIL/TestOracle/testwork41.bat diff --git a/_UTIL/TestOracle/CreateUserWORK.sql b/_UTIL/TestOracle/CreateUserWORK.sql index d91140c1..0f0cd959 100644 --- a/_UTIL/TestOracle/CreateUserWORK.sql +++ b/_UTIL/TestOracle/CreateUserWORK.sql @@ -1,5 +1,5 @@ PROMPT Creating user '&&1' with password '&&2' -SET ECHO ON +SET ECHO OFF whenever sqlerror exit failure; DECLARE diff --git a/_UTIL/TestOracle/testSVN31Branch.bat b/_UTIL/TestOracle/testSVN31Branch.bat deleted file mode 100644 index 4b6c8a41..00000000 --- a/_UTIL/TestOracle/testSVN31Branch.bat +++ /dev/null @@ -1,43 +0,0 @@ -@SET DBVER=31d -@SET DBPRV=30 -@SET DBPRVPATH=z:\Archief\FACILITOR\2016\03\DB30f\FCLT30f.sql -IF EXIST %DBPRVPATH% GOTO START -ECHO %DBPRVPATH% niet gevonden -PAUSE -GOTO EINDE - -:START -@echo off -REM Usage: %0 [revision] -REM Internal only -REM Let op: je hebt SVN.EXE nodig die bijvoorbeeld meekomt als je bij TortoiseSVN -REM er voor kiest 'command line client tools' ook te installeren (default uit) -REM - -SET PAD=http://facws001:8080/svn/Facilitor/Database/branches/DB31 - -SET SVNTOOLS=z:\Project\FACILITOR\Tools\MAKTOOLS\SlikSvn\bin - -IF x%1==x GOTO getrev -SET REVISION=%1 -GOTO gotrev - -:getrev -FOR /F "tokens=2 skip=4" %%G IN ('%SVNTOOLS%\svn info %PAD% --revision HEAD') DO ^ -IF NOT DEFINED REVISION SET REVISION=%%G - -:gotrev -@TITLE Getting r%REVISION% -SET FCLTMP=%TEMP%\FACILITOR_SVN_T_%REVISION% - -%SVNTOOLS%\svn export -r %REVISION% %PAD% %FCLTMP% -PUSHD %FCLTMP% -CALL mx NOWAIT %FCLTMP%\UIT -POPD -CALL _CREA_WORK %DBVER% %FCLTMP%\UIT -CALL _CREA_WORK_UPDATE %DBPRV% %DBPRVPATH% %DBVER% %FCLTMP%\UIT - -cscript compare.js %DBPRV% %DBVER% >diff%DBVER%.lst 2>>&1 - -::rmdir /S %FCLTMP% -:EINDE \ No newline at end of file diff --git a/_UTIL/TestOracle/testSVN32.bat b/_UTIL/TestOracle/testSVN32.bat deleted file mode 100644 index f511535a..00000000 --- a/_UTIL/TestOracle/testSVN32.bat +++ /dev/null @@ -1,43 +0,0 @@ -@SET DBVER=32b -@SET DBPRV=31 -@SET DBPRVPATH=z:\Archief\FACILITOR\2017\01\DB31e\FCLT31e.sql -IF EXIST %DBPRVPATH% GOTO START -ECHO %DBPRVPATH% niet gevonden -PAUSE -GOTO EINDE - -:START -@echo off -REM Usage: %0 [revision] -REM Internal only -REM Let op: je hebt SVN.EXE nodig die bijvoorbeeld meekomt als je bij TortoiseSVN -REM er voor kiest 'command line client tools' ook te installeren (default uit) -REM - -SET PAD=http://facws001:8080/svn/Facilitor/Database/trunk - -SET SVNTOOLS=z:\Project\FACILITOR\Tools\MAKTOOLS\SlikSvn\bin - -IF x%1==x GOTO getrev -SET REVISION=%1 -GOTO gotrev - -:getrev -FOR /F "tokens=2 skip=4" %%G IN ('%SVNTOOLS%\svn info %PAD% --revision HEAD') DO ^ -IF NOT DEFINED REVISION SET REVISION=%%G - -:gotrev -@TITLE Getting r%REVISION% -SET FCLTMP=%TEMP%\FACILITOR_SVN_T_%REVISION% - -%SVNTOOLS%\svn export -r %REVISION% %PAD% %FCLTMP% -PUSHD %FCLTMP% -CALL mx NOWAIT %FCLTMP%\UIT -POPD -CALL _CREA_WORK %DBVER% %FCLTMP%\UIT -CALL _CREA_WORK_UPDATE %DBPRV% %DBPRVPATH% %DBVER% %FCLTMP%\UIT - -cscript compare.js %DBPRV% %DBVER% >diff%DBVER%.lst 2>>&1 - -::rmdir /S %FCLTMP% -:EINDE \ No newline at end of file diff --git a/_UTIL/TestOracle/testSVN33aBranch.bat b/_UTIL/TestOracle/testSVN33aBranch.bat deleted file mode 100644 index b914fdc4..00000000 --- a/_UTIL/TestOracle/testSVN33aBranch.bat +++ /dev/null @@ -1,44 +0,0 @@ -@SET DBVER=33a -@SET DBPRV=33 -@SET DBPRVPATH=z:\Archief\FACILITOR\2017\03\DB33\FCLT33.sql - -IF EXIST %DBPRVPATH% GOTO START -ECHO %DBPRVPATH% niet gevonden -PAUSE -GOTO EINDE - -:START -@echo off -REM Usage: %0 [revision] -REM Internal only -REM Let op: je hebt SVN.EXE nodig die bijvoorbeeld meekomt als je bij TortoiseSVN -REM er voor kiest 'command line client tools' ook te installeren (default uit) -REM - -SET PAD=http://facws001:8080/svn/Facilitor/Database/branches/DB33 - -SET SVNTOOLS=z:\Project\FACILITOR\Tools\MAKTOOLS\SlikSvn\bin - -IF x%1==x GOTO getrev -SET REVISION=%1 -GOTO gotrev - -:getrev -FOR /F "tokens=2 skip=4" %%G IN ('%SVNTOOLS%\svn info %PAD% --revision HEAD') DO ^ -IF NOT DEFINED REVISION SET REVISION=%%G - -:gotrev -@TITLE Getting r%REVISION% -SET FCLTMP=%TEMP%\FACILITOR_SVN_T_%REVISION% - -%SVNTOOLS%\svn export -r %REVISION% %PAD% %FCLTMP% -PUSHD %FCLTMP% -CALL mx NOWAIT %FCLTMP%\UIT -POPD -CALL _CREA_WORK %DBVER% %FCLTMP%\UIT -CALL _CREA_WORK_UPDATE %DBPRV% %DBPRVPATH% %DBVER% %FCLTMP%\UIT - -cscript compare.js %DBPRV% %DBVER% >diff%DBVER%.lst 2>>&1 - -::rmdir /S %FCLTMP% -:EINDE \ No newline at end of file diff --git a/_UTIL/TestOracle/testbranch40.bat b/_UTIL/TestOracle/testbranch40.bat new file mode 100644 index 00000000..236c9774 --- /dev/null +++ b/_UTIL/TestOracle/testbranch40.bat @@ -0,0 +1,4 @@ +SET DBVER=40f +SET DBPRV=39 +SET DBPRVPATH=z:\Archief\FACILITOR\2020.2\DB39a\FCLT39a.sql +@testworkCOMMON.bat branchDB40 \ No newline at end of file diff --git a/_UTIL/TestOracle/testwork37.bat b/_UTIL/TestOracle/testwork37.bat deleted file mode 100644 index 0cb3526e..00000000 --- a/_UTIL/TestOracle/testwork37.bat +++ /dev/null @@ -1,52 +0,0 @@ -@SET DBVER=37 -@SET DBPRV=36 -@SET DBPRVPATH=z:\Archief\FACILITOR\2019\01\DB36\FCLT36.sql -::============================= -@SET BUILD=z:\Project\FACILITOR\BUILD - -IF EXIST %DBPRVPATH% GOTO START -ECHO %DBPRVPATH% niet gevonden -PAUSE -GOTO EINDE - -:START -@echo off -REM Usage: %0 - -PUSHD z:\Project\FACILITOR\Database\trunk -CALL mx NOWAIT -POPD -:START0 -IF EXIST %BUILD%\DB%DBVER%\FCLT%DBVER%.sql GOTO STARTCREA -ECHO %BUILD%\DB%DBVER%\FCLT%DBVER%.sql niet gevonden -PAUSE -GOTO EINDE -:STARTCREA - -ECHO ==========================================================================================================>diffwork_%DBVER%.lst -ECHO Comparescript %0>>diffwork_%DBVER%.lst -ECHO Creates databases users TEST_DB%DBVER% and TEST_DB%DBPRV%TO%DBVER% and compares them>>diffwork_%DBVER%.lst -ECHO (password is the same as username in uppercase)>>diffwork_%DBVER%.lst -ECHO ==========================================================================================================>>diffwork_%DBVER%.lst -ECHO.>>diffwork_%DBVER%.lst - -ECHO Starting Create, see diffwork_%DBVER%.lst -ECHO Starting Create>>diffwork_%DBVER%.lst -CALL _CREA_WORK %DBVER% z:\Project\FACILITOR\BUILD>>diffwork_%DBVER%.lst - -ECHO Starting Update, see diffwork_%DBVER%.lst -ECHO Starting Update>>diffwork_%DBVER%.lst -CALL _CREA_WORK_UPDATE %DBPRV% %DBPRVPATH% %DBVER% z:\Project\FACILITOR\BUILD>>diffwork_%DBVER%.lst - -ECHO Starting Compare, see diffwork_%DBVER%.lst -ECHO Starting Compare>>diffwork_%DBVER%.lst -cscript compare.js %DBPRV% %DBVER% >>diffwork_%DBVER%.lst 2>>&1 - -findstr /i "ORA-" "diffwork_%DBVER%.lst" -if %errorlevel%==1 GOTO EINDE - -findstr /C:"ORA-" "diffwork_%DBVER%.lst" | cscript emailerror.js -@TITLE ORA-Errors found, e-mail sent -PAUSE - -:EINDE \ No newline at end of file diff --git a/_UTIL/TestOracle/testwork40.bat b/_UTIL/TestOracle/testwork40.bat index aeaf2750..dc0a3777 100644 --- a/_UTIL/TestOracle/testwork40.bat +++ b/_UTIL/TestOracle/testwork40.bat @@ -1,4 +1,4 @@ -SET DBVER=40 +SET DBVER=40d SET DBPRV=39 SET DBPRVPATH=z:\Archief\FACILITOR\2020.2\DB39a\FCLT39a.sql @testworkCOMMON.bat trunk %* \ No newline at end of file diff --git a/_UTIL/TestOracle/testwork41.bat b/_UTIL/TestOracle/testwork41.bat new file mode 100644 index 00000000..b7f0f76e --- /dev/null +++ b/_UTIL/TestOracle/testwork41.bat @@ -0,0 +1,5 @@ +:: Achteraan d:\Backup\BackupAppl.bat op Jos's PC staat deze gescheduled +SET DBVER=41 +SET DBPRV=40 +SET DBPRVPATH=z:\Archief\FACILITOR\2021.1\DB40g\FCLT40g.sql +@testworkCOMMON.bat trunk %* \ No newline at end of file