Skip to content

Commit 9b746a8

Browse files
wickedmachinatorwickedmachinator
committed
rebranding
1 parent 89992cb commit 9b746a8

20 files changed

+128
-181
lines changed

‎FizzCode.LightWeight.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LightWeight.AdoNet.DbConnec
2020
EndProject
2121
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LightWeight.AdoNetTests", "Tests\LightWeight.AdoNet.Tests\LightWeight.AdoNetTests.csproj", "{E9822D42-4E1E-4656-8AF6-FB2B1777695D}"
2222
EndProject
23-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LightWeight.ConnectionString", "LightWeight.ConnectionString\LightWeight.ConnectionString.csproj", "{F3F21798-413F-498A-A050-DDBDF93C00A3}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LightWeight", "LightWeight\LightWeight.csproj", "{F3F21798-413F-498A-A050-DDBDF93C00A3}"
2424
EndProject
2525
Global
2626
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎LightWeight.AdoNet.DbConnection/LightWeight.AdoNet.DbConnection.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<ItemGroup>
2828
<ProjectReference Include="..\LightWeight.Configuration\LightWeight.Configuration.csproj" />
29-
<ProjectReference Include="..\LightWeight.ConnectionString\LightWeight.ConnectionString.csproj" />
29+
<ProjectReference Include="..\LightWeight\LightWeight.csproj" />
3030
</ItemGroup>
3131

3232
</Project>

LightWeight.ConnectionString/AdoNetConnectionStringFields.cs renamed to LightWeight/ConnectionString/AdoNetConnectionStringFields.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace FizzCode.LightWeight;
1+
namespace FizzCode;
22

