Skip to content

Commit 8364248

Browse files
cincuranetcincuranet
committed
FbConnectionString renamed to ConnectionString and moved to Common.
1 parent 195f15c commit 8364248

File tree

10 files changed

+150
-147
lines changed

10 files changed

+150
-147
lines changed

‎Provider/src/FirebirdSql.Data.FirebirdClient.Tests/FbConnectionStringTests.cs‎ renamed to ‎Provider/src/FirebirdSql.Data.FirebirdClient.Tests/ConnectionStringTests.cs‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@
1717

1818
using System.Globalization;
1919
using System.Threading;
20+
using FirebirdSql.Data.Common;
2021
using NUnit.Framework;
2122

2223
namespace FirebirdSql.Data.FirebirdClient.Tests
2324
{
24-
public class FbConnectionStringTests
25+
public class ConnectionStringTests
2526
{
2627
[Test]
2728
public void ParsingNormalConnectionStringTest()
2829
{
2930
const string ConnectionString = "datasource=testserver;database=testdb.fdb;user=testuser;password=testpwd";
30-
var cs = new FbConnectionString(ConnectionString);
31+
var cs = new ConnectionString(ConnectionString);
3132
Assert.AreEqual("testserver", cs.DataSource);
3233
Assert.AreEqual("testdb.fdb", cs.Database);
3334
Assert.AreEqual("testuser", cs.UserID);
@@ -38,7 +39,7 @@ public void ParsingNormalConnectionStringTest()
3839
public void ParsingFullDatabaseConnectionStringTest()
3940
{
4041
const string ConnectionString = "database=testserver/1234:testdb.fdb;user=testuser;password=testpwd";
41-
var cs = new FbConnectionString(ConnectionString);
42+
var cs = new ConnectionString(ConnectionString);
4243
Assert.AreEqual("testserver", cs.DataSource);
4344
Assert.AreEqual("testdb.fdb", cs.Database);
4445
Assert.AreEqual("testuser", cs.UserID);
@@ -50,39 +51,39 @@ public void ParsingFullDatabaseConnectionStringTest()
5051
public void ParsingSingleQuotedConnectionStringTest()
5152
{
5253
const string ConnectionString = "datasource=testserver;database=testdb.fdb;user=testuser;password=test'pwd";
53-
var cs = new FbConnectionString(ConnectionString);
54+
var cs = new ConnectionString(ConnectionString);
5455
Assert.AreEqual("test'pwd", cs.Password);
5556
}
5657

5758
[Test]
5859
public void ParsingDoubleQuotedConnectionStringTest()
5960
{
6061
const string ConnectionString = "datasource=testserver;database=testdb.fdb;user=testuser;password=test\"pwd";
61-
var cs = new FbConnectionString(ConnectionString);
62+
var cs = new ConnectionString(ConnectionString);
6263
Assert.AreEqual("test\"pwd", cs.Password);
6364
}
6465

6566
[Test]
6667
public void ParsingSpacesInKeyConnectionStringTest()
6768
{
6869
const string ConnectionString = "data source=testserver";
69-
var cs = new FbConnectionString(ConnectionString);
70+
var cs = new ConnectionString(ConnectionString);
7071
Assert.AreEqual("testserver", cs.DataSource);
7172
}
7273

7374
[Test]
7475
public void ParsingOneCharValueConnectionStringTest()
7576
{
7677
const string ConnectionString = "connection lifetime=6";
77-
var cs = new FbConnectionString(ConnectionString);
78+
var cs = new ConnectionString(ConnectionString);
7879
Assert.AreEqual(6, cs.ConnectionLifetime);
7980
}
8081

8182
[Test]
8283
public void ParsingWithEndingSemicolonConnectionStringTest()
8384
{
8485
const string ConnectionString = "user=testuser;password=testpwd;";
85-
var cs = new FbConnectionString(ConnectionString);
86+
var cs = new ConnectionString(ConnectionString);
8687
Assert.AreEqual("testuser", cs.UserID);
8788
Assert.AreEqual("testpwd", cs.Password);
8889
}
@@ -91,7 +92,7 @@ public void ParsingWithEndingSemicolonConnectionStringTest()
9192
public void ParsingWithoutEndingSemicolonConnectionStringTest()
9293
{
9394
const string ConnectionString = "user=testuser;password=testpwd";
94-
var cs = new FbConnectionString(ConnectionString);
95+
var cs = new ConnectionString(ConnectionString);
9596
Assert.AreEqual("testuser", cs.UserID);
9697
Assert.AreEqual("testpwd", cs.Password);
9798
}
@@ -111,7 +112,7 @@ public void ParsingMultilineConnectionStringTest()
111112
Connection timeout=15;
112113
Pooling=True;
113114
Packet Size=8192;";
114-
var cs = new FbConnectionString(ConnectionString);
115+
var cs = new ConnectionString(ConnectionString);
115116
Assert.AreEqual("Termine", cs.Database);
116117
Assert.AreEqual("", cs.Role);
117118
}
@@ -120,7 +121,7 @@ public void ParsingMultilineConnectionStringTest()
120121
public void NormalizedConnectionStringIgnoresCultureTest()
121122
{
122123
const string ConnectionString = "datasource=testserver;database=testdb.fdb;user=testuser;password=testpwd";
123-
var cs = new FbConnectionString(ConnectionString);
124+
var cs = new ConnectionString(ConnectionString);
124125
Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo("en-GB");
125126
var s1 = cs.NormalizedConnectionString;
126127
Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo("cs-CZ");
@@ -133,7 +134,7 @@ public void NormalizedConnectionStringIgnoresCultureTest()
133134
public void ParsingWithEmptyKeyConnectionStringTest()
134135
{
135136
const string ConnectionString = "user=;password=testpwd";
136-
var cs = new FbConnectionString(ConnectionString);
137+
var cs = new ConnectionString(ConnectionString);
137138
Assert.AreEqual("", cs.UserID);
138139
Assert.AreEqual("testpwd", cs.Password);
139140
}
@@ -142,7 +143,7 @@ public void ParsingWithEmptyKeyConnectionStringTest()
142143
public void ParsingWithWhiteSpacesKeyConnectionStringTest()
143144
{
144145
const string ConnectionString = "user= \t;password=testpwd";
145-
var cs = new FbConnectionString(ConnectionString);
146+
var cs = new ConnectionString(ConnectionString);
146147
Assert.AreEqual("", cs.UserID);
147148
Assert.AreEqual("testpwd", cs.Password);
148149
}
@@ -151,39 +152,39 @@ public void ParsingWithWhiteSpacesKeyConnectionStringTest()
151152
public void CryptKeyWithBase64FullPadding()
152153
{
153154
const string ConnectionString = "user=u;cryptkey=dGVzdA==;password=p";
154-
var cs = new FbConnectionString(ConnectionString);
155+
var cs = new ConnectionString(ConnectionString);
155156
Assert.AreEqual("test", cs.CryptKey);
156157
}
157158

158159
[Test]
159160
public void CryptKeyWithBase64SinglePadding()
160161
{
161162
const string ConnectionString = "user=u;cryptkey=YWE=;password=p";
162-
var cs = new FbConnectionString(ConnectionString);
163+
var cs = new ConnectionString(ConnectionString);
163164
Assert.AreEqual("aa", cs.CryptKey);
164165
}
165166

166167
[Test]
167168
public void CryptKeyWithBase64NoPadding()
168169
{
169170
const string ConnectionString = "user=u;cryptkey=YWFh;password=p";
170-
var cs = new FbConnectionString(ConnectionString);
171+
var cs = new ConnectionString(ConnectionString);
171172
Assert.AreEqual("aaa", cs.CryptKey);
172173
}
173174

174175
[Test]
175176
public void WireCryptMixedCase()
176177
{
177178
const string ConnectionString = "wire crYpt=reQUIREd";
178-
var cs = new FbConnectionString(ConnectionString);
179+
var cs = new ConnectionString(ConnectionString);
179180
Assert.AreEqual(FbWireCrypt.Required, cs.WireCrypt);
180181
}
181182

182183
[Test]
183184
public void ParsingDatabaseNewStyleHostnameWithoutPortWithoutPath()
184185
{
185186
const string ConnectionString = "database=//hostname/test.fdb";
186-
var cs = new FbConnectionString(ConnectionString);
187+
var cs = new ConnectionString(ConnectionString);
187188
Assert.AreEqual("hostname", cs.DataSource);
188189
Assert.AreEqual("test.fdb", cs.Database);
189190
}
@@ -192,7 +193,7 @@ public void ParsingDatabaseNewStyleHostnameWithoutPortWithoutPath()
192193
public void ParsingDatabaseNewStyleHostnameWithoutPortRootPath()
193194
{
194195
const string ConnectionString = "database=//hostname//test.fdb";
195-
var cs = new FbConnectionString(ConnectionString);
196+
var cs = new ConnectionString(ConnectionString);
196197
Assert.AreEqual("hostname", cs.DataSource);
197198
Assert.AreEqual("/test.fdb", cs.Database);
198199
}
@@ -201,7 +202,7 @@ public void ParsingDatabaseNewStyleHostnameWithoutPortRootPath()
201202
public void ParsingDatabaseNewStyleHostnameWithoutPortDrivePath()
202203
{
203204
const string ConnectionString = "database=//hostname/C:\\test.fdb";
204-
var cs = new FbConnectionString(ConnectionString);
205+
var cs = new ConnectionString(ConnectionString);
205206
Assert.AreEqual("hostname", cs.DataSource);
206207
Assert.AreEqual("C:\\test.fdb", cs.Database);
207208
}
@@ -210,7 +211,7 @@ public void ParsingDatabaseNewStyleHostnameWithoutPortDrivePath()
210211
public void ParsingDatabaseNewStyleIP4WithoutPortWithoutPath()
211212
{
212213
const string ConnectionString = "database=//127.0.0.1/test.fdb";
213-
var cs = new FbConnectionString(ConnectionString);
214+
var cs = new ConnectionString(ConnectionString);
214215
Assert.AreEqual("127.0.0.1", cs.DataSource);
215216
Assert.AreEqual("test.fdb", cs.Database);
216217
}
@@ -219,7 +220,7 @@ public void ParsingDatabaseNewStyleIP4WithoutPortWithoutPath()
219220
public void ParsingDatabaseNewStyleIP4WithoutPortRootPath()
220221
{
221222
const string ConnectionString = "database=//127.0.0.1//test.fdb";
222-
var cs = new FbConnectionString(ConnectionString);
223+
var cs = new ConnectionString(ConnectionString);
223224
Assert.AreEqual("127.0.0.1", cs.DataSource);
224225
Assert.AreEqual("/test.fdb", cs.Database);
225226
}
@@ -228,7 +229,7 @@ public void ParsingDatabaseNewStyleIP4WithoutPortRootPath()
228229
public void ParsingDatabaseNewStyleIP4WithoutPortDrivePath()
229230
{
230231
const string ConnectionString = "database=//127.0.0.1/C:\\test.fdb";
231-
var cs = new FbConnectionString(ConnectionString);
232+
var cs = new ConnectionString(ConnectionString);
232233
Assert.AreEqual("127.0.0.1", cs.DataSource);
233234
Assert.AreEqual("C:\\test.fdb", cs.Database);
234235
}
@@ -237,7 +238,7 @@ public void ParsingDatabaseNewStyleIP4WithoutPortDrivePath()
237238
public void ParsingDatabaseNewStyleIP6WithoutPortWithoutPath()
238239
{
239240
const string ConnectionString = "database=//::1/test.fdb";
240-
var cs = new FbConnectionString(ConnectionString);
241+
var cs = new ConnectionString(ConnectionString);
241242
Assert.AreEqual("::1", cs.DataSource);
242243
Assert.AreEqual("test.fdb", cs.Database);
243244
}
@@ -246,7 +247,7 @@ public void ParsingDatabaseNewStyleIP6WithoutPortWithoutPath()
246247
public void ParsingDatabaseNewStyleIP6WithoutPortRootPath()
247248
{
248249
const string ConnectionString = "database=//::1//test.fdb";
249-
var cs = new FbConnectionString(ConnectionString);
250+
var cs = new ConnectionString(ConnectionString);
250251
Assert.AreEqual("::1", cs.DataSource);
251252
Assert.AreEqual("/test.fdb", cs.Database);
252253
}
@@ -255,7 +256,7 @@ public void ParsingDatabaseNewStyleIP6WithoutPortRootPath()
255256
public void ParsingDatabaseNewStyleIP6WithoutPortDrivePath()
256257
{
257258
const string ConnectionString = "database=//::1/C:\\test.fdb";
258-
var cs = new FbConnectionString(ConnectionString);
259+
var cs = new ConnectionString(ConnectionString);
259260
Assert.AreEqual("::1", cs.DataSource);
260261
Assert.AreEqual("C:\\test.fdb", cs.Database);
261262
}
@@ -264,7 +265,7 @@ public void ParsingDatabaseNewStyleIP6WithoutPortDrivePath()
264265
public void ParsingDatabaseOldStyleHostnameWithoutPortWithoutPath()
265266
{
266267
const string ConnectionString = "database=hostname:test.fdb";
267-
var cs = new FbConnectionString(ConnectionString);
268+
var cs = new ConnectionString(ConnectionString);
268269
Assert.AreEqual("hostname", cs.DataSource);
269270
Assert.AreEqual("test.fdb", cs.Database);
270271
}
@@ -273,7 +274,7 @@ public void ParsingDatabaseOldStyleHostnameWithoutPortWithoutPath()
273274
public void ParsingDatabaseOldStyleHostnameWithoutPortRootPath()
274275
{
275276
const string ConnectionString = "database=hostname:/test.fdb";
276-
var cs = new FbConnectionString(ConnectionString);
277+
var cs = new ConnectionString(ConnectionString);
277278
Assert.AreEqual("hostname", cs.DataSource);
278279
Assert.AreEqual("/test.fdb", cs.Database);
279280
}
@@ -282,7 +283,7 @@ public void ParsingDatabaseOldStyleHostnameWithoutPortRootPath()
282283
public void ParsingDatabaseOldStyleHostnameWithoutPortDrivePath()
283284
{
284285
const string ConnectionString = "database=hostname:C:\\test.fdb";
285-
var cs = new FbConnectionString(ConnectionString);
286+
var cs = new ConnectionString(ConnectionString);
286287
Assert.AreEqual("hostname", cs.DataSource);
287288
Assert.AreEqual("C:\\test.fdb", cs.Database);
288289
}
@@ -291,7 +292,7 @@ public void ParsingDatabaseOldStyleHostnameWithoutPortDrivePath()
291292
public void ParsingDatabaseOldStyleIP4WithoutPortWithoutPath()
292293
{
293294
const string ConnectionString = "database=127.0.0.1:test.fdb";
294-
var cs = new FbConnectionString(ConnectionString);
295+
var cs = new ConnectionString(ConnectionString);
295296
Assert.AreEqual("127.0.0.1", cs.DataSource);
296297
Assert.AreEqual("test.fdb", cs.Database);
297298
}
@@ -300,7 +301,7 @@ public void ParsingDatabaseOldStyleIP4WithoutPortWithoutPath()
300301
public void ParsingDatabaseOldStyleIP4WithoutPortRootPath()
301302
{
302303
const string ConnectionString = "database=127.0.0.1:/test.fdb";
303-
var cs = new FbConnectionString(ConnectionString);
304+
var cs = new ConnectionString(ConnectionString);
304305
Assert.AreEqual("127.0.0.1", cs.DataSource);
305306
Assert.AreEqual("/test.fdb", cs.Database);
306307
}
@@ -309,7 +310,7 @@ public void ParsingDatabaseOldStyleIP4WithoutPortRootPath()
309310
public void ParsingDatabaseOldStyleIP4WithoutPortDrivePath()
310311
{
311312
const string ConnectionString = "database=127.0.0.1:C:\\test.fdb";
312-
var cs = new FbConnectionString(ConnectionString);
313+
var cs = new ConnectionString(ConnectionString);
313314
Assert.AreEqual("127.0.0.1", cs.DataSource);
314315
Assert.AreEqual("C:\\test.fdb", cs.Database);
315316
}
@@ -318,7 +319,7 @@ public void ParsingDatabaseOldStyleIP4WithoutPortDrivePath()
318319
public void ParsingDatabaseOldStyleIP6WithoutPortWithoutPath()
319320
{
320321
const string ConnectionString = "database=::1:test.fdb";
321-
var cs = new FbConnectionString(ConnectionString);
322+
var cs = new ConnectionString(ConnectionString);
322323
Assert.AreEqual("::1", cs.DataSource);
323324
Assert.AreEqual("test.fdb", cs.Database);
324325
}
@@ -327,7 +328,7 @@ public void ParsingDatabaseOldStyleIP6WithoutPortWithoutPath()
327328
public void ParsingDatabaseOldStyleIP6WithoutPortRootPath()
328329
{
329330
const string ConnectionString = "database=::1:/test.fdb";
330-
var cs = new FbConnectionString(ConnectionString);
331+
var cs = new ConnectionString(ConnectionString);
331332
Assert.AreEqual("::1", cs.DataSource);
332333
Assert.AreEqual("/test.fdb", cs.Database);
333334
}
@@ -336,7 +337,7 @@ public void ParsingDatabaseOldStyleIP6WithoutPortRootPath()
336337
public void ParsingDatabaseOldStyleIP6WithoutPortDrivePath()
337338
{
338339
const string ConnectionString = "database=::1:C:\\test.fdb";
339-
var cs = new FbConnectionString(ConnectionString);
340+
var cs = new ConnectionString(ConnectionString);
340341
Assert.AreEqual("::1", cs.DataSource);
341342
Assert.AreEqual("C:\\test.fdb", cs.Database);
342343
}

‎Provider/src/FirebirdSql.Data.FirebirdClient.Tests/FbConnectionStringBuilderTests.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
//$Authors = Jiri Cincura (jiri@cincura.net)
1717

1818
using System.Text;
19+
using FirebirdSql.Data.Common;
1920
using NUnit.Framework;
2021

2122
namespace FirebirdSql.Data.FirebirdClient.Tests
@@ -33,7 +34,7 @@ public void EmptyCtorGeneratesEmptyString()
3334
public void NoValueProvidedReturnsDefault()
3435
{
3536
var b = new FbConnectionStringBuilder();
36-
Assert.AreEqual(b.MaxPoolSize, FbConnectionString.DefaultValueMaxPoolSize);
37+
Assert.AreEqual(b.MaxPoolSize, ConnectionString.DefaultValueMaxPoolSize);
3738
}
3839

3940
[Test]

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionString.cs‎ renamed to ‎Provider/src/FirebirdSql.Data.FirebirdClient/Common/ConnectionString.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222
using System.IO;
2323
using System.Linq;
2424
using System.Text.RegularExpressions;
25+
using FirebirdSql.Data.FirebirdClient;
2526

26-
namespace FirebirdSql.Data.FirebirdClient
27+
namespace FirebirdSql.Data.Common
2728
{
28-
internal sealed class FbConnectionString
29+
internal sealed class ConnectionString
2930
{
3031
#region Constants
3132
internal const string DefaultValueDataSource = "";
@@ -228,12 +229,12 @@ internal string NormalizedConnectionString
228229

229230
#region Constructors
230231

231-
public FbConnectionString()
232+
public ConnectionString()
232233
{
233234
SetDefaultOptions();
234235
}
235236

236-
public FbConnectionString(string connectionString)
237+
public ConnectionString(string connectionString)
237238
: this()
238239
{
239240
Load(connectionString);

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/ClientFactory.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace FirebirdSql.Data.FirebirdClient
2424
{
2525
internal static class ClientFactory
2626
{
27-
public static IDatabase CreateDatabase(FbConnectionString options)
27+
public static IDatabase CreateDatabase(ConnectionString options)
2828
{
2929
switch (options.ServerType)
3030
{
@@ -37,7 +37,7 @@ public static IDatabase CreateDatabase(FbConnectionString options)
3737
}
3838
}
3939

40-
public static IServiceManager CreateServiceManager(FbConnectionString options)
40+
public static IServiceManager CreateServiceManager(ConnectionString options)
4141
{
4242
switch (options.ServerType)
4343
{
@@ -50,7 +50,7 @@ public static IServiceManager CreateServiceManager(FbConnectionString options)
5050
}
5151
}
5252

53-
private static IDatabase CreateManagedDatabase(FbConnectionString options)
53+
private static IDatabase CreateManagedDatabase(ConnectionString options)
5454
{
5555
var connection = new GdsConnection(options.UserID, options.Password, options.DataSource, options.Port, options.PacketSize, Charset.GetCharset(options.Charset), options.Compression, FbWireCryptToWireCryptOption(options.WireCrypt));
5656
connection.Connect();
@@ -70,7 +70,7 @@ private static IDatabase CreateManagedDatabase(FbConnectionString options)
7070
}
7171
}
7272

73-
private static IServiceManager CreateManagedServiceManager(FbConnectionString options)
73+
private static IServiceManager CreateManagedServiceManager(ConnectionString options)
7474
{
7575
var connection = new GdsConnection(options.UserID, options.Password, options.DataSource, options.Port, options.PacketSize, Charset.GetCharset(options.Charset), options.Compression, FbWireCryptToWireCryptOption(options.WireCrypt));
7676
connection.Connect();

0 commit comments

Comments
 (0)