admin/Database
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Oracle Testscript verbeteringen

Browse Source 
svn path=/Database/trunk/; revision=55785
This commit is contained in:
Jos Groot Lipman
2022-05-05 08:28:11 +00:00
parent 2e4c7c87b4
commit 279ff6e438
9 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_UTIL/TestOracle/_CREA_WORK.bat
View File

@@ -12,12 +12,12 @@ SET logger=%targetSERVER%_%targetUSER%_%~n1.log
set oracle_sid=%targetSERVER%
@TITLE Creating %targetUSER%@%targetSERVER%
@ECHO Creating %targetUSER%@%targetSERVER% 1>&2
@ECHO %time:~,8% Creating %targetUSER%@%targetSERVER% 1>&2
sqlplus.exe system/XZSTXnHGjfNNODfQc@%targetSERVER% @.\CreateUser%targetSERVER%.sql %targetUSER% %targetPASS%
@if errorlevel 1 goto nocreate
@TITLE Running FCLT%DBVER%.sql
@ECHO Running FCLT%DBVER%.sql on %targetUSER%@%targetSERVER% 1>&2
@ECHO %time:~,8% Running FCLT%DBVER%.sql on %targetUSER%@%targetSERVER% 1>&2
ECHO @%BUILD%\DB%DBVER%\FCLT%DBVER%.sql >xtmp.sql
ECHO UPDATE fac_version SET fac_version_cust = 'CREA'; >>xtmp.sql
ECHO @@z:\Project\FACILITOR\Database\trunk\_UTIL\SUPPORT_IDP\supportJWT_SAAS.sql>>xtmp.sql

6
_UTIL/TestOracle/_CREA_WORK_UPDATE.bat
View File

@@ -12,19 +12,19 @@ SET logger=%targetSERVER%_%targetUSER%_%~n1.log
set oracle_sid=%targetSERVER%
@TITLE Creating %targetUSER%@%targetSERVER%
@ECHO Creating %targetUSER%@%targetSERVER% 1>&2
@ECHO %time:~,8% Creating %targetUSER%@%targetSERVER% 1>&2
sqlplus.exe system/XZSTXnHGjfNNODfQc@%targetSERVER% @.\CreateUser%targetSERVER%.sql %targetUSER% %targetPASS%
@if errorlevel 1 goto nocreate
@TITLE Running FCLT%DBPRV%.sql
@ECHO Running FCLT%DBPRV%.sql on %targetUSER%@%targetSERVER% 1>&2
@ECHO %time:~,8% Running FCLT%DBPRV%.sql on %targetUSER%@%targetSERVER% 1>&2
ECHO @@%DBPRVPATH% >xtmp.sql
ECHO UPDATE fac_version SET fac_version_cust = 'CREA'; >>xtmp.sql
ECHO EXIT >>xtmp.sql
sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"PLS-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
@TITLE Running DB%DBPRV%to%DBVER%.sql
@ECHO Running DB%DBPRV%to%DBVER%.sql on %targetUSER%@%targetSERVER% 1>&2
@ECHO %time:~,8% Running DB%DBPRV%to%DBVER%.sql on %targetUSER%@%targetSERVER% 1>&2
ECHO define ACCEPT_DB%DBVER%=1 >xtmp.sql
ECHO @%BUILD%\DB%DBVER%\DB%DBPRV%to%DBVER%.sql >>xtmp.sql
ECHO @@z:\Project\FACILITOR\Database\trunk\_UTIL\SUPPORT_IDP\supportJWT_SAAS.sql >>xtmp.sql

7
_UTIL/TestOracle/compare.js
View File

