Skip to content

Commit c6322d4

Browse files
author
Arnaud Bouchez
committed
db: fixed another regression in ZDBC connector
1 parent 18d8976 commit c6322d4

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/db/mormot.db.sql.ibx.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ procedure TSqlDBIbxStatement.ColumnToJson(Col: integer; W: TJsonWriter);
10051005
SQL_TYPE_DATE:
10061006
begin
10071007
W.Add('"');
1008-
W.AddDateTime(fResults[Col].GetAsDateTime, fForceDateWithMS);
1008+
W.AddDateTime(fResults[Col].GetAsDateTime, dsfForceDateWithMS in fFlags);
10091009
W.AddDirect('"');
10101010
end;
10111011
SQL_BOOLEAN:

src/db/mormot.db.sql.pas

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,8 +1317,9 @@ TSqlDBConnectionProperties = class
13171317
fOnTableCreate: TOnTableCreate;
13181318
fOnTableAddColumn: TOnTableAddColumn;
13191319
fOnTableCreateMultiIndex: TOnTableCreateMultiIndex;
1320-
procedure SetFlag(flag: TSqlDBConnectionPropertiesFlag; value: boolean);
1321-
function GetFlag(flag: TSqlDBConnectionPropertiesFlag): boolean;
1320+
procedure SetFlag(const flag: TSqlDBConnectionPropertiesFlag; const value: boolean);
1321+
{$ifdef HASINLINE}inline;{$endif}
1322+
function GetFlag(const flag: TSqlDBConnectionPropertiesFlag): boolean;
13221323
{$ifdef HASINLINE} inline; {$endif}
13231324
procedure SetConnectionTimeOutMinutes(minutes: cardinal);
13241325
function GetConnectionTimeOutMinutes: cardinal;
@@ -3662,16 +3663,17 @@ function TSqlDBConnectionProperties.ExecuteInlined(const SqlFormat: RawUtf8;
36623663
result := ExecuteInlined(sql, ExpectResults);
36633664
end;
36643665

3665-
procedure TSqlDBConnectionProperties.SetFlag(flag: TSqlDBConnectionPropertiesFlag;
3666-
value: boolean);
3666+
procedure TSqlDBConnectionProperties.SetFlag(
3667+
const flag: TSqlDBConnectionPropertiesFlag; const value: boolean);
36673668
begin
36683669
if value then
36693670
include(fFlags, flag)
36703671
else
36713672
exclude(fFlags, flag);
36723673
end;
36733674

3674-
function TSqlDBConnectionProperties.GetFlag(flag: TSqlDBConnectionPropertiesFlag): boolean;
3675+
function TSqlDBConnectionProperties.GetFlag(
3676+
const flag: TSqlDBConnectionPropertiesFlag): boolean;
36753677
begin
36763678
result := flag in fFlags;
36773679
end;

src/mormot.commit.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
'2.3.12797'
1+
'2.3.12798'

0 commit comments

Comments
 (0)