paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-23 09:12:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set AllVersionID field

Browse Source
This commit is contained in:
Michaël Van Canneyt 2025-03-02 12:03:26 +01:00
parent 13ea45d243
commit 59ed4c9228
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/utils/testsuite/tshttp.pp
View File

@ -7,7 +7,7 @@ unit tshttp;
interface interface
uses uses
classes, httpdefs, fphttp, cgiapp, fpcgi, custcgi, inifiles, types, sysutils, classes, httpdefs, fphttp, inifiles, types, sysutils,
sqldb, whtml, db, dbwhtml, sqldb, whtml, db, dbwhtml,
tsgraph, tsdb, tssql, tshistory, tstypes, tsconsts, tsutils, tshtml; tsgraph, tsdb, tssql, tshistory, tstypes, tsconsts, tsutils, tshtml;
@ -264,10 +264,13 @@ begin
FInfo.AllCategoryID:=FSQL.GetCategoryID('All'); FInfo.AllCategoryID:=FSQL.GetCategoryID('All');
FInfo.AllOSID:=FSQL.GetOSID('All'); FInfo.AllOSID:=FSQL.GetOSID('All');
FInfo.AllCPUID:=FSQL.GetCPUID('All'); FInfo.AllCPUID:=FSQL.GetCPUID('All');
FInfo.AllVersionID:=FSQL.GetVersionID('All');
if FVars.OSID <= 0 then if FVars.OSID <= 0 then
FVars.OSID:=FInfo.AllOSID; FVars.OSID:=FInfo.AllOSID;
if FVars.CPUID<=0 then if FVars.CPUID<=0 then
FVars.CPUID:=FInfo.AllCPUID; FVars.CPUID:=FInfo.AllCPUID;
if FVars.VersionID<=0 then
FVars.VersionID:=FInfo.AllVersionID;
end; end;

4
tests/utils/testsuite/tssql.pas
View File

@ -305,7 +305,7 @@ end;
function TTestSuiteSQL.GetRunOverviewSQL: String; function TTestSuiteSQL.GetRunOverviewSQL: String;
Const Const
SOverview = 'SELECT TU_ID as ID,TU_DATE as Date,TC_NAME as CPU,TO_NAME as OS,'+ SOverview = 'SELECT TU_ID as ID,TU_DATE as Date,TC_NAME as CPU, TO_NAME as OS,'+
'TV_VERSION as Version, '+ 'TV_VERSION as Version, '+
'(select count(*) from testresults where (TR_TESTRUN_FK=TU_ID)) as Count,'+ '(select count(*) from testresults where (TR_TESTRUN_FK=TU_ID)) as Count,'+
'TU_COMPILERREVISION as CompRev,'+ 'TU_COMPILERREVISION as CompRev,'+
@ -334,7 +334,7 @@ begin
S:=''; S:='';
S:=S+PointerIs('TP_CPU_FK',FVars.CPUID,FInfo.AllCPUID); S:=S+PointerIs('TP_CPU_FK',FVars.CPUID,FInfo.AllCPUID);
S:=S+PointerIs('TP_CATEGORY_FK',FVars.CategoryID,FInfo.AllCategoryID); S:=S+PointerIs('TP_CATEGORY_FK',FVars.CategoryID,FInfo.AllCategoryID);
S:=S+PointerIs('TP_VERSION_FK',FVars.VersionID); S:=S+PointerIs('TP_VERSION_FK',FVars.VersionID,FInfo.AllVersionID);
S:=S+PointerIs('TP_OS_FK',FVars.OSID,FInfo.ALLOSID); S:=S+PointerIs('TP_OS_FK',FVars.OSID,FInfo.ALLOSID);
If (Round(FVars.Date)<>0) then If (Round(FVars.Date)<>0) then
S:=S+Format(' AND (TU_DATE=''%s'')',[FormatDateTime('YYYY-MM-DD',FVars.Date)]); S:=S+Format(' AND (TU_DATE=''%s'')',[FormatDateTime('YYYY-MM-DD',FVars.Date)]);