@@ -135,7 +135,7 @@ function checkauto(tbl)
while (!oRs.Eof)
{
var col = oRs("COLUMN_NAME").Value;
if (!col.match(/(_KEY|_VOLGNR|_SALT|_HASH|_OTPSECRET|APIKEY|RES_RUIMTE_SYNCSTATE)$/))
if (!col.match(/(_KEY|_VOLGNR|_SALT|_HASH|_OTPSECRET|APIKEY|RES_RUIMTE_SYNCSTATE|FAC_LOCALE_KOLOMKEYVAL)$/))
cols.push(col)
oRs.MoveNext();
}
@@ -159,14 +159,19 @@ function checkempty(sql, txt)
//WScript.Echo(prettysql(sql));
//WScript.Echo("\n");
var n = 0;
var names = [];
while (!oRs.Eof)
{
n++;
var flds = [];
for (var i = 0; i < oRs.Fields.Count; i++)
{
if (n == 1)
names.push(oRs.Fields(i).Name);
flds.push(oRs.Fields(i).Value);
}
if (n == 1)
WScript.Echo(names.join(",") + "\n---");
WScript.Echo(flds.join(","));
oRs.MoveNext();

9
_UTIL/TestOracle/emailerror.js
View File

@@ -8,8 +8,8 @@ if (mailall)
{
fac_send_mail_html("e.groener@facilitor.nl");
fac_send_mail_html("m.geerdink@facilitor.nl");
fac_send_mail_html("a.tiehuis@facilitor.nl");
fac_send_mail_html("gijs.wassink@aareon.nl");
fac_send_mail_html("k.reefman@facilitor.nl");
//fac_send_mail_html("gijs.wassink@aareon.nl");
}
//fac_send_mail_html("glipman@home.nl");
//fac_send_mail_html("helpdesk@facilitor.nl");
@@ -33,8 +33,9 @@ function fac_send_mail_html(adrTo,strSubj,strBody)
var iConf = new ActiveXObject("CDO.Configuration")
iConf.Fields(sch+"sendusing") = 2;
//iConf.Fields(sch+"smtpserver") = "emmex11.ad.aareon.com";
iConf.Fields(sch+"smtpserver") = "facws001";
//iConf.Fields(sch+"smtpserver") = "facws001";
iConf.Fields(sch+"smtpserver") = "Smtprelay.ad.aareon.com";
iConf.Fields(sch+"smtpserverport") = 25;
iConf.Fields(sch+"smtpauthenticate") = 0; // anoniem
iConf.Fields.Update();

4
_UTIL/TestOracle/testwork38.bat
View File

@@ -1,4 +0,0 @@
SET DBVER=38
SET DBPRV=37
SET DBPRVPATH=z:\Archief\FACILITOR\2019\02\DB37\FCLT37.sql
@testworkCOMMON.bat trunk

4
_UTIL/TestOracle/testwork39.bat
View File

@@ -1,4 +0,0 @@
SET DBVER=39
SET DBPRV=38
SET DBPRVPATH=z:\Archief\FACILITOR\2020.1\DB38e\FCLT38e.sql
@testworkCOMMON.bat trunk

2
_UTIL/TestOracle/testwork41.bat
View File

@@ -1,5 +1,5 @@
:: Achteraan d:\Backup\BackupAppl.bat op Jos's PC staat deze gescheduled
SET DBVER=41
SET DBVER=41a
SET DBPRV=40
SET DBPRVPATH=z:\Archief\FACILITOR\2021.1\DB40g\FCLT40g.sql
@testworkCOMMON.bat trunk %*

5
_UTIL/TestOracle/testwork42.bat Normal file
View File

@@ -0,0 +1,5 @@
:: Achteraan d:\Backup\BackupAppl.bat op Jos's PC staat deze gescheduled
SET DBVER=42
SET DBPRV=41
SET DBPRVPATH=z:\Archief\FACILITOR\2022.1\DB41a\FCLT41a.sql
@testworkCOMMON.bat trunk %*

6
_UTIL/TestOracle/testworkCOMMON.bat
View File

@@ -19,7 +19,8 @@ SET mailall=%2
SET OUTPUT=%BUILD%\DB%DBVER%\TEST_OUTPUT
MKDIR %OUTPUT%>nul
MKDIR %OUTPUT%\OLD>nul
move %OUTPUT%\*.lst %OUTPUT%\OLD
DEL %OUTPUT%\OLD\*.LST
MOVE %OUTPUT%\*.lst %OUTPUT%\OLD
PUSHD %SOURCE%
CALL mx12 NOWAIT
@@ -46,9 +47,10 @@ ECHO Starting Update %DBPRV%to%DBVER% test
ECHO Starting Update %DBPRV%to%DBVER% test>>diffwork_%DBVER%.lst
CALL _CREA_WORK_UPDATE %DBPRV% %DBPRVPATH% %DBVER% z:\Project\FACILITOR\BUILD>>diffwork_%DBVER%.lst
ECHO Starting Compare
ECHO %time:~,8% Starting Compare
ECHO Starting Compare>>diffwork_%DBVER%.lst
cscript compare.js %DBPRV% %DBVER% >>diffwork_%DBVER%.lst 2>>&1
ECHO %time:~,8% Done Compare
findstr /i "ORA-" "diffwork_%DBVER%.lst"
if %errorlevel%==1 GOTO EINDE