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

--- Merging r35421 into '.':

Browse Source 
U    packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r35421 into '.':
 U   .

# revisions: 35421

git-svn-id: branches/fixes_3_0@36415 -
This commit is contained in:
marco 2017-06-04 16:55:26 +00:00
parent 61181705e0
commit da0edf83d0
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

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