File tree Expand file tree Collapse file tree 4 files changed +12
-8
lines changed
FirebirdSql.Data.FirebirdClient.Tests
FirebirdSql.Data.FirebirdClient/Services Expand file tree Collapse file tree 4 files changed +12
-8
lines changed Original file line number Diff line number Diff line change @@ -90,12 +90,12 @@ public async Task BackupRestoreVerbIntTest()
9090 var connectionString = csb . ToString ( ) ;
9191 await BackupPartHelper ( backupName , connectionString , x =>
9292 {
93- x . Verbose = true ;
93+ x . Verbose = false ;
9494 x . VerboseInterval = 1_000_000 ;
9595 } ) ;
9696 await RestorePartHelper ( backupName , connectionString , x =>
9797 {
98- x . Verbose = true ;
98+ x . Verbose = false ;
9999 x . VerboseInterval = 1_000_000 ;
100100 } ) ;
101101 // test the database was actually restored fine
Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ public void Execute()
7171 if ( ConnectionStringOptions . ParallelWorkers > 0 )
7272 startSpb . Append ( IscCodes . isc_spb_bkp_parallel_workers , ConnectionStringOptions . ParallelWorkers ) ;
7373 StartTask ( startSpb ) ;
74- if ( Verbose )
74+ if ( Verbose || VerboseInterval . HasValue )
7575 {
7676 ProcessServiceOutput ( new ServiceParameterBuffer2 ( Service . ParameterBufferEncoding ) ) ;
7777 }
@@ -106,6 +106,8 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
106106 }
107107 if ( Verbose )
108108 startSpb . Append ( IscCodes . isc_spb_verbose ) ;
109+ if ( VerboseInterval . HasValue )
110+ startSpb . Append ( IscCodes . isc_spb_verbint , ( int ) VerboseInterval ) ;
109111 if ( Factor > 0 )
110112 startSpb . Append ( IscCodes . isc_spb_bkp_factor , Factor ) ;
111113 if ( ! string . IsNullOrEmpty ( SkipData ) )
@@ -115,7 +117,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
115117 if ( ConnectionStringOptions . ParallelWorkers > 0 )
116118 startSpb . Append ( IscCodes . isc_spb_bkp_parallel_workers , ConnectionStringOptions . ParallelWorkers ) ;
117119 await StartTaskAsync ( startSpb , cancellationToken ) . ConfigureAwait ( false ) ;
118- if ( Verbose )
120+ if ( Verbose || VerboseInterval . HasValue )
119121 {
120122 await ProcessServiceOutputAsync ( new ServiceParameterBuffer2 ( Service . ParameterBufferEncoding ) , cancellationToken ) . ConfigureAwait ( false ) ;
121123 }
Original file line number Diff line number Diff line change @@ -86,7 +86,7 @@ public void Execute()
8686 if ( ConnectionStringOptions . ParallelWorkers > 0 )
8787 startSpb . Append ( IscCodes . isc_spb_res_parallel_workers , ConnectionStringOptions . ParallelWorkers ) ;
8888 StartTask ( startSpb ) ;
89- if ( Verbose )
89+ if ( Verbose || VerboseInterval . HasValue )
9090 {
9191 ProcessServiceOutput ( new ServiceParameterBuffer2 ( Service . ParameterBufferEncoding ) ) ;
9292 }
@@ -119,6 +119,8 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
119119 startSpb . Append2 ( IscCodes . isc_spb_dbname , ConnectionStringOptions . Database ) ;
120120 if ( Verbose )
121121 startSpb . Append ( IscCodes . isc_spb_verbose ) ;
122+ if ( VerboseInterval . HasValue )
123+ startSpb . Append ( IscCodes . isc_spb_verbint , ( int ) VerboseInterval ) ;
122124 if ( PageBuffers . HasValue )
123125 startSpb . Append ( IscCodes . isc_spb_res_buffers , ( int ) PageBuffers ) ;
124126 if ( _pageSize . HasValue )
@@ -131,7 +133,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
131133 if ( ConnectionStringOptions . ParallelWorkers > 0 )
132134 startSpb . Append ( IscCodes . isc_spb_res_parallel_workers , ConnectionStringOptions . ParallelWorkers ) ;
133135 await StartTaskAsync ( startSpb , cancellationToken ) . ConfigureAwait ( false ) ;
134- if ( Verbose )
136+ if ( Verbose || VerboseInterval . HasValue )
135137 {
136138 await ProcessServiceOutputAsync ( new ServiceParameterBuffer2 ( Service . ParameterBufferEncoding ) , cancellationToken ) . ConfigureAwait ( false ) ;
137139 }
Original file line number Diff line number Diff line change @@ -109,9 +109,9 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
109109 startSpb . Append2 ( IscCodes . isc_spb_bkp_file , "stdin" ) ;
110110 startSpb . Append2 ( IscCodes . isc_spb_dbname , ConnectionStringOptions . Database ) ;
111111 if ( Verbose )
112- {
113112 startSpb . Append ( IscCodes . isc_spb_verbose ) ;
114- }
113+ if ( VerboseInterval . HasValue )
114+ startSpb . Append ( IscCodes . isc_spb_verbint , ( int ) VerboseInterval ) ;
115115 if ( PageBuffers . HasValue )
116116 startSpb . Append ( IscCodes . isc_spb_res_buffers , ( int ) PageBuffers ) ;
117117 if ( _pageSize . HasValue )
You can’t perform that action at this time.
0 commit comments