diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-04 16:55:26 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-04 16:55:26 +0000 |
| commit | a0ad7ce5d86e2010825b01968d22c25d2fa3a1f9 (patch) | |
| tree | 9b9c94466f9a98a1dbf1f49808848b22b6b2a295 | |
| parent | c4a2c163e88002decb9cbef0a202ad187a21577d (diff) | |
| download | fpc-a0ad7ce5d86e2010825b01968d22c25d2fa3a1f9.tar.gz | |
--- Merging r35421 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r35421 into '.':
U .
# revisions: 35421
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36415 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/fcl-db/src/sqldb/sqldb.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/fcl-db/src/sqldb/sqldb.pp b/packages/fcl-db/src/sqldb/sqldb.pp index 4a1caaf6d9..390cd67073 100644 --- a/packages/fcl-db/src/sqldb/sqldb.pp +++ b/packages/fcl-db/src/sqldb/sqldb.pp @@ -1861,7 +1861,7 @@ Var Where : String; begin - Result:=Query.RefreshSQL.Text; + Result:=Trim(Query.RefreshSQL.Text); if (Result='') then begin Where:=''; @@ -1912,7 +1912,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); @@ -2497,7 +2497,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 |