Commit 410bdbf

committed

Fix output for verbint.

1 parent 15aa93b commit 410bdbfCopy full SHA for 410bdbf

File tree

4 files changed

+12

-8

lines changed

src
- FirebirdSql.Data.FirebirdClient.Tests
  - FbServicesTests.cs
- FirebirdSql.Data.FirebirdClient/Services

4 files changed

+12

-8

lines changed

`‎src/FirebirdSql.Data.FirebirdClient.Tests/FbServicesTests.cs`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,12 +90,12 @@ public async Task BackupRestoreVerbIntTest()`
`90`	`90`	`var connectionString = csb.ToString();`
`91`	`91`	`await BackupPartHelper(backupName, connectionString, x =>`
`92`	`92`	`{`
`93`		`- x.Verbose = true;`
	`93`	`+ x.Verbose = false;`
`94`	`94`	`x.VerboseInterval = 1_000_000;`
`95`	`95`	`});`
`96`	`96`	`await RestorePartHelper(backupName, connectionString, x =>`
`97`	`97`	`{`
`98`		`- x.Verbose = true;`
	`98`	`+ x.Verbose = false;`
`99`	`99`	`x.VerboseInterval = 1_000_000;`
`100`	`100`	`});`
`101`	`101`	`// test the database was actually restored fine`

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbBackup.cs`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public void Execute()`
`71`	`71`	`if (ConnectionStringOptions.ParallelWorkers > 0)`
`72`	`72`	`startSpb.Append(IscCodes.isc_spb_bkp_parallel_workers, ConnectionStringOptions.ParallelWorkers);`
`73`	`73`	`StartTask(startSpb);`
`74`		`- if (Verbose)`
	`74`	`+ if (Verbose\|\|VerboseInterval.HasValue)`
`75`	`75`	`{`
`76`	`76`	`ProcessServiceOutput(new ServiceParameterBuffer2(Service.ParameterBufferEncoding));`
`77`	`77`	`}`
`@@ -106,6 +106,8 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)`
`106`	`106`	`}`
`107`	`107`	`if (Verbose)`
`108`	`108`	`startSpb.Append(IscCodes.isc_spb_verbose);`
	`109`	`+ if (VerboseInterval.HasValue)`
	`110`	`+ startSpb.Append(IscCodes.isc_spb_verbint, (int)VerboseInterval);`
`109`	`111`	`if (Factor > 0)`
`110`	`112`	`startSpb.Append(IscCodes.isc_spb_bkp_factor, Factor);`
`111`	`113`	`if (!string.IsNullOrEmpty(SkipData))`
`@@ -115,7 +117,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)`
`115`	`117`	`if (ConnectionStringOptions.ParallelWorkers > 0)`
`116`	`118`	`startSpb.Append(IscCodes.isc_spb_bkp_parallel_workers, ConnectionStringOptions.ParallelWorkers);`
`117`	`119`	`await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);`
`118`		`- if (Verbose)`
	`120`	`+ if (Verbose\|\|VerboseInterval.HasValue)`
`119`	`121`	`{`
`120`	`122`	`await ProcessServiceOutputAsync(new ServiceParameterBuffer2(Service.ParameterBufferEncoding), cancellationToken).ConfigureAwait(false);`
`121`	`123`	`}`

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbRestore.cs`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public void Execute()`
`86`	`86`	`if (ConnectionStringOptions.ParallelWorkers > 0)`
`87`	`87`	`startSpb.Append(IscCodes.isc_spb_res_parallel_workers, ConnectionStringOptions.ParallelWorkers);`
`88`	`88`	`StartTask(startSpb);`
`89`		`- if (Verbose)`
	`89`	`+ if (Verbose\|\|VerboseInterval.HasValue)`
`90`	`90`	`{`
`91`	`91`	`ProcessServiceOutput(new ServiceParameterBuffer2(Service.ParameterBufferEncoding));`
`92`	`92`	`}`
`@@ -119,6 +119,8 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)`
`119`	`119`	`startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);`
`120`	`120`	`if (Verbose)`
`121`	`121`	`startSpb.Append(IscCodes.isc_spb_verbose);`
	`122`	`+ if (VerboseInterval.HasValue)`
	`123`	`+ startSpb.Append(IscCodes.isc_spb_verbint, (int)VerboseInterval);`
`122`	`124`	`if (PageBuffers.HasValue)`
`123`	`125`	`startSpb.Append(IscCodes.isc_spb_res_buffers, (int)PageBuffers);`
`124`	`126`	`if (_pageSize.HasValue)`
`@@ -131,7 +133,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)`
`131`	`133`	`if (ConnectionStringOptions.ParallelWorkers > 0)`
`132`	`134`	`startSpb.Append(IscCodes.isc_spb_res_parallel_workers, ConnectionStringOptions.ParallelWorkers);`
`133`	`135`	`await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);`
`134`		`- if (Verbose)`
	`136`	`+ if (Verbose\|\|VerboseInterval.HasValue)`
`135`	`137`	`{`
`136`	`138`	`await ProcessServiceOutputAsync(new ServiceParameterBuffer2(Service.ParameterBufferEncoding), cancellationToken).ConfigureAwait(false);`
`137`	`139`	`}`

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbStreamingRestore.cs`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,9 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)`
`109`	`109`	`startSpb.Append2(IscCodes.isc_spb_bkp_file, "stdin");`
`110`	`110`	`startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);`
`111`	`111`	`if (Verbose)`
`112`		`- {`
`113`	`112`	`startSpb.Append(IscCodes.isc_spb_verbose);`
`114`		`- }`
	`113`	`+ if (VerboseInterval.HasValue)`
	`114`	`+ startSpb.Append(IscCodes.isc_spb_verbint, (int)VerboseInterval);`
`115`	`115`	`if (PageBuffers.HasValue)`
`116`	`116`	`startSpb.Append(IscCodes.isc_spb_res_buffers, (int)PageBuffers);`
`117`	`117`	`if (_pageSize.HasValue)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 410bdbf

File tree

4 files changed

4 files changed

`‎src/FirebirdSql.Data.FirebirdClient.Tests/FbServicesTests.cs`

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbBackup.cs`

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbRestore.cs`

`‎src/FirebirdSql.Data.FirebirdClient/Services/FbStreamingRestore.cs`

0 commit comments