ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/branches/journaling/runtime/nongui/IBCustomDataSet.pas
(Generate patch)

Comparing:
ibx/trunk/runtime/nongui/IBCustomDataSet.pas (file contents), Revision 315 by tony, Thu Feb 25 11:56:36 2021 UTC vs.
ibx/branches/journaling/runtime/nongui/IBCustomDataSet.pas (file contents), Revision 362 by tony, Tue Dec 7 13:27:39 2021 UTC

# Line 737 | Line 737 | type
737      property TZTextOption: TTZTextOptions read FTZTextOption write FTZTextOption;
738      property SQLFiltered: boolean read FSQLFiltered write SetSQLFiltered;
739      property SQLFilterParams: TStrings read FSQLFilterParams write SetSQLFilterParams;
740 –    property SQLFiltered: boolean read FSQLFiltered write SetSQLFiltered;
741 –    property SQLFilterParams: TStrings read FSQLFilterParams write SetSQLFilterParams;
740  
741      property BeforeDatabaseDisconnect: TNotifyEvent read FBeforeDatabaseDisconnect
742                                                   write FBeforeDatabaseDisconnect;
# Line 1033 | Line 1031 | const
1031      TIBDateTimeField,   { ftTimestamp }
1032      TFmtBCDField,       { ftFMTBcd }
1033      nil,                { ftFixedWideChar }
1034 <    nil);               { ftWideMemo }
1035 < (*
1036 <    TADTField,          { ftADT }
1037 <    TArrayField,        { ftArray }
1038 <    TReferenceField,    { ftReference }
1039 <    TDataSetField,     { ftDataSet }
1040 <    TBlobField,         { ftOraBlob }
1041 <    TMemoField,         { ftOraClob }
1042 <    TVariantField,      { ftVariant }
1043 <    TInterfaceField,    { ftInterface }
1044 <    TIDispatchField,     { ftIDispatch }
1045 <    TGuidField);        { ftGuid } *)
1034 >    nil                 { ftWideMemo }
1035 > {$IF declared(ftOraTimeStamp)}
1036 >    {These six extra elements were added to the FPC fixes_3_2 branch in Q3 2021}
1037 >    ,
1038 >    nil,                {ftOraTimeStamp}
1039 >    nil,                {ftOraInterval}
1040 >    nil,                {ftLongWord}
1041 >    nil,                {ftShortint}
1042 >    nil,                {ftByte}
1043 >    nil                 {ftExtended}
1044 > {$IFEND}
1045 >    );
1046   (*var
1047    CreateProviderProc: function(DataSet: TIBCustomDataSet): IProvider = nil;*)
1048  
# Line 1856 | Line 1854 | begin
1854    FDataLink := TIBDataLink.Create(Self);
1855    FQDelete := TIBSQL.Create(Self);
1856    FQDelete.OnSQLChanging := SQLChanging;
1857 <  FQDelete.GoToFirstRecordOnExecute := False;
1857 >  FQDelete.GoToFirstRecordOnExecute := True;
1858    FQInsert := TIBSQL.Create(Self);
1859    FQInsert.OnSQLChanging := SQLChanging;
1860 <  FQInsert.GoToFirstRecordOnExecute := False;
1860 >  FQInsert.GoToFirstRecordOnExecute := true;
1861    FQRefresh := TIBSQL.Create(Self);
1862    FQRefresh.OnSQLChanging := SQLChanging;
1863    FQRefresh.GoToFirstRecordOnExecute := False;
# Line 1869 | Line 1867 | begin
1867    FQSelect.GoToFirstRecordOnExecute := False;
1868    FQModify := TIBSQL.Create(Self);
1869    FQModify.OnSQLChanging := SQLChanging;
1870 <  FQModify.GoToFirstRecordOnExecute := False;
1870 >  FQModify.GoToFirstRecordOnExecute := True;  {In Firebird 5, Update..Returning returns a cursor}
1871    FUpdateRecordTypes := [cusUnmodified, cusModified, cusInserted];
1872    FParamCheck := True;
1873    FGenerateParamNames := False;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines