ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/iblocaldb/gui/IBXUpgradeDatabaseDlg.pas
(Generate patch)

Comparing ibx/trunk/iblocaldb/gui/IBXUpgradeDatabaseDlg.pas (file contents):
Revision 272 by tony, Mon Feb 4 13:34:37 2019 UTC vs.
Revision 345 by tony, Mon Aug 23 14:22:29 2021 UTC

# Line 59 | Line 59 | type
59      FUpgradeLog: TStrings;
60      FTargetVersionNo: integer;
61      FUpgradeConf: TUpgradeConfFile;
62 +    FSectionHeaderTemplate: string;
63      FArchiveStub: string;
64      procedure DoUpdate(Data: PtrInt);
65      function CurrentDBVersionNo: integer;
# Line 80 | Line 81 | var
81   function RunUpgradeDatabase(aDatabase: TIBDatabase;
82                              aBackupService: TIBXServerSideBackupService;
83                              UpgradeConf: TUpgradeConfFile;
84 +                            SectionHeaderTemplate: string;
85                              ArchiveStub: string;
86                              TargetVersionNo: integer;
87                              aOnGetDatabaseVersionNo: TGetDatabaseVersionNo;
# Line 100 | Line 102 | resourcestring
102    sUpdateFailed    = 'Update Failed - %s';
103  
104   function RunUpgradeDatabase(aDatabase: TIBDatabase;
105 <  aBackupService: TIBXServerSideBackupService;
106 <  UpgradeConf: TUpgradeConfFile; ArchiveStub: string; TargetVersionNo: integer;
105 >  aBackupService: TIBXServerSideBackupService; UpgradeConf: TUpgradeConfFile;
106 >  SectionHeaderTemplate: string; ArchiveStub: string; TargetVersionNo: integer;
107    aOnGetDatabaseVersionNo: TGetDatabaseVersionNo;
108    aOnUpgradeStepCompleted: TNotifyEvent): boolean;
109   begin
# Line 113 | Line 115 | begin
115      FTargetVersionNo := TargetVersionNo;
116      FBackupService := aBackupService;
117      FUpgradeConf := UpgradeConf;
118 +    FSectionHeaderTemplate := SectionHeaderTemplate;
119      FArchiveStub := ArchiveStub;
120      IBXScript.Database := aDatabase;
121      UpdateTransaction.DefaultDatabase := aDatabase;
# Line 185 | Line 188 | begin
188      repeat
189        if CurVersionNo >= FTargetVersionNo then break;
190        LastVersionNo := CurVersionNo;
191 <      UpdateAvailable := FUpgradeConf.GetUpgradeInfo(CurVersionNo+1,UpgradeInfo);
191 >      UpdateAvailable := FUpgradeConf.GetUpgradeInfo(FSectionHeaderTemplate,CurVersionNo+1,UpgradeInfo);
192        if UpdateAvailable then
193        begin
194          if UpgradeInfo.BackupDB and (FBackupService <> nil) then

Diff Legend

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