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

* Better check for empty Refresh SQL statement

Browse Source 
git-svn-id: trunk@35421 -
This commit is contained in:
michael 2017-02-11 14:03:38 +00:00
parent 89c2d0a9dc
commit 3bd8da04c7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fcl-db/src/sqldb/sqldb.pp
View File

@ -1934,7 +1934,7 @@ Var
Where : String;
begin
Result:=Query.RefreshSQL.Text;
Result:=Trim(Query.RefreshSQL.Text);
if (Result='') then
begin
Where:='';
@ -1985,7 +1985,7 @@ var
begin
qry:=Nil;
ReturningClause:=(sqSupportReturning in ConnOptions) and not (sqoRefreshUsingSelect in Query.Options) and (Query.RefreshSQL.Count=0);
ReturningClause:=(sqSupportReturning in ConnOptions) and not (sqoRefreshUsingSelect in Query.Options) and (Trim(Query.RefreshSQL.Text)='');
case UpdateKind of
ukInsert : begin
s := Trim(Query.FInsertSQL.Text);
@ -2570,7 +2570,7 @@ Var
DoReturning : Boolean;
begin
Result:=(FRefreshSQL.Count<>0);
Result:=(Trim(FRefreshSQL.Text)<>'');
DoReturning:=(sqSupportReturning in SQLConnection.ConnOptions) and not (sqoRefreshUsingSelect in Options);
if Not (Result or DoReturning) then
begin