33
public class AdoNetConnectionStringFields
44
{

LightWeight.ConnectionString/AdoNetEngine.cs renamed to LightWeight/ConnectionString/AdoNetEngine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace FizzCode.LightWeight;
1+
namespace FizzCode;
22

33
public enum AdoNetEngine
44
{

LightWeight.ConnectionString/IAdoNetSqlConnectionString.cs renamed to LightWeight/ConnectionString/IAdoNetSqlConnectionString.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
namespace FizzCode.LightWeight;
1+
namespace FizzCode;
22

33
public interface IAdoNetSqlConnectionString : INamedConnectionString
44
{
55
public AdoNetEngine SqlEngine { get; }
6+
public AdoNetConnectionStringFields Fields { get; }
67

78
public bool IsEscaped(string identifier);
89
public string Escape(string dbObject, string schema = null);
@@ -13,5 +14,4 @@ public interface IAdoNetSqlConnectionString : INamedConnectionString
1314
string GetObjectIdentifier(string fullIdentifier);
1415

1516
public string GetFriendlyProviderName() => SqlEngine.ToString() ?? ProviderName;
16-
public AdoNetConnectionStringFields GetFields();
1717
}

LightWeight.ConnectionString/INamedConnectionString.cs renamed to LightWeight/ConnectionString/INamedConnectionString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace FizzCode.LightWeight;
1+
namespace FizzCode;
22

33
public interface INamedConnectionString
44
{

LightWeight.ConnectionString/Implementations/AzureStorageAccountConnectionString.cs renamed to LightWeight/ConnectionString/Implementations/AzureStorageAccountConnectionString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace FizzCode.LightWeight;
1+
namespace FizzCode;
22

33
public class AzureStorageAccountConnectionString : INamedConnectionString
44
{

‎LightWeight/ConnectionString/Implementations/BaseAdoNetSqlConnectionString.cs‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
namespace FizzCode;
2+
3+
public abstract class BaseAdoNetSqlConnectionString : IAdoNetSqlConnectionString
4+
{
5+
public string Name { get; }
6+
public string ConnectionString { get; }
7+
public string Version { get; }
8+
public AdoNetEngine SqlEngine { get; }
9+
public string ProviderName { get; }
10+
public AdoNetConnectionStringFields Fields { get; }
11+
12+
protected BaseAdoNetSqlConnectionString(AdoNetEngine sqlEngine, string providerName, string name, string connectionString, string version = null)
13+
{
14+
Name = name;
15+
ConnectionString = connectionString;
16+
Version = version;
17+
SqlEngine = sqlEngine;
18+
ProviderName = providerName;
19+
Fields = GetFields();
20+
}
21+
22+
public override string ToString()
23+
{
24+
return Fields?.Database != null
25+
? Fields?.Server != null
26+
? Fields?.Port != null
27+
? string.Format(CultureInfo.InvariantCulture, "{0} ({1}:{2}, {3}), {4}", Name, Fields.Server, Fields.Port, Fields.Database, ProviderName)
28+
: string.Format(CultureInfo.InvariantCulture, "{0} ({1}, {2}), {3}", Name, Fields.Server, Fields.Database, ProviderName)
29+
: string.Format(CultureInfo.InvariantCulture, "{0} ({1}), {2}", Name, Fields.Database, ProviderName)
30+
: string.Format(CultureInfo.InvariantCulture, "{0}, {1}", Name, ProviderName);
31+
}
32+
33+
protected abstract AdoNetConnectionStringFields GetFields();
34+
public abstract bool IsEscaped(string identifier);
35+
public abstract string Escape(string dbObject, string schema = null);
36+
public abstract string EscapeIdentifier(string identifier);
37+
public abstract string Unescape(string identifier);
38+
public abstract string ChangeObjectIdentifier(string fullIdentifier, string newObjectIdentifier);
39+
public abstract string GetObjectIdentifier(string fullIdentifier);
40+
}

LightWeight.ConnectionString/Implementations/GenericNamedConnectionString.cs renamed to LightWeight/ConnectionString/Implementations/GenericNamedConnectionString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace FizzCode.LightWeight;
1+
namespace FizzCode;
22

33
[DebuggerDisplay("{Name}, {ProviderName}, {ConnectionString}")]
44
public class GenericNamedConnectionString : INamedConnectionString

LightWeight.ConnectionString/Implementations/MsSqlConnectionString.cs renamed to LightWeight/ConnectionString/Implementations/MsSqlConnectionString.cs

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,12 @@
1-
namespace FizzCode.LightWeight;
1+
namespace FizzCode;
22

3-
public class MsSqlConnectionString : IAdoNetSqlConnectionString
3+
public class MsSqlConnectionString(string name, string connectionString, string version = null)
4+
: BaseAdoNetSqlConnectionString(AdoNetEngine.MsSql, DefaultProviderName, name, connectionString, version)
45
{
5-
public required string Name { get; init; }
6-
public required string ConnectionString { get; init; }
7-
public string Version { get; init; }
8-
9-
public AdoNetEngine SqlEngine => AdoNetEngine.MsSql;
106
public const string DefaultProviderName = "Microsoft.Data.SqlClient";
11-
public string ProviderName => DefaultProviderName;
127

138
private static readonly Regex _regex = new(@" *(\[[^]]+\]|\w+)");
149

15-
public MsSqlConnectionString()
16-
{
17-
}
18-
19-
[SetsRequiredMembers]
20-
public MsSqlConnectionString(string name, string connectionString, string version = null)
21-
{
22-
Name = name;
23-
ConnectionString = connectionString;
24-
Version = version;
25-
}
26-
2710
public MsSqlConnectionString CloneWithInitialCatalog(string databaseName)
2811
{
2912
var newConnectionString = ConnectionString;
@@ -57,12 +40,7 @@ public MsSqlConnectionString CloneWithInitialCatalog(string databaseName)
5740
return new MsSqlConnectionString(Name, newConnectionString, Version);
5841
}
5942

60-
public override string ToString()
61-
{
62-
return string.Format(CultureInfo.InvariantCulture, "{0}, {1}", Name, ProviderName);
63-
}
64-
65-
public string GetObjectIdentifier(string fullIdentifier)
43+
public override string GetObjectIdentifier(string fullIdentifier)
6644
{
6745
if (fullIdentifier.Contains('.', StringComparison.InvariantCultureIgnoreCase))
6846
{
@@ -81,7 +59,7 @@ public string GetObjectIdentifier(string fullIdentifier)
8159
return fullIdentifier;
8260
}
8361

84-
public string ChangeObjectIdentifier(string fullIdentifier, string newObjectIdentifier)
62+
public override string ChangeObjectIdentifier(string fullIdentifier, string newObjectIdentifier)
8563
{
8664
if (fullIdentifier.Contains('[', StringComparison.InvariantCultureIgnoreCase))
8765
{
@@ -127,34 +105,34 @@ public string ChangeObjectIdentifier(string fullIdentifier, string newObjectIden
127105
}
128106
}
129107

130-
public string Escape(string dbObject, string schema = null)
108+
public override string Escape(string dbObject, string schema = null)
131109
{
132110
if (!string.IsNullOrEmpty(schema))
133111
return EscapeIdentifier(schema) + "." + EscapeIdentifier(dbObject);
134112

135113
return EscapeIdentifier(dbObject);
136114
}
137115

138-
public string EscapeIdentifier(string identifier)
116+
public override string EscapeIdentifier(string identifier)
139117
{
140118
return identifier.StartsWith('[') && identifier.EndsWith(']')
141119
? identifier
142120
: "[" + identifier + "]";
143121
}
144122

145-
public bool IsEscaped(string identifier)
123+
public override bool IsEscaped(string identifier)
146124
{
147125
return identifier.StartsWith('[') && identifier.EndsWith(']');
148126
}
149127

150-
public string Unescape(string identifier)
128+
public override string Unescape(string identifier)
151129
{
152130
return identifier
153131
.Replace("[", "", StringComparison.InvariantCulture)
154132
.Replace("]", "", StringComparison.InvariantCulture);
155133
}
156134

157-
public AdoNetConnectionStringFields GetFields()
135+
protected override AdoNetConnectionStringFields GetFields()
158136
{
159137
if (string.IsNullOrEmpty(ConnectionString))
160138
return null;

0 commit comments

Comments
 (0)