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

Comparing ibx/trunk/fbintf/testsuite/Test11.pas (file contents):
Revision 56 by tony, Mon Mar 6 10:20:02 2017 UTC vs.
Revision 308 by tony, Sat Jul 18 10:26:30 2020 UTC

# Line 196 | Line 196 | begin
196          QueryResultsItem := Results.Find(isc_info_svc_to_eof);
197          if QueryResultsItem <> nil then
198            bytesWritten := QueryResultsItem.CopyTo(BakFile,0);
199 <      until (bytesWritten = 0) or not WriteServiceQueryResult(Results);
199 >      until ((bytesWritten = 0) and (Results.Find(isc_info_svc_timeout) = nil))
200 >        or not WriteServiceQueryResult(Results);
201        writeln(OutFile,'Local Backup Complete');
202      finally
203        BakFile.Free;
# Line 208 | Line 209 | begin
209  
210    {Local Restore}
211    writeln(OutFile,'Local Restore');
212 <  RestoreDBName := Owner.GetNewDatabaseName;
212 >  RestoreDBName := ExtractDBName(Owner.GetNewDatabaseName);
213    i := Pos(':',RestoreDBName);
214    if i > 0 then
215      system.Delete(RestoreDBName,1,i);
# Line 266 | Line 267 | end;
267   procedure TTest11.RunTest(CharSet: AnsiString; SQLDialect: integer);
268   var SPB: ISPB;
269      Service: IServiceManager;
269    I: integer;
270      ServerName: AnsiString;
271      DBName: AnsiString;
272   begin
273    if not FirebirdAPI.HasServiceAPI then Exit;
274  
275 <  ServerName := Owner.GetEmployeeDatabaseName;
276 <  I := Pos(':',ServerName);
277 <  if i > 0 then
278 <    DBName := system.copy(ServerName,i+1,length(ServerName) - 2);
279 <  system.Delete(ServerName,i,Length(ServerName)-i+1);
275 >  DBName := ExtractDBName(Owner.GetEmployeeDatabaseName);
276 >  ServerName := Owner.Server;
277  
278    SPB := FirebirdAPI.AllocateSPB;
279    SPB.Add(isc_spb_user_name).setAsString(Owner.GetUserName);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines