Skip to content

Commit ebd58c4

Browse files
cincuranetcincuranet
committed
Refactoring.
1 parent c85d220 commit ebd58c4

File tree

12 files changed

+45
-46
lines changed

12 files changed

+45
-46
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void Execute()
5050
Open();
5151
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
5252
startSpb.Append(IscCodes.isc_action_svc_backup);
53-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
53+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
5454
foreach (var file in BackupFiles)
5555
{
5656
startSpb.Append2(IscCodes.isc_spb_bkp_file, file.BackupFile);
@@ -94,7 +94,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
9494
await OpenAsync(cancellationToken).ConfigureAwait(false);
9595
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
9696
startSpb.Append(IscCodes.isc_action_svc_backup);
97-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
97+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
9898
foreach (var file in BackupFiles)
9999
{
100100
startSpb.Append2(IscCodes.isc_spb_bkp_file, file.BackupFile);

‎src/FirebirdSql.Data.FirebirdClient/Services/FbConfiguration.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void SetSqlDialect(int sqlDialect)
4040
Open();
4141
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
4242
startSpb.Append(IscCodes.isc_action_svc_properties);
43-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
43+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
4444
startSpb.Append(IscCodes.isc_spb_prp_set_sql_dialect, sqlDialect);
4545
StartTask(startSpb);
4646
}
@@ -65,7 +65,7 @@ public async Task SetSqlDialectAsync(int sqlDialect, CancellationToken cancellat
6565
await OpenAsync(cancellationToken).ConfigureAwait(false);
6666
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
6767
startSpb.Append(IscCodes.isc_action_svc_properties);
68-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
68+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
6969
startSpb.Append(IscCodes.isc_spb_prp_set_sql_dialect, sqlDialect);
7070
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
7171
}
@@ -91,7 +91,7 @@ public void SetSweepInterval(int sweepInterval)
9191
Open();
9292
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
9393
startSpb.Append(IscCodes.isc_action_svc_properties);
94-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
94+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
9595
startSpb.Append(IscCodes.isc_spb_prp_sweep_interval, sweepInterval);
9696
StartTask(startSpb);
9797
}
@@ -116,7 +116,7 @@ public async Task SetSweepIntervalAsync(int sweepInterval, CancellationToken can
116116
await OpenAsync(cancellationToken).ConfigureAwait(false);
117117
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
118118
startSpb.Append(IscCodes.isc_action_svc_properties);
119-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
119+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
120120
startSpb.Append(IscCodes.isc_spb_prp_sweep_interval, sweepInterval);
121121
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
122122
}
@@ -142,7 +142,7 @@ public void SetPageBuffers(int pageBuffers)
142142
Open();
143143
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
144144
startSpb.Append(IscCodes.isc_action_svc_properties);
145-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
145+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
146146
startSpb.Append(IscCodes.isc_spb_prp_page_buffers, pageBuffers);
147147
StartTask(startSpb);
148148
}
@@ -167,7 +167,7 @@ public async Task SetPageBuffersAsync(int pageBuffers, CancellationToken cancell
167167
await OpenAsync(cancellationToken).ConfigureAwait(false);
168168
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
169169
startSpb.Append(IscCodes.isc_action_svc_properties);
170-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
170+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
171171
startSpb.Append(IscCodes.isc_spb_prp_page_buffers, pageBuffers);
172172
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
173173
}
@@ -193,7 +193,7 @@ public void DatabaseShutdown(FbShutdownMode mode, int seconds)
193193
Open();
194194
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
195195
startSpb.Append(IscCodes.isc_action_svc_properties);
196-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
196+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
197197
switch (mode)
198198
{
199199
case FbShutdownMode.Forced:
@@ -229,7 +229,7 @@ public async Task DatabaseShutdownAsync(FbShutdownMode mode, int seconds, Cancel
229229
await OpenAsync(cancellationToken).ConfigureAwait(false);
230230
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
231231
startSpb.Append(IscCodes.isc_action_svc_properties);
232-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
232+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
233233
switch (mode)
234234
{
235235
case FbShutdownMode.Forced:
@@ -266,7 +266,7 @@ public void DatabaseShutdown2(FbShutdownOnlineMode mode, FbShutdownType type, in
266266
Open();
267267
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
268268
startSpb.Append(IscCodes.isc_action_svc_properties);
269-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
269+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
270270
startSpb.Append(IscCodes.isc_spb_prp_shutdown_mode, FbShutdownOnlineModeToIscCode(mode));
271271
switch (type)
272272
{
@@ -303,7 +303,7 @@ public async Task DatabaseShutdown2Async(FbShutdownOnlineMode mode, FbShutdownTy
303303
await OpenAsync(cancellationToken).ConfigureAwait(false);
304304
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
305305
startSpb.Append(IscCodes.isc_action_svc_properties);
306-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
306+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
307307
startSpb.Append(IscCodes.isc_spb_prp_shutdown_mode, FbShutdownOnlineModeToIscCode(mode));
308308
switch (type)
309309
{
@@ -341,7 +341,7 @@ public void DatabaseOnline()
341341
Open();
342342
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
343343
startSpb.Append(IscCodes.isc_action_svc_properties);
344-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
344+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
345345
startSpb.Append(IscCodes.isc_spb_options, IscCodes.isc_spb_prp_db_online);
346346
StartTask(startSpb);
347347
}
@@ -366,7 +366,7 @@ public async Task DatabaseOnlineAsync(CancellationToken cancellationToken = defa
366366
await OpenAsync(cancellationToken).ConfigureAwait(false);
367367
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
368368
startSpb.Append(IscCodes.isc_action_svc_properties);
369-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
369+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
370370
startSpb.Append(IscCodes.isc_spb_options, IscCodes.isc_spb_prp_db_online);
371371
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
372372
}
@@ -392,7 +392,7 @@ public void DatabaseOnline2(FbShutdownOnlineMode mode)
392392
Open();
393393
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
394394
startSpb.Append(IscCodes.isc_action_svc_properties);
395-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
395+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
396396
startSpb.Append(IscCodes.isc_spb_prp_online_mode, FbShutdownOnlineModeToIscCode(mode));
397397
StartTask(startSpb);
398398
}
@@ -417,7 +417,7 @@ public async Task DatabaseOnline2Async(FbShutdownOnlineMode mode, CancellationTo
417417
await OpenAsync(cancellationToken).ConfigureAwait(false);
418418
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
419419
startSpb.Append(IscCodes.isc_action_svc_properties);
420-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
420+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
421421
startSpb.Append(IscCodes.isc_spb_prp_online_mode, FbShutdownOnlineModeToIscCode(mode));
422422
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
423423
}
@@ -443,7 +443,7 @@ public void ActivateShadows()
443443
Open();
444444
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
445445
startSpb.Append(IscCodes.isc_action_svc_properties);
446-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
446+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
447447
startSpb.Append(IscCodes.isc_spb_options, IscCodes.isc_spb_prp_activate);
448448
StartTask(startSpb);
449449
}
@@ -468,7 +468,7 @@ public async Task ActivateShadowsAsync(CancellationToken cancellationToken = def
468468
await OpenAsync(cancellationToken).ConfigureAwait(false);
469469
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
470470
startSpb.Append(IscCodes.isc_action_svc_properties);
471-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
471+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
472472
startSpb.Append(IscCodes.isc_spb_options, IscCodes.isc_spb_prp_activate);
473473
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
474474
}
@@ -494,7 +494,7 @@ public void SetForcedWrites(bool forcedWrites)
494494
Open();
495495
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
496496
startSpb.Append(IscCodes.isc_action_svc_properties);
497-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
497+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
498498
if (forcedWrites)
499499
{
500500
startSpb.Append(IscCodes.isc_spb_prp_write_mode, (byte)IscCodes.isc_spb_prp_wm_sync);
@@ -526,7 +526,7 @@ public async Task SetForcedWritesAsync(bool forcedWrites, CancellationToken canc
526526
await OpenAsync(cancellationToken).ConfigureAwait(false);
527527
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
528528
startSpb.Append(IscCodes.isc_action_svc_properties);
529-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
529+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
530530
if (forcedWrites)
531531
{
532532
startSpb.Append(IscCodes.isc_spb_prp_write_mode, (byte)IscCodes.isc_spb_prp_wm_sync);
@@ -559,7 +559,7 @@ public void SetReserveSpace(bool reserveSpace)
559559
Open();
560560
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
561561
startSpb.Append(IscCodes.isc_action_svc_properties);
562-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
562+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
563563
if (reserveSpace)
564564
{
565565
startSpb.Append(IscCodes.isc_spb_prp_reserve_space, (byte)IscCodes.isc_spb_prp_res);
@@ -591,7 +591,7 @@ public async Task SetReserveSpaceAsync(bool reserveSpace, CancellationToken canc
591591
await OpenAsync(cancellationToken).ConfigureAwait(false);
592592
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
593593
startSpb.Append(IscCodes.isc_action_svc_properties);
594-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
594+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
595595
if (reserveSpace)
596596
{
597597
startSpb.Append(IscCodes.isc_spb_prp_reserve_space, (byte)IscCodes.isc_spb_prp_res);
@@ -624,7 +624,7 @@ public void SetAccessMode(bool readOnly)
624624
Open();
625625
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
626626
startSpb.Append(IscCodes.isc_action_svc_properties);
627-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
627+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
628628
startSpb.Append(IscCodes.isc_spb_prp_access_mode, (byte)(readOnly ? IscCodes.isc_spb_prp_am_readonly : IscCodes.isc_spb_prp_am_readwrite));
629629
StartTask(startSpb);
630630
}
@@ -649,7 +649,7 @@ public async Task SetAccessModeAsync(bool readOnly, CancellationToken cancellati
649649
await OpenAsync(cancellationToken).ConfigureAwait(false);
650650
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
651651
startSpb.Append(IscCodes.isc_action_svc_properties);
652-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
652+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
653653
startSpb.Append(IscCodes.isc_spb_prp_access_mode, (byte)(readOnly ? IscCodes.isc_spb_prp_am_readonly : IscCodes.isc_spb_prp_am_readwrite));
654654
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
655655
}
@@ -675,7 +675,7 @@ public void NoLinger()
675675
Open();
676676
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
677677
startSpb.Append(IscCodes.isc_action_svc_properties);
678-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
678+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
679679
startSpb.Append(IscCodes.isc_spb_options, IscCodes.isc_spb_prp_nolinger);
680680
StartTask(startSpb);
681681
}
@@ -700,7 +700,7 @@ public async Task NoLingerAsync(CancellationToken cancellationToken = default)
700700
await OpenAsync(cancellationToken).ConfigureAwait(false);
701701
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
702702
startSpb.Append(IscCodes.isc_action_svc_properties);
703-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
703+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
704704
startSpb.Append(IscCodes.isc_spb_options, IscCodes.isc_spb_prp_nolinger);
705705
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
706706
}

‎src/FirebirdSql.Data.FirebirdClient/Services/FbNBackup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void Execute()
5656
Open();
5757
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
5858
startSpb.Append(IscCodes.isc_action_svc_nbak);
59-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
59+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
6060
startSpb.Append(IscCodes.isc_spb_nbk_level, _level);
6161
startSpb.Append2(IscCodes.isc_spb_nbk_file, BackupFile);
6262
startSpb.Append2(IscCodes.isc_spb_nbk_direct, DirectIO ? "ON" : "OFF");
@@ -85,7 +85,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
8585
await OpenAsync(cancellationToken).ConfigureAwait(false);
8686
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
8787
startSpb.Append(IscCodes.isc_action_svc_nbak);
88-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
88+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
8989
startSpb.Append(IscCodes.isc_spb_nbk_level, _level);
9090
startSpb.Append2(IscCodes.isc_spb_nbk_file, BackupFile);
9191
startSpb.Append2(IscCodes.isc_spb_nbk_direct, DirectIO ? "ON" : "OFF");

‎src/FirebirdSql.Data.FirebirdClient/Services/FbNFixup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void Execute()
4040
Open();
4141
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
4242
startSpb.Append(IscCodes.isc_action_svc_nfix);
43-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
43+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
4444
StartTask(startSpb);
4545
ProcessServiceOutput(new ServiceParameterBuffer2(Service.ParameterBufferEncoding));
4646
}
@@ -65,7 +65,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
6565
await OpenAsync(cancellationToken).ConfigureAwait(false);
6666
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
6767
startSpb.Append(IscCodes.isc_action_svc_nfix);
68-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
68+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
6969
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
7070
await ProcessServiceOutputAsync(new ServiceParameterBuffer2(Service.ParameterBufferEncoding), cancellationToken).ConfigureAwait(false);
7171
}

‎src/FirebirdSql.Data.FirebirdClient/Services/FbNRestore.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void Execute()
4545
Open();
4646
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
4747
startSpb.Append(IscCodes.isc_action_svc_nrest);
48-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
48+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
4949
foreach (var file in BackupFiles)
5050
{
5151
startSpb.Append2(IscCodes.isc_spb_nbk_file, file);
@@ -75,7 +75,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
7575
await OpenAsync(cancellationToken).ConfigureAwait(false);
7676
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
7777
startSpb.Append(IscCodes.isc_action_svc_nrest);
78-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
78+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
7979
foreach (var file in BackupFiles)
8080
{
8181
startSpb.Append2(IscCodes.isc_spb_nbk_file, file);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void Execute()
6868
{
6969
startSpb.Append2(IscCodes.isc_spb_bkp_file, bkpFile.BackupFile);
7070
}
71-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
71+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
7272
if (Verbose)
7373
startSpb.Append(IscCodes.isc_spb_verbose);
7474
if (PageBuffers.HasValue)
@@ -113,7 +113,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
113113
{
114114
startSpb.Append2(IscCodes.isc_spb_bkp_file, bkpFile.BackupFile);
115115
}
116-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
116+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
117117
if (Verbose)
118118
startSpb.Append(IscCodes.isc_spb_verbose);
119119
if (PageBuffers.HasValue)

‎src/FirebirdSql.Data.FirebirdClient/Services/FbService.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public abstract class FbService
3939

4040
private protected ServiceManagerBase Service => _svc;
4141
private protected ConnectionString ConnectionStringOptions => _connectionStringOptions;
42-
private protected string Database => _connectionStringOptions.Database;
4342

4443
public FbServiceState State { get; private set; }
4544
public int QueryBufferSize { get; set; }
@@ -525,7 +524,7 @@ private protected void OnServiceOutput(string message)
525524

526525
private protected void EnsureDatabase()
527526
{
528-
if (string.IsNullOrEmpty(Database))
527+
if (string.IsNullOrEmpty(ConnectionStringOptions.Database))
529528
throw FbException.Create("Action should be executed against a specific database.");
530529
}
531530

‎src/FirebirdSql.Data.FirebirdClient/Services/FbStatistical.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void Execute()
4242
Open();
4343
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
4444
startSpb.Append(IscCodes.isc_action_svc_db_stats);
45-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
45+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
4646
startSpb.Append(IscCodes.isc_spb_options, (int)Options);
4747
StartTask(startSpb);
4848
ProcessServiceOutput(new ServiceParameterBuffer2(Service.ParameterBufferEncoding));
@@ -68,7 +68,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken = default)
6868
await OpenAsync(cancellationToken).ConfigureAwait(false);
6969
var startSpb = new ServiceParameterBuffer2(Service.ParameterBufferEncoding);
7070
startSpb.Append(IscCodes.isc_action_svc_db_stats);
71-
startSpb.Append2(IscCodes.isc_spb_dbname, Database);
71+
startSpb.Append2(IscCodes.isc_spb_dbname, ConnectionStringOptions.Database);
7272
startSpb.Append(IscCodes.isc_spb_options, (int)Options);
7373
await StartTaskAsync(startSpb, cancellationToken).ConfigureAwait(false);
7474
await ProcessServiceOutputAsync(new ServiceParameterBuffer2(Service.ParameterBufferEncoding), cancellationToken).ConfigureAwait(false);

0 commit comments

Comments
 (0)