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

* Fix use of "

Browse Source 
git-svn-id: trunk@28406 -
This commit is contained in:
michael 2014-08-14 16:47:37 +00:00
parent 1d3aa63620
commit 10ed2e7838
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/utils/dbtests.pp
View File

@ -200,8 +200,8 @@ end;
Function EscapeSQL( S : String) : String;
begin
Result:=StringReplace(S,'\','\\',[rfReplaceAll]);
Result:=StringReplace(Result,'"','\"',[rfReplaceAll]);
// Result:=StringReplace(S,'\','\\',[rfReplaceAll]);
Result:=StringReplace(Result,'''','''''',[rfReplaceAll]);
Verbose(V_DEBUG,'EscapeSQL : "'+S+'" -> "'+Result+'"');
end;
@ -220,7 +220,7 @@ end;
Function GetTestID(Name : string) : Integer;
Const
SFromName = 'SELECT T_ID FROM TESTS WHERE (T_NAME="%s")';
SFromName = 'SELECT T_ID FROM TESTS WHERE (T_NAME=''%s'')';
begin
Result:=IDQuery(Format(SFromName,[Name]));
@ -229,7 +229,7 @@ end;
Function GetOSID(Name : String) : Integer;
Const
SFromName = 'SELECT TO_ID FROM TESTOS WHERE (TO_NAME="%s")';
SFromName = 'SELECT TO_ID FROM TESTOS WHERE (TO_NAME=''%s'')';
begin
Result:=IDQuery(Format(SFromName,[Name]));
@ -238,7 +238,7 @@ end;
Function GetVersionID(Name : String) : Integer;
Const
SFromName = 'SELECT TV_ID FROM TESTVERSION WHERE (TV_VERSION="%s")';
SFromName = 'SELECT TV_ID FROM TESTVERSION WHERE (TV_VERSION=''%s'')';
begin
Result:=IDQuery(Format(SFromName,[Name]));
@ -247,7 +247,7 @@ end;
Function GetCPUID(Name : String) : Integer;
Const
SFromName = 'SELECT TC_ID FROM TESTCPU WHERE (TC_NAME="%s")';
SFromName = 'SELECT TC_ID FROM TESTCPU WHERE (TC_NAME=''%s'')';
begin
Result:=IDQuery(Format(SFromName,[Name]));
@ -256,7 +256,7 @@ end;
Function GetCategoryID(Name : String) : Integer;
Const
SFromName = 'SELECT TCAT_ID FROM TESTCATEGORY WHERE (TCAT_NAME="%s")';
SFromName = 'SELECT TCAT_ID FROM TESTCATEGORY WHERE (TCAT_NAME=''%s'')';
begin
Result:=IDQuery(Format(SFromName,[Name]));
@ -270,7 +270,7 @@ Const
' (TU_OS_FK=%d) '+
' AND (TU_CPU_FK=%d) '+
' AND (TU_VERSION_FK=%d) '+
' AND (TU_DATE="%s")';
' AND (TU_DATE=''%s'')';
begin
Result:=IDQuery(Format(SFromIDS,[OSID,CPUID,VERSIONID,SQLDate(Date)]));
@ -288,7 +288,7 @@ Const
SInsertRun = 'INSERT INTO TESTRUN '+
'(TU_OS_FK,TU_CPU_FK,TU_VERSION_FK,TU_CATEGORY_FK,TU_DATE)'+
' VALUES '+
'(%d,%d,%d,%d,"%s") RETURNING TU_ID';
'(%d,%d,%d,%d,''%s'') RETURNING TU_ID';
var
Qry : string;
begin
@ -380,7 +380,7 @@ Function AddTest(Name : String; AddSource : Boolean) : Integer;
Const
SInsertTest = 'INSERT INTO TESTS (T_NAME,T_ADDDATE)'+
' VALUES ("%s",NOW())';
' VALUES (''%s'',NOW())';
Var
Info : TConfig;
@ -414,11 +414,11 @@ Function UpdateTest(ID : Integer; Info : TConfig; Source : String) : Boolean;
Const
SUpdateTest = 'Update TESTS SET '+
' T_CPU="%s", T_OS="%s", T_VERSION="%s",'+
' T_GRAPH="%s", T_INTERACTIVE="%s", T_RESULT=%d,'+
' T_FAIL="%s", T_RECOMPILE="%s", T_NORUN="%s",'+
' T_NEEDLIBRARY="%s", T_KNOWNRUNERROR=%d,'+
' T_KNOWN="%s", T_NOTE="%s", T_OPTS = "%s"'+
' T_CPU=''%s'', T_OS=''%s'', T_VERSION=''%s'','+
' T_GRAPH=''%s'', T_INTERACTIVE=''%s'', T_RESULT=%d,'+
' T_FAIL=''%s'', T_RECOMPILE=''%s'', T_NORUN=''%s'','+
' T_NEEDLIBRARY=''%s'', T_KNOWNRUNERROR=%d,'+
' T_KNOWN=''%s'', T_NOTE=''%s'', T_OPTS = ''%s'''+
' %s '+
'WHERE'+
' T_ID=%d';
@ -431,7 +431,7 @@ begin
If Source<>'' then
begin
Source:=EscapeSQL(Source);
Source:=', T_SOURCE="'+Source+'"';
Source:=', T_SOURCE='''+Source+'''';
end;
With Info do
Qry:=Format(SUpdateTest,[EscapeSQL(NeedCPU),'',EscapeSQL(MinVersion),
@ -453,11 +453,11 @@ Const
SInsertRes='Insert into TESTRESULTS '+
'(TR_TEST_FK,TR_TESTRUN_FK,TR_OK,TR_SKIP,TR_RESULT) '+
' VALUES '+
'(%d,%d,"%s","%s",%d) RETURNING TR_ID';
'(%d,%d,''%s'',''%s'',%d) RETURNING TR_ID';
SSelectId='SELECT TR_ID FROM TESTRESULTS WHERE (TR_TEST_FK=%d) '+
' AND (TR_TESTRUN_FK=%d)';
SInsertLog='Update TESTRESULTS SET TR_LOG="%s"'+
',TR_OK="%s",TR_SKIP="%s",TR_RESULT=%d WHERE (TR_ID=%d)';
SInsertLog='Update TESTRESULTS SET TR_LOG=''%s'''+
',TR_OK=''%s'',TR_SKIP=''%s'',TR_RESULT=%d WHERE (TR_ID=%d)';
Var
Qry : String;
updateValues : boolean;