diff --git a/.gitignore b/.gitignore index 29694a4..cedfdd7 100644 --- a/.gitignore +++ b/.gitignore @@ -70,7 +70,7 @@ dotnet-script.zip *.nupkg project.lock.json LightInject.PreProcessor.dll -db/ + lib/ ## TODO: If you have NuGet Package Restore enabled, uncomment this packages/ diff --git a/DbReader.sln b/DbClient.sln similarity index 81% rename from DbReader.sln rename to DbClient.sln index bdb4693..9fb5f8a 100644 --- a/DbReader.sln +++ b/DbClient.sln @@ -5,13 +5,13 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D7BAB27-2679-4825-BCAC-506DE94B09BC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader", "src\DbReader\DbReader.csproj", "{750224E1-F07A-4F85-AF4A-A58896AE800F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbClient", "src\DbClient\DbClient.csproj", "{750224E1-F07A-4F85-AF4A-A58896AE800F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader.Tests", "src\DbReader.Tests\DbReader.Tests.csproj", "{C7D0AF4F-6CF0-4D86-8F71-167557A205A5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbClient.Tests", "src\DbClient.Tests\DbClient.Tests.csproj", "{C7D0AF4F-6CF0-4D86-8F71-167557A205A5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader.Tracking", "src\DbReader.Tracking\DbReader.Tracking.csproj", "{E1B757E5-F9CD-49AB-AE23-364BEB752711}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbClient.Tracking", "src\DbClient.Tracking\DbClient.Tracking.csproj", "{E1B757E5-F9CD-49AB-AE23-364BEB752711}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader.Tracking.SampleAssembly", "src\DbReader.Tracking.SampleAssembly\DbReader.Tracking.SampleAssembly.csproj", "{AF516499-8AE8-4C37-B7D4-444D4C8066DF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbClient.Tracking.SampleAssembly", "src\DbClient.Tracking.SampleAssembly\DbClient.Tracking.SampleAssembly.csproj", "{AF516499-8AE8-4C37-B7D4-444D4C8066DF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build/build.csx b/build/build.csx index 70d0a88..e5346d4 100644 --- a/build/build.csx +++ b/build/build.csx @@ -30,8 +30,8 @@ AsyncStep deploy = async () => AsyncStep buildTrackingPackage = async () => { - var workingDirectory = Path.Combine(BuildContext.SourceFolder, "DbReader.Tracking"); - await Command.ExecuteAsync("dotnet", $"pack /p:NuspecFile=DbReader.Tracking.nuspec /p:IsPackable=true /p:NuspecProperties=version={BuildContext.LatestTag} -o ../../build/Artifacts/NuGet", workingDirectory); + var workingDirectory = Path.Combine(BuildContext.SourceFolder, "DbClient.Tracking"); + await Command.ExecuteAsync("dotnet", $"pack /p:NuspecFile=DbClient.Tracking.nuspec /p:IsPackable=true /p:NuspecProperties=version={BuildContext.LatestTag} -o ../../build/Artifacts/NuGet", workingDirectory); }; diff --git a/readme.md b/readme.md index b88fd6d..3dc2ab2 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ -## What is DbReader +## What is DbClient -**DbReader** is first and foremost **NOT** an **ORM**. **DbReader** simply maps rows into classes. +**DbClient** is first and foremost **NOT** an **ORM**. **DbClient** simply maps rows into classes. These classes are nothing but representation of the rows returned by the query in the context of .Net. They are not entities, not business objects, they are just rows represented as .Net objects. No Magic. @@ -32,7 +32,7 @@ All the following samples are based on the good old Northwind database since ## Database agnostic -Most of the functionality in DbReader is implemented on top of the IDataReader/IDataRecord interface. In fact, DbReader can actually be used without any database at all since there is nothing that states that an IDataReader needs to get its data from a relational database. +Most of the functionality in DbClient is implemented on top of the IDataReader/IDataRecord interface. In fact, DbClient can actually be used without any database at all since there is nothing that states that an IDataReader needs to get its data from a relational database. ## Single level @@ -72,7 +72,7 @@ var customers = dbConnection.Read(sql) ``` ## Async -**DbReader** provides the *ReadAsync* method that uses the DbCommand.ExecuteReaderAsync method to fetch the result set. +**DbClient** provides the *ReadAsync* method that uses the DbCommand.ExecuteReaderAsync method to fetch the result set. ``` var result = await dbConnection.ReadAsync(sql) @@ -97,12 +97,12 @@ WHERE | ---------- | ------------------- | | ALFKI | Alfreds Futterkiste | -DbReader makes passing an argument value very easy. +DbClient makes passing an argument value very easy. ``` dbConnection.Read(sql, new {CustomerId = "ALFKI"}); ``` -**DbReader** will create an *IDataParameter* for each property of the anonymous type passed in as the argument object. +**DbClient** will create an *IDataParameter* for each property of the anonymous type passed in as the argument object. If we need more control with the regards to the parameters, we can simply assign an *IDataParameter* instance to a property of the argument object. @@ -136,7 +136,7 @@ connection.Read("SELECT * FROM Customers WHERE Country = @Country AND ## Record types -**DbReader** supports [C# records](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/builtin-types/record) meaning that we can ensure immutability and it also makes it possible to create a class representing the result of a query with minimum effort. +**DbClient** supports [C# records](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/builtin-types/record) meaning that we can ensure immutability and it also makes it possible to create a class representing the result of a query with minimum effort. ```c# public record Customer(string CustomerId, string CompanyName) @@ -172,7 +172,7 @@ WHERE The problem with this approach is that it is not very dynamic as we would have to change the SQL and the arguments object if we wanted to add another value to the list. -**DbReader** solves this by letting us pass an `IEnumerable` that will expand the parameter list based on the number of items in the list that we pass in. Note that this will only work for IN clauses in the SQL. +**DbClient** solves this by letting us pass an `IEnumerable` that will expand the parameter list based on the number of items in the list that we pass in. Note that this will only work for IN clauses in the SQL. ```SQL SELECT @@ -284,15 +284,15 @@ ON As we can see from the result we now have six rows. One for each *Order* and the *Customer* columns are duplicated for each *Order*. -This is where the true power of DbReader comes into play as we don't have to do anything special to map these rows into our class representing the master-detail relationship. +This is where the true power of DbClient comes into play as we don't have to do anything special to map these rows into our class representing the master-detail relationship. ``` var customers = dbConnection.Read(sql, new {CustomerId = "ALFKI"}); ``` -> **DbReader** makes sure that only one instance of the *Customer* class is ever instantiated even if the customer information is "duplicated" six times in the result set. +> **DbClient** makes sure that only one instance of the *Customer* class is ever instantiated even if the customer information is "duplicated" six times in the result set. -There is no limitation as to the number of levels **DbReader** can handle meaning that we could create a query that represents a master-detail-subdetail query. +There is no limitation as to the number of levels **DbClient** can handle meaning that we could create a query that represents a master-detail-subdetail query. ## Many To One @@ -309,7 +309,7 @@ public class Order } ``` -The SQL is exactly the same and the only difference is that we ask **DbReader** to map the result into a list of *Order* instances. +The SQL is exactly the same and the only difference is that we ask **DbClient** to map the result into a list of *Order* instances. ```sql SELECT @@ -425,15 +425,15 @@ public class OrderDetail public decimal UnitPrice { get; set; } } ``` -The convention can easily be changes through the DbReaderOptions class. +The convention can easily be changes through the DbClientOptions class. ```c# -DbReaderOptions.KeyConvention = (property) => property.IsDefined(typeof(KeyAttribute)); +DbClientOptions.KeyConvention = (property) => property.IsDefined(typeof(KeyAttribute)); ``` -Another possibility is to supply this information using the DbReaderOptions`KeySelector` method. +Another possibility is to supply this information using the DbClientOptions`KeySelector` method. ```c# -DbReaderOptions.KeySelector(c => c.CustomerId) +DbClientOptions.KeySelector(c => c.CustomerId) ``` ## Prefixes @@ -474,7 +474,7 @@ public class Order } ``` -The *Orders* table and the *Customers* table both define the *ModifiedBy* column and we need a way to tell **DbReader** which *ModifiedBy* column goes into which *ModifiedBy* property. +The *Orders* table and the *Customers* table both define the *ModifiedBy* column and we need a way to tell **DbClient** which *ModifiedBy* column goes into which *ModifiedBy* property. The solution is really quite simple. We just need to prefix the ModifiedBy column that originates from the Orders table with the name of the navigation property. @@ -503,7 +503,7 @@ The length of the alias name might actually be a problem since we can nest these ``` ol.ModifiedBy AS FirstLevelProperty_SecondLevelProperty_ThirdLevelProperty_ModifiedBy ``` -Some database engines might not allow for such long identifiers and **DbReader** allows for CamelHumps (A ReSharper term) that basically means that we compress the property name into its capital letters. +Some database engines might not allow for such long identifiers and **DbClient** allows for CamelHumps (A ReSharper term) that basically means that we compress the property name into its capital letters. ``` ol.ModifiedBy AS FLP_SLP_TLP_ModifiedBy @@ -511,12 +511,12 @@ ol.ModifiedBy AS FLP_SLP_TLP_ModifiedBy ## Stored Procedures -**DbReader** makes no attempt to generalize calling stored procedures as this in most cases requires code that is specific to the database engine. **DbReader** allows custom initialization of an IDbCommand through the DbReaderOptions.CommandInitializer property. +**DbClient** makes no attempt to generalize calling stored procedures as this in most cases requires code that is specific to the database engine. **DbClient** allows custom initialization of an IDbCommand through the DbClientOptions.CommandInitializer property. This is an extension point where we can plug in support for features that are specific to the database engine. The following example shows how to add support for calling an Oracle procedure. ``` -DbReaderOptions.CommandInitializer = InitializeCommand; +DbClientOptions.CommandInitializer = InitializeCommand; private static void InitializeCommand(IDbCommand command) { @@ -542,15 +542,15 @@ For instance, Oracle does not provide a Guid datatype and the most common way of Since we probably don't want to represent a Guid as a byte array in our classes, we need to register a custom delegate to handle the conversion from a byte array to a Guid. ``` -DbReaderOptions.WhenReading().Use((datarecord, ordinal) => new Guid(dataRecord.ReadBytes(1,16))); +DbClientOptions.WhenReading().Use((datarecord, ordinal) => new Guid(dataRecord.ReadBytes(1,16))); ``` -This instructs **DbReader** to use our custom read delegate whenever it encounters a *Guid* property. +This instructs **DbClient** to use our custom read delegate whenever it encounters a *Guid* property. The *Guid* also needs to be converted back into a byte array when passing a *Guid* value as a parameter to a query. ``` -DbReaderOptions.WhenPassing().Use((parameter, guid) => parameter.Value = guid.ToByArray() +DbClientOptions.WhenPassing().Use((parameter, guid) => parameter.Value = guid.ToByArray() ``` > Note that the conversion function is only invoked if the value from the database is NOT `DBNull` @@ -582,7 +582,7 @@ public class MyClass When the property `SomeProperty` we can specify what to return in the case of the field (SomeProperty) being `DBNull` from the `IDataRecord` ```C# -DbReaderOptions.WhenReading().Use((dr, i) => new CustomValueType(dr.GetInt32(i))).WithDefaultValue(new CustomValueType(42)); +DbClientOptions.WhenReading().Use((dr, i) => new CustomValueType(dr.GetInt32(i))).WithDefaultValue(new CustomValueType(42)); ``` @@ -714,7 +714,7 @@ public class Employee ## Command Initialization -The `DbReaderOptions` class exposes a `CommandInitializer` property that can be used to initialize an `IDbCommand` after it has been created by `DbReader`. +The `DbClientOptions` class exposes a `CommandInitializer` property that can be used to initialize an `IDbCommand` after it has been created by `DbClient`. The following example uses an anonymous PL/SQL block to retrieve a list of employees from the SCOTT schema. @@ -746,7 +746,7 @@ connection.ReadAsync(sql, new {p_cursor = new OracleParameter{OracleDb If we have multiple queries such as this one, it might make more sense to define a convention that always adds the needed cursor parameter. ```c# -DbReaderOptions.CommandInitializer = (command) => { +DbClientOptions.CommandInitializer = (command) => { if (command.CommandText.Contains("p_cursor")) { command.Parameters.Insert(0, new OracleParameter @@ -767,7 +767,7 @@ connection.ReadAsync(SQL.emp, new {p_name = "A%"}); ## Tracking -As stated previously, `DbReader` is NOT an ORM and the support for simple object tracking does not change that +As stated previously, `DbClient` is NOT an ORM and the support for simple object tracking does not change that although it opens up a couple of doors for more dynamic SQL, specially when doing updates in the database. First of all what do we mean by tracking? Let's illustrate with an example. @@ -829,7 +829,7 @@ WHERE CustomerID = @CustomerID; ``` -So in `DbReader`this would be as simple as +So in `DbClient`this would be as simple as ```c# await dbConnection.ExecuteAsync(sql, customer); @@ -949,7 +949,7 @@ public record Customer : ITrackedObject } } ``` -This now gives us the ability to figure out which properties has changed and this information can be used when building the arguments object that is passed to `DbReader`when executing the query. +This now gives us the ability to figure out which properties has changed and this information can be used when building the arguments object that is passed to `DbClient`when executing the query. ```c# var arguments = new ArgumentsBuilder().From(customer).Build(); @@ -957,7 +957,7 @@ var arguments = new ArgumentsBuilder().From(customer).Build(); This arguments object will now be an object with properties from the `customer` instance, but since `Customer`implements `ITrackedObject` it will ONLY contain the properties that has been set/modified. -At this point we have the arguments object to be passed to `DbReader`, but in order for this to work we also need to build the SQL that represents our update statement. +At this point we have the arguments object to be passed to `DbClient`, but in order for this to work we also need to build the SQL that represents our update statement. ```c# var modifiedProperties = ((ITrackedObject)positionalRecord).GetModifiedProperties(); @@ -982,7 +982,7 @@ We are finally ready to actually perform the update in the database await dbConnection.ExecuteAsync(sql, arguments); ``` -### DbReader.Tracking +### DbClient.Tracking As we learned previously we can leverage this functionally by rewriting our `Customer` record from @@ -1042,7 +1042,7 @@ public record Customer : ITrackedObject This would require a lot of tedious plumbing code every time we would want this type of behavior. -`DbReader.Tracking` makes this very easy by just requiring an attribute to be set on the class/record that we want to track. +`DbClient.Tracking` makes this very easy by just requiring an attribute to be set on the class/record that we want to track. ```c# [Tracked] @@ -1061,11 +1061,11 @@ public record Customer( ); ``` -By applying the `TrackedAttribute`, `DbReader.Tracking` will automatically implement the `ITrackedObject` interface and modify each property setter to track changes when properties are being set. +By applying the `TrackedAttribute`, `DbClient.Tracking` will automatically implement the `ITrackedObject` interface and modify each property setter to track changes when properties are being set. This happens at compile time using [Mono.Cecil]([https://](https://github.com/jbevain/cecil)) -By default, `DbReader.Tracking` will look for an attribute called `TrackedAttribute`. This can be configured using an MsBuild property called `DbReaderTrackingAttributeName` -In the example below , `DbReader.Tracking` will look for an attribute called `PatchAttribute` instead of `TrackedAttribute`. +By default, `DbClient.Tracking` will look for an attribute called `TrackedAttribute`. This can be configured using an MsBuild property called `DbClientTrackingAttributeName` +In the example below , `DbClient.Tracking` will look for an attribute called `PatchAttribute` instead of `TrackedAttribute`. ```xml @@ -1073,12 +1073,12 @@ In the example below , `DbReader.Tracking` will look for an attribute called `Pa net8.0 enable enable - PatchAttribute + PatchAttribute - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/.idea/.idea.DbReader/.idea/workspace.xml b/src/.idea/.idea.DbReader/.idea/workspace.xml deleted file mode 100644 index 3fe8a92..0000000 --- a/src/.idea/.idea.DbReader/.idea/workspace.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1654726087154 - - - - - - - - - - \ No newline at end of file diff --git a/src/DbReader.Tests/ArgumentParserMethodBuilderTests.cs b/src/DbClient.Tests/ArgumentParserMethodBuilderTests.cs similarity index 94% rename from src/DbReader.Tests/ArgumentParserMethodBuilderTests.cs rename to src/DbClient.Tests/ArgumentParserMethodBuilderTests.cs index e6d75ad..1a81e8d 100644 --- a/src/DbReader.Tests/ArgumentParserMethodBuilderTests.cs +++ b/src/DbClient.Tests/ArgumentParserMethodBuilderTests.cs @@ -1,12 +1,12 @@ using System; using System.Data; using System.Data.Common; -using DbReader.Construction; +using DbClient.Construction; using Moq; using Shouldly; using Xunit; -namespace DbReader.Tests +namespace DbClient.Tests { public class ArgumentParserMethodBuilderTests : ContainerFixture { @@ -18,7 +18,7 @@ public void ShouldThrowMeaningfulExceptionWhenParameterValueIsNotAccepted() var args = new { CustomerId = "ALFKI" }; var method = argumentParserMethodBuilder.CreateMethod("@CustomerId", args.GetType(), Array.Empty()); var exception = Should.Throw(() => method("@CustomerId", args, () => new ThrowingDataParameter())); - exception.Message.ShouldContain("The parameter (CustomerId) did not accept the value `ALFKI` (String). If the value is a custom type, consider adding support for the type using DbReaderOptions.WhenPassing()"); + exception.Message.ShouldContain("The parameter (CustomerId) did not accept the value `ALFKI` (String). If the value is a custom type, consider adding support for the type using DbClientOptions.WhenPassing()"); } @@ -34,7 +34,7 @@ public void ShouldHandleEnumWithoutConverterFunction() [Fact] public void ShouldHandleEnumWithConverterFunction() { - DbReaderOptions.WhenPassing().Use((parameter, value) => parameter.Value = (int)EnumParameterWithConverterFunction.Value3); + DbClientOptions.WhenPassing().Use((parameter, value) => parameter.Value = (int)EnumParameterWithConverterFunction.Value3); var args = new { Status = EnumParameterWithConverterFunction.Value2 }; var method = argumentParserMethodBuilder.CreateMethod("@Status", args.GetType(), Array.Empty()); var result = method("@Status", args, () => new TestDataParameter()); @@ -54,7 +54,7 @@ public void ShouldHandleNullableEnumWithoutConverterFunctionPassingNull() [Fact] public void ShouldHandleNullableEnumWithConverterFunctionPassingNull() { - DbReaderOptions.WhenPassing().Use((parameter, value) => parameter.Value = (int)EnumParameterWithConverterFunctionPassingNull.Value3); + DbClientOptions.WhenPassing().Use((parameter, value) => parameter.Value = (int)EnumParameterWithConverterFunctionPassingNull.Value3); var args = new { Status = (EnumParameterWithConverterFunctionPassingNull?)null }; var method = argumentParserMethodBuilder.CreateMethod("@Status", args.GetType(), Array.Empty()); var result = method("@Status", args, () => new TestDataParameter()); @@ -81,7 +81,7 @@ public void ShouldHandleNullableEnum() // TestMethod(nullableInt); var args = new { Status = new Nullable(DbType.Currency) }; - //DbReaderOptions.WhenPassing().Use((p, v) => p.Value = 1); + //DbClientOptions.WhenPassing().Use((p, v) => p.Value = 1); var method = argumentParserMethodBuilder.CreateMethod("@Status", args.GetType(), Array.Empty()); var result = method("@Status", args, () => new TestDataParameter()); } @@ -90,7 +90,7 @@ public void ShouldHandleNullableEnum() public void ShouldHandleNullableInt() { var args = new { Status = new Nullable(42) }; - //DbReaderOptions.WhenPassing().Use((p, v) => p.Value = 1); + //DbClientOptions.WhenPassing().Use((p, v) => p.Value = 1); var method = argumentParserMethodBuilder.CreateMethod("@Status", args.GetType(), Array.Empty()); var result = method("@Status", args, () => new TestDataParameter()); } diff --git a/src/DbReader.Tests/ArgumentParserTests.cs b/src/DbClient.Tests/ArgumentParserTests.cs similarity index 99% rename from src/DbReader.Tests/ArgumentParserTests.cs rename to src/DbClient.Tests/ArgumentParserTests.cs index 7eaf9ae..7457c50 100644 --- a/src/DbReader.Tests/ArgumentParserTests.cs +++ b/src/DbClient.Tests/ArgumentParserTests.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Data; diff --git a/src/DbReader.Tests/ArgumentProcessorTests.cs b/src/DbClient.Tests/ArgumentProcessorTests.cs similarity index 96% rename from src/DbReader.Tests/ArgumentProcessorTests.cs rename to src/DbClient.Tests/ArgumentProcessorTests.cs index 8b24a0a..53d7ac4 100644 --- a/src/DbReader.Tests/ArgumentProcessorTests.cs +++ b/src/DbClient.Tests/ArgumentProcessorTests.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System.Data; using Extensions; diff --git a/src/DbReader.Tests/ArgumentsBuilderTests.cs b/src/DbClient.Tests/ArgumentsBuilderTests.cs similarity index 97% rename from src/DbReader.Tests/ArgumentsBuilderTests.cs rename to src/DbClient.Tests/ArgumentsBuilderTests.cs index 82074b6..7b2ca9d 100644 --- a/src/DbReader.Tests/ArgumentsBuilderTests.cs +++ b/src/DbClient.Tests/ArgumentsBuilderTests.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using DbReader.DynamicArguments; -using DbReader.Tracking; -using DbReader.Tracking.SampleAssembly; +using DbClient.DynamicArguments; +using DbClient.Tracking; +using DbClient.Tracking.SampleAssembly; using ILVerifier; using Shouldly; using Xunit; -namespace DbReader.Tests; +namespace DbClient.Tests; public class ArgumentsBuilderTests { diff --git a/src/DbReader.Tests/AssemblyInfo.cs b/src/DbClient.Tests/AssemblyInfo.cs similarity index 100% rename from src/DbReader.Tests/AssemblyInfo.cs rename to src/DbClient.Tests/AssemblyInfo.cs diff --git a/src/DbReader.Tests/CachedArgumentParserMethodBuilderTests.cs b/src/DbClient.Tests/CachedArgumentParserMethodBuilderTests.cs similarity index 99% rename from src/DbReader.Tests/CachedArgumentParserMethodBuilderTests.cs rename to src/DbClient.Tests/CachedArgumentParserMethodBuilderTests.cs index 0123bb6..5e323eb 100644 --- a/src/DbReader.Tests/CachedArgumentParserMethodBuilderTests.cs +++ b/src/DbClient.Tests/CachedArgumentParserMethodBuilderTests.cs @@ -1,6 +1,6 @@ using System.Data; -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Runtime.CompilerServices; diff --git a/src/DbReader.Tests/ConstructorSelectorTests.cs b/src/DbClient.Tests/ConstructorSelectorTests.cs similarity index 94% rename from src/DbReader.Tests/ConstructorSelectorTests.cs rename to src/DbClient.Tests/ConstructorSelectorTests.cs index 7534956..43b76a3 100644 --- a/src/DbReader.Tests/ConstructorSelectorTests.cs +++ b/src/DbClient.Tests/ConstructorSelectorTests.cs @@ -1,12 +1,12 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; - using DbReader.Interfaces; + using DbClient.Interfaces; using Selectors; using Shouldly; using Xunit; - using DbReader.LightInject; + using DbClient.LightInject; public class ConstructorSelectorTests : ContainerFixture { diff --git a/src/DbReader.Tests/CustomValueType.cs b/src/DbClient.Tests/CustomValueType.cs similarity index 88% rename from src/DbReader.Tests/CustomValueType.cs rename to src/DbClient.Tests/CustomValueType.cs index ab39985..afb5b1b 100644 --- a/src/DbReader.Tests/CustomValueType.cs +++ b/src/DbClient.Tests/CustomValueType.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { public struct CustomValueType { diff --git a/src/DbReader.Tests/DataReaderMockExtensions.cs b/src/DbClient.Tests/DataReaderMockExtensions.cs similarity index 96% rename from src/DbReader.Tests/DataReaderMockExtensions.cs rename to src/DbClient.Tests/DataReaderMockExtensions.cs index 3ff137c..e91d192 100644 --- a/src/DbReader.Tests/DataReaderMockExtensions.cs +++ b/src/DbClient.Tests/DataReaderMockExtensions.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Collections.Generic; @@ -16,7 +16,7 @@ public static class DataReaderMockExtensions /// /// Returns a string if one is present, or null if not /// - /// The IDbReader to read from + /// The IDbClient to read from /// The index of the column to read from /// A string, or null if the column's value is NULL public static string GetNullableString(this IDataRecord reader, int index) @@ -27,7 +27,7 @@ public static string GetNullableString(this IDataRecord reader, int index) /// /// Returns a bool if one is present, or null if not /// - /// The IDbReader to read from + /// The IDbClient to read from /// The index of the column to read from /// A bool, or null if the column's value is NULL public static bool? GetNullableBool(this IDataRecord reader, int index) @@ -38,7 +38,7 @@ public static string GetNullableString(this IDataRecord reader, int index) /// /// Returns a DateTime if one is present, or null if not /// - /// The IDbReader to read from + /// The IDbClient to read from /// The index of the column to read from /// A DateTime, or null if the column's value is NULL public static DateTime? GetNullableDateTime(this IDataRecord reader, int index) @@ -49,7 +49,7 @@ public static string GetNullableString(this IDataRecord reader, int index) /// /// Returns a byte if one is present, or null if not /// - /// The IDbReader to read from + /// The IDbClient to read from /// The index of the column to read from /// A byte, or null if the column's value is NULL public static byte? GetNullableByte(this IDataRecord reader, int index) @@ -60,7 +60,7 @@ public static string GetNullableString(this IDataRecord reader, int index) /// /// Returns a short if one is present, or null if not /// - /// The IDbReader to read from + /// The IDbClient to read from /// The index of the column to read from /// A short, or null if the column's value is NULL public static short? GetNullableInt16(this IDataRecord reader, int index) @@ -71,7 +71,7 @@ public static string GetNullableString(this IDataRecord reader, int index) /// /// Returns an int if one is present, or null if not /// - /// The IDbReader to read from + /// The IDbClient to read from /// The index of the column to read from /// An int, or null if the column's value is NULL public static int? GetNullableInt32(this IDataRecord reader, int index) @@ -82,7 +82,7 @@ public static string GetNullableString(this IDataRecord reader, int index) /// /// Returns a float if one is present, or null if not /// - /// The IDbReader to read from + /// The IDbClient to read from /// The index of the column to read from /// A float, or null if the column's value is NULL public static float? GetNullableFloat(this IDataRecord reader, int index) @@ -93,7 +93,7 @@ public static string GetNullableString(this IDataRecord reader, int index) /// /// Returns a double if one is present, or null if not /// - /// The IDbReader to read from + /// The IDbClient to read from /// The index of the column to read from /// A double, or null if the column's value is NULL public static double? GetNullableDouble(this IDataRecord reader, int index) diff --git a/src/DbReader.Tests/DataRecordExtensionTests.cs b/src/DbClient.Tests/DataRecordExtensionTests.cs similarity index 97% rename from src/DbReader.Tests/DataRecordExtensionTests.cs rename to src/DbClient.Tests/DataRecordExtensionTests.cs index 0f79c9c..d612b11 100644 --- a/src/DbReader.Tests/DataRecordExtensionTests.cs +++ b/src/DbClient.Tests/DataRecordExtensionTests.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Linq; diff --git a/src/DbReader.Tests/DbReader.Tests.csproj b/src/DbClient.Tests/DbClient.Tests.csproj similarity index 85% rename from src/DbReader.Tests/DbReader.Tests.csproj rename to src/DbClient.Tests/DbClient.Tests.csproj index 8ca4f5d..9b89b82 100644 --- a/src/DbReader.Tests/DbReader.Tests.csproj +++ b/src/DbClient.Tests/DbClient.Tests.csproj @@ -1,9 +1,9 @@  - - - + + + diff --git a/src/DbReader.Tests/DbReaderExtensions.cs b/src/DbClient.Tests/DbClientExtensions.cs similarity index 95% rename from src/DbReader.Tests/DbReaderExtensions.cs rename to src/DbClient.Tests/DbClientExtensions.cs index 2072b58..13020ac 100644 --- a/src/DbReader.Tests/DbReaderExtensions.cs +++ b/src/DbClient.Tests/DbClientExtensions.cs @@ -1,9 +1,9 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System.Data; using System.Text; - public static class DbReaderExtensions + public static class DbClientExtensions { public static string ToMarkdown(this IDataReader dataReader) { diff --git a/src/DbReader.Tests/FakeSql.cs b/src/DbClient.Tests/FakeSql.cs similarity index 92% rename from src/DbReader.Tests/FakeSql.cs rename to src/DbClient.Tests/FakeSql.cs index 2374a13..13a6e52 100644 --- a/src/DbReader.Tests/FakeSql.cs +++ b/src/DbClient.Tests/FakeSql.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Runtime.CompilerServices; diff --git a/src/DbReader.Tests/FieldSelectorTests.cs b/src/DbClient.Tests/FieldSelectorTests.cs similarity index 95% rename from src/DbReader.Tests/FieldSelectorTests.cs rename to src/DbClient.Tests/FieldSelectorTests.cs index d0de05f..938e476 100644 --- a/src/DbReader.Tests/FieldSelectorTests.cs +++ b/src/DbClient.Tests/FieldSelectorTests.cs @@ -1,10 +1,10 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Collections.Generic; using System.Data; - using DbReader.Interfaces; + using DbClient.Interfaces; using Selectors; using Shouldly; using Xunit; diff --git a/src/DbReader.Tests/InstanceReaderTests.cs b/src/DbClient.Tests/InstanceReaderTests.cs similarity index 97% rename from src/DbReader.Tests/InstanceReaderTests.cs rename to src/DbClient.Tests/InstanceReaderTests.cs index 58bbb2d..8d5862d 100644 --- a/src/DbReader.Tests/InstanceReaderTests.cs +++ b/src/DbClient.Tests/InstanceReaderTests.cs @@ -1,9 +1,9 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Collections.Generic; using System.Linq; - using DbReader.Construction; + using DbClient.Construction; using Readers; using Shouldly; @@ -13,7 +13,7 @@ public class InstanceReaderTests : ContainerFixture { static InstanceReaderTests() { - DbReaderOptions.WhenReading().Use((record, ordinal) => new CustomValueType(record.GetInt32(ordinal))); + DbClientOptions.WhenReading().Use((record, ordinal) => new CustomValueType(record.GetInt32(ordinal))); } private IReaderMethodBuilder> propertyReaderMethodBuilder; @@ -237,7 +237,7 @@ public void ShouldReadNullableEnumWithConverterFunction() { var dataRecord = new { Id = 1, Property = 2 }.ToDataRecord(); bool wasCalled = false; - DbReaderOptions.WhenReading().Use((dataRecord, ordinal) => + DbClientOptions.WhenReading().Use((dataRecord, ordinal) => { wasCalled = true; return (EnumWithConverterFunction)dataRecord.GetInt32(ordinal); @@ -253,7 +253,7 @@ public void ShouldReadNullableEnumWithConverterFunctionForIntegralType() { var dataRecord = new { Id = 1, Property = 2 }.ToDataRecord(); bool wasCalled = false; - DbReaderOptions.WhenReading().Use((dataRecord, ordinal) => + DbClientOptions.WhenReading().Use((dataRecord, ordinal) => { wasCalled = true; return (ushort)dataRecord.GetInt32(ordinal); @@ -350,7 +350,7 @@ public void ShouldNotCreateInstanceWhenNavigationKeyIsNull() [Fact] public void ShouldUseConverterFunctionEvenWhenEnumHasIncompatibleUnderlyingType() { - DbReaderOptions.WhenReading().Use((dr, i) => (Int32Enum)dr.GetInt64(i)); + DbClientOptions.WhenReading().Use((dr, i) => (Int32Enum)dr.GetInt64(i)); var dataRecord = new { Id = 1, Property = (long)1 }.ToDataRecord(); var reader = GetReader>(); var instance = reader.Read(dataRecord, string.Empty); @@ -404,7 +404,7 @@ public void ShouldHandleNullValuesInNavigationChain() public void ShouldUseDefaultValue() { var dataRecord = new { Id = 1, Property = DBNull.Value }.ToDataRecord(); - DbReaderOptions.WhenReading().Use((dr, i) => new CustomValueType(dr.GetInt32(i))).WithDefaultValue(new CustomValueType(42)); + DbClientOptions.WhenReading().Use((dr, i) => new CustomValueType(dr.GetInt32(i))).WithDefaultValue(new CustomValueType(42)); var reader = GetReader>(); var instance = reader.Read(dataRecord, string.Empty); instance.Property.Value.ShouldBe(42); @@ -414,7 +414,7 @@ public void ShouldUseDefaultValue() public void ShouldNotUseDefaultValue() { var dataRecord = new { Id = 1, Property = 42 }.ToDataRecord(); - DbReaderOptions.WhenReading().Use((dr, i) => new CustomValueType(dr.GetInt32(i))).WithDefaultValue(new CustomValueType(82)); + DbClientOptions.WhenReading().Use((dr, i) => new CustomValueType(dr.GetInt32(i))).WithDefaultValue(new CustomValueType(82)); var reader = GetReader>(); var instance = reader.Read(dataRecord, string.Empty); instance.Property.Value.ShouldBe(42); @@ -437,7 +437,7 @@ public CustomValueType(int value) [Fact] public void Test() { - DbReaderOptions.WhenReading>().Use((dr, ordinal) => + DbClientOptions.WhenReading>().Use((dr, ordinal) => { return Array.Empty(); }); diff --git a/src/DbReader.Tests/InstanceReaderVerificationTests.cs b/src/DbClient.Tests/InstanceReaderVerificationTests.cs similarity index 96% rename from src/DbReader.Tests/InstanceReaderVerificationTests.cs rename to src/DbClient.Tests/InstanceReaderVerificationTests.cs index 345d4a6..4e90536 100644 --- a/src/DbReader.Tests/InstanceReaderVerificationTests.cs +++ b/src/DbClient.Tests/InstanceReaderVerificationTests.cs @@ -1,5 +1,5 @@ #if NET7_0 -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.IO; diff --git a/src/DbReader.Tests/IntegrationTests.cs b/src/DbClient.Tests/IntegrationTests.cs similarity index 95% rename from src/DbReader.Tests/IntegrationTests.cs rename to src/DbClient.Tests/IntegrationTests.cs index d7dced1..8261abf 100644 --- a/src/DbReader.Tests/IntegrationTests.cs +++ b/src/DbClient.Tests/IntegrationTests.cs @@ -1,5 +1,5 @@ #if !NET462 -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Collections.Generic; @@ -10,7 +10,7 @@ namespace DbReader.Tests using System.Linq; using System.Text; using System.Threading.Tasks; - using DbReader; + using DbClient; using Extensions; using Shouldly; using Xunit; @@ -26,13 +26,13 @@ static IntegrationTests() dbFile = Path.Combine(Path.GetDirectoryName(new Uri(typeof(IntegrationTests).Assembly.CodeBase).LocalPath), "northwind.db"); connectionString = $"Data Source = {dbFile}"; - DbReaderOptions.WhenPassing() + DbClientOptions.WhenPassing() .Use((parameter, argument) => { parameter.Value = argument.Value; }); - DbReaderOptions.WhenReading().Use((datarecord, i) => new CustomScalarValue(datarecord.GetInt64(i))); + DbClientOptions.WhenReading().Use((datarecord, i) => new CustomScalarValue(datarecord.GetInt64(i))); } @@ -134,7 +134,7 @@ public async Task ShouldReadCustomersAsync() [Fact] public async Task ShouldReadCustomersAsyncWithCustomKeySelector() { - DbReaderOptions.KeySelector(c => c.CustomerId); + DbClientOptions.KeySelector(c => c.CustomerId); using (var connection = CreateConnection()) { var customers = await connection.ReadAsync(SQL.Customers); @@ -170,8 +170,8 @@ public void ShouldReadCustomersAsRecordType() public void ShouldReadCustomersAndOrdersAsRecordType() { - // DbReaderOptions.KeySelector(c => c.CustomerId); - // DbReaderOptions.KeySelector(o => o.OrderId); + // DbClientOptions.KeySelector(c => c.CustomerId); + // DbClientOptions.KeySelector(o => o.OrderId); using (var connection = CreateConnection()) { @@ -285,7 +285,7 @@ public void ShouldBeAbleToConvertArgument() public void ShouldInvokeCommandInitializer() { bool invoked = false; - DbReaderOptions.CommandInitializer = command => { invoked = true; }; + DbClientOptions.CommandInitializer = command => { invoked = true; }; using (var connection = CreateConnection()) { @@ -293,13 +293,13 @@ public void ShouldInvokeCommandInitializer() } invoked.ShouldBeTrue(); - DbReaderOptions.CommandInitializer = null; + DbClientOptions.CommandInitializer = null; } [Fact] public void ShouldInvokeCommandInitializerBeforeParsingQuery() { - DbReaderOptions.CommandInitializer = command => + DbClientOptions.CommandInitializer = command => { var parameter = command.CreateParameter(); parameter.ParameterName = "@CustomerId"; @@ -314,7 +314,7 @@ public void ShouldInvokeCommandInitializerBeforeParsingQuery() customers.Count().ShouldBe(1); } - DbReaderOptions.CommandInitializer = null; + DbClientOptions.CommandInitializer = null; } @@ -520,7 +520,7 @@ public async Task ShouldHandlePassingNullableCustomValueTypeWithNull() [Fact] public void ShouldNotSetParameterValueWhenPassingCustomType() { - DbReaderOptions.WhenPassing().Use((p, c) => + DbClientOptions.WhenPassing().Use((p, c) => { p.Value.ShouldBeNull(); p.Value = (string)c; @@ -546,7 +546,7 @@ public void ShouldReadSimpleType() [Fact] public void ShouldReadSimpleTypeUsingValueConverter() { - DbReaderOptions.WhenReading().Use((record, ordinal) => new CustomValueType(record.GetInt32(ordinal))); + DbClientOptions.WhenReading().Use((record, ordinal) => new CustomValueType(record.GetInt32(ordinal))); using (var connection = CreateConnection()) { @@ -562,13 +562,13 @@ private string LoadSql(string name) } [Fact] - public void GetAllCustomersUsingDbReader() + public void GetAllCustomersUsingDbClient() { using (var connection = CreateConnection()) { - var dbReaderResult = Measure.Run(() => connection.Read(SQL.Customers), 10, - "DbReader (All Customers)"); - Console.WriteLine(dbReaderResult); + var dbClientResult = Measure.Run(() => connection.Read(SQL.Customers), 10, + "DbClient (All Customers)"); + Console.WriteLine(dbClientResult); } } diff --git a/src/DbReader.Tests/KeyConventionTests.cs b/src/DbClient.Tests/KeyConventionTests.cs similarity index 74% rename from src/DbReader.Tests/KeyConventionTests.cs rename to src/DbClient.Tests/KeyConventionTests.cs index 0616277..3b4ff9d 100644 --- a/src/DbReader.Tests/KeyConventionTests.cs +++ b/src/DbClient.Tests/KeyConventionTests.cs @@ -1,37 +1,37 @@ using Shouldly; using Xunit; -namespace DbReader.Tests +namespace DbClient.Tests { public class KeyConventionTests { [Fact] public void ShouldUseClassIdProperty() { - var result = DbReaderOptions.KeyConvention(typeof(Customer).GetProperty(nameof(Customer.CustomerId))); + var result = DbClientOptions.KeyConvention(typeof(Customer).GetProperty(nameof(Customer.CustomerId))); result.ShouldBeTrue(); } [Fact] public void ShouldUseIdProperty() { - var result = DbReaderOptions.KeyConvention(typeof(Employee).GetProperty(nameof(Employee.Id))); + var result = DbClientOptions.KeyConvention(typeof(Employee).GetProperty(nameof(Employee.Id))); result.ShouldBeTrue(); } [Fact] public void ShouldUseCustomIdIntProperty() { - DbReaderOptions.KeySelector(ac => ac.CustomId); - var result = DbReaderOptions.KeyConvention(typeof(AnotherCustomer).GetProperty(nameof(AnotherCustomer.CustomId))); + DbClientOptions.KeySelector(ac => ac.CustomId); + var result = DbClientOptions.KeyConvention(typeof(AnotherCustomer).GetProperty(nameof(AnotherCustomer.CustomId))); result.ShouldBeTrue(); } [Fact] public void ShouldUseCustomIdStringProperty() { - DbReaderOptions.KeySelector(ac => ac.CustomId); - var result = DbReaderOptions.KeyConvention(typeof(AnotherEmployee).GetProperty(nameof(AnotherEmployee.CustomId))); + DbClientOptions.KeySelector(ac => ac.CustomId); + var result = DbClientOptions.KeyConvention(typeof(AnotherEmployee).GetProperty(nameof(AnotherEmployee.CustomId))); result.ShouldBeTrue(); } diff --git a/src/DbReader.Tests/KeyPropertyMapperTests.cs b/src/DbClient.Tests/KeyPropertyMapperTests.cs similarity index 97% rename from src/DbReader.Tests/KeyPropertyMapperTests.cs rename to src/DbClient.Tests/KeyPropertyMapperTests.cs index 6fe93eb..af6631d 100644 --- a/src/DbReader.Tests/KeyPropertyMapperTests.cs +++ b/src/DbClient.Tests/KeyPropertyMapperTests.cs @@ -1,7 +1,7 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; - using DbReader.Interfaces; + using DbClient.Interfaces; using Mapping; using Shouldly; using Xunit; diff --git a/src/DbReader.Tests/KeyReaderTests.cs b/src/DbClient.Tests/KeyReaderTests.cs similarity index 87% rename from src/DbReader.Tests/KeyReaderTests.cs rename to src/DbClient.Tests/KeyReaderTests.cs index 7d1a242..edd06f3 100644 --- a/src/DbReader.Tests/KeyReaderTests.cs +++ b/src/DbClient.Tests/KeyReaderTests.cs @@ -1,11 +1,11 @@ -// namespace DbReader.Tests +// namespace DbClient.Tests // { // using System; // using System.Collections; // using System.ComponentModel.DataAnnotations; // using System.Reflection; -// using DbReader.Interfaces; +// using DbClient.Interfaces; // using Readers; // using Shouldly; @@ -13,8 +13,8 @@ // { // public KeyReaderTests() // { -// DbReaderOptions.KeySelector(c => c.KeyProperty); -// DbReaderOptions.KeySelector(c => c.FirstKeyProperty, c => c.SecondKeyProperty); +// DbClientOptions.KeySelector(c => c.KeyProperty); +// DbClientOptions.KeySelector(c => c.FirstKeyProperty, c => c.SecondKeyProperty); // } // public void ShouldReadSingleKey(IKeyReader keyReader) diff --git a/src/DbReader.Tests/ManyToOnePropertySelectorTests.cs b/src/DbClient.Tests/ManyToOnePropertySelectorTests.cs similarity index 91% rename from src/DbReader.Tests/ManyToOnePropertySelectorTests.cs rename to src/DbClient.Tests/ManyToOnePropertySelectorTests.cs index 76243fe..1e258da 100644 --- a/src/DbReader.Tests/ManyToOnePropertySelectorTests.cs +++ b/src/DbClient.Tests/ManyToOnePropertySelectorTests.cs @@ -1,8 +1,8 @@ -// namespace DbReader.Tests +// namespace DbClient.Tests // { -// using DbReader.Interfaces; -// using DbReader.LightInject; -// using DbReader.Tests.LightInject.xUnit2; +// using DbClient.Interfaces; +// using DbClient.LightInject; +// using DbClient.Tests.LightInject.xUnit2; // using Shouldly ; // using Xunit; // using Xunit.Extensions; diff --git a/src/DbReader.Tests/Measure.cs b/src/DbClient.Tests/Measure.cs similarity index 99% rename from src/DbReader.Tests/Measure.cs rename to src/DbClient.Tests/Measure.cs index 59dde0e..6e2b8c3 100644 --- a/src/DbReader.Tests/Measure.cs +++ b/src/DbClient.Tests/Measure.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace DbReader.Tests +namespace DbClient.Tests { using System.Diagnostics; diff --git a/src/DbReader.Tests/MethodSelectorTests.cs b/src/DbClient.Tests/MethodSelectorTests.cs similarity index 98% rename from src/DbReader.Tests/MethodSelectorTests.cs rename to src/DbClient.Tests/MethodSelectorTests.cs index be94c9b..22f3d6f 100644 --- a/src/DbReader.Tests/MethodSelectorTests.cs +++ b/src/DbClient.Tests/MethodSelectorTests.cs @@ -1,10 +1,10 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Data; using System.Text; - using DbReader.Interfaces; - using DbReader.LightInject; + using DbClient.Interfaces; + using DbClient.LightInject; using Selectors; using Shouldly; using Xunit; diff --git a/src/DbReader.Tests/OneToManyPropertySelectorTests.cs b/src/DbClient.Tests/OneToManyPropertySelectorTests.cs similarity index 98% rename from src/DbReader.Tests/OneToManyPropertySelectorTests.cs rename to src/DbClient.Tests/OneToManyPropertySelectorTests.cs index 13fe21f..aef0b56 100644 --- a/src/DbReader.Tests/OneToManyPropertySelectorTests.cs +++ b/src/DbClient.Tests/OneToManyPropertySelectorTests.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Collections.Generic; diff --git a/src/DbReader.Tests/OnlyOnIntelAttribute.cs b/src/DbClient.Tests/OnlyOnIntelAttribute.cs similarity index 93% rename from src/DbReader.Tests/OnlyOnIntelAttribute.cs rename to src/DbClient.Tests/OnlyOnIntelAttribute.cs index d5fcdb4..78d69f2 100644 --- a/src/DbReader.Tests/OnlyOnIntelAttribute.cs +++ b/src/DbClient.Tests/OnlyOnIntelAttribute.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; using Xunit; -namespace DbReader.Tests +namespace DbClient.Tests { public class OnlyOnIntelFactAttribute : FactAttribute { diff --git a/src/DbReader.Tests/PrefixResolverTests.cs b/src/DbClient.Tests/PrefixResolverTests.cs similarity index 97% rename from src/DbReader.Tests/PrefixResolverTests.cs rename to src/DbClient.Tests/PrefixResolverTests.cs index 604ab17..9edf4aa 100644 --- a/src/DbReader.Tests/PrefixResolverTests.cs +++ b/src/DbClient.Tests/PrefixResolverTests.cs @@ -1,7 +1,7 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using Construction; - using DbReader.Interfaces; + using DbClient.Interfaces; using Shouldly; using Xunit; diff --git a/src/DbReader.Tests/PropertyMapperTests.cs b/src/DbClient.Tests/PropertyMapperTests.cs similarity index 97% rename from src/DbReader.Tests/PropertyMapperTests.cs rename to src/DbClient.Tests/PropertyMapperTests.cs index 61e0116..d933573 100644 --- a/src/DbReader.Tests/PropertyMapperTests.cs +++ b/src/DbClient.Tests/PropertyMapperTests.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using Mapping; @@ -89,7 +89,7 @@ public void ShouldProvideMeaningfulStringRepresentation() var result = propertyMapper.Execute(typeof(SampleClass), dataRecord, string.Empty); - result[0].ToString().ShouldBe("[DbReader.Tests.SampleClass] Property: Int32 Int32Property, Ordinal: 0"); + result[0].ToString().ShouldBe("[DbClient.Tests.SampleClass] Property: Int32 Int32Property, Ordinal: 0"); } } diff --git a/src/DbReader.Tests/PropertyReflectionTests.cs b/src/DbClient.Tests/PropertyReflectionTests.cs similarity index 98% rename from src/DbReader.Tests/PropertyReflectionTests.cs rename to src/DbClient.Tests/PropertyReflectionTests.cs index 502f66f..a84afad 100644 --- a/src/DbReader.Tests/PropertyReflectionTests.cs +++ b/src/DbClient.Tests/PropertyReflectionTests.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System.Collections.Generic; using System.Linq; diff --git a/src/DbReader.Tests/Queries/Customers.sql b/src/DbClient.Tests/Queries/Customers.sql similarity index 100% rename from src/DbReader.Tests/Queries/Customers.sql rename to src/DbClient.Tests/Queries/Customers.sql diff --git a/src/DbReader.Tests/Queries/CustomersAndOrders.sql b/src/DbClient.Tests/Queries/CustomersAndOrders.sql similarity index 100% rename from src/DbReader.Tests/Queries/CustomersAndOrders.sql rename to src/DbClient.Tests/Queries/CustomersAndOrders.sql diff --git a/src/DbReader.Tests/Queries/EmployeesHierarchy.sql b/src/DbClient.Tests/Queries/EmployeesHierarchy.sql similarity index 100% rename from src/DbReader.Tests/Queries/EmployeesHierarchy.sql rename to src/DbClient.Tests/Queries/EmployeesHierarchy.sql diff --git a/src/DbReader.Tests/Queries/EmployeesWithOrdersAndTerritories.sql b/src/DbClient.Tests/Queries/EmployeesWithOrdersAndTerritories.sql similarity index 100% rename from src/DbReader.Tests/Queries/EmployeesWithOrdersAndTerritories.sql rename to src/DbClient.Tests/Queries/EmployeesWithOrdersAndTerritories.sql diff --git a/src/DbReader.Tests/QueryCacheTests.cs b/src/DbClient.Tests/QueryCacheTests.cs similarity index 99% rename from src/DbReader.Tests/QueryCacheTests.cs rename to src/DbClient.Tests/QueryCacheTests.cs index 8ad6b78..4e52863 100644 --- a/src/DbReader.Tests/QueryCacheTests.cs +++ b/src/DbClient.Tests/QueryCacheTests.cs @@ -4,7 +4,7 @@ using Shouldly; using System.Linq; -namespace DbReader.Tests +namespace DbClient.Tests { public class QueryCacheTests { diff --git a/src/DbReader.Tests/RegExParameterParserTests.cs b/src/DbClient.Tests/RegExParameterParserTests.cs similarity index 97% rename from src/DbReader.Tests/RegExParameterParserTests.cs rename to src/DbClient.Tests/RegExParameterParserTests.cs index 1bf9eff..73f0730 100644 --- a/src/DbReader.Tests/RegExParameterParserTests.cs +++ b/src/DbClient.Tests/RegExParameterParserTests.cs @@ -1,9 +1,9 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using Database; using Shouldly; using Xunit; - using DbReader.LightInject; + using DbClient.LightInject; public class RegExParameterParserTests : ContainerFixture { diff --git a/src/DbReader.Tests/SQL.cs b/src/DbClient.Tests/SQL.cs similarity index 94% rename from src/DbReader.Tests/SQL.cs rename to src/DbClient.Tests/SQL.cs index d2ccfc7..de64f57 100644 --- a/src/DbReader.Tests/SQL.cs +++ b/src/DbClient.Tests/SQL.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { public class SQL { diff --git a/src/DbReader.Tests/SampleClass.cs b/src/DbClient.Tests/SampleClass.cs similarity index 98% rename from src/DbReader.Tests/SampleClass.cs rename to src/DbClient.Tests/SampleClass.cs index 18d3b87..124029c 100644 --- a/src/DbReader.Tests/SampleClass.cs +++ b/src/DbClient.Tests/SampleClass.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Collections.Generic; diff --git a/src/DbReader.Tests/Settings.StyleCop b/src/DbClient.Tests/Settings.StyleCop similarity index 100% rename from src/DbReader.Tests/Settings.StyleCop rename to src/DbClient.Tests/Settings.StyleCop diff --git a/src/DbReader.Tests/SimplePropertySelectorTests.cs b/src/DbClient.Tests/SimplePropertySelectorTests.cs similarity index 98% rename from src/DbReader.Tests/SimplePropertySelectorTests.cs rename to src/DbClient.Tests/SimplePropertySelectorTests.cs index 0f0c0e9..c517216 100644 --- a/src/DbReader.Tests/SimplePropertySelectorTests.cs +++ b/src/DbClient.Tests/SimplePropertySelectorTests.cs @@ -1,9 +1,9 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Collections.Generic; using System.Text; - using DbReader.LightInject; + using DbClient.LightInject; using Shouldly; using Xunit; using IPropertySelector = Selectors.IPropertySelector; diff --git a/src/DbReader.Tests/SqlProvider.cs b/src/DbClient.Tests/SqlProvider.cs similarity index 94% rename from src/DbReader.Tests/SqlProvider.cs rename to src/DbClient.Tests/SqlProvider.cs index 3d5035f..dd28618 100644 --- a/src/DbReader.Tests/SqlProvider.cs +++ b/src/DbClient.Tests/SqlProvider.cs @@ -1,7 +1,7 @@ using System.IO; using System.Text; -namespace DbReader.Tests +namespace DbClient.Tests { public interface ISqlProvider { @@ -35,7 +35,7 @@ private static string LoadSql(string name) { var assembly = typeof(SqlProvider).Assembly; var test = assembly.GetManifestResourceNames(); - var resourceStream = assembly.GetManifestResourceStream($"DbReader.Tests.Queries.{name}.sql"); + var resourceStream = assembly.GetManifestResourceStream($"DbClient.Tests.Queries.{name}.sql"); using (var reader = new StreamReader(resourceStream, Encoding.UTF8)) { return reader.ReadToEnd(); diff --git a/src/DbReader.Tests/TestBase.cs b/src/DbClient.Tests/TestBase.cs similarity index 96% rename from src/DbReader.Tests/TestBase.cs rename to src/DbClient.Tests/TestBase.cs index 2671f58..4019ba3 100644 --- a/src/DbReader.Tests/TestBase.cs +++ b/src/DbClient.Tests/TestBase.cs @@ -1,8 +1,8 @@ using System; using System.Reflection; -using DbReader.LightInject; +using DbClient.LightInject; -namespace DbReader.Tests +namespace DbClient.Tests { public class ContainerFixture : IDisposable { diff --git a/src/DbReader.Tests/TestCollectionOrderer.cs b/src/DbClient.Tests/TestCollectionOrderer.cs similarity index 85% rename from src/DbReader.Tests/TestCollectionOrderer.cs rename to src/DbClient.Tests/TestCollectionOrderer.cs index 844d7c3..30101a4 100644 --- a/src/DbReader.Tests/TestCollectionOrderer.cs +++ b/src/DbClient.Tests/TestCollectionOrderer.cs @@ -2,8 +2,8 @@ using System.Linq; using Xunit; using Xunit.Abstractions; -[assembly: TestCollectionOrderer("DbReader.Tests.TestCollectionOrderer", "DbReader.Tests")] -namespace DbReader.Tests +[assembly: TestCollectionOrderer("DbClient.Tests.TestCollectionOrderer", "DbClient.Tests")] +namespace DbClient.Tests { public class TestCollectionOrderer : ITestCollectionOrderer { diff --git a/src/DbReader.Tests/TypeExtensionTests.cs b/src/DbClient.Tests/TypeExtensionTests.cs similarity index 98% rename from src/DbReader.Tests/TypeExtensionTests.cs rename to src/DbClient.Tests/TypeExtensionTests.cs index 1d50a87..0681ab1 100644 --- a/src/DbReader.Tests/TypeExtensionTests.cs +++ b/src/DbClient.Tests/TypeExtensionTests.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using System.Collections.Generic; diff --git a/src/DbReader.Tests/UtilityTests.cs b/src/DbClient.Tests/UtilityTests.cs similarity index 95% rename from src/DbReader.Tests/UtilityTests.cs rename to src/DbClient.Tests/UtilityTests.cs index 530ff50..e300b59 100644 --- a/src/DbReader.Tests/UtilityTests.cs +++ b/src/DbClient.Tests/UtilityTests.cs @@ -2,7 +2,7 @@ using Shouldly; using Xunit; -namespace DbReader.Tests +namespace DbClient.Tests { public class UtilityTests { diff --git a/src/DbReader.Tests/ValueConverterTests.cs b/src/DbClient.Tests/ValueConverterTests.cs similarity index 97% rename from src/DbReader.Tests/ValueConverterTests.cs rename to src/DbClient.Tests/ValueConverterTests.cs index a6d76e2..73ea03e 100644 --- a/src/DbReader.Tests/ValueConverterTests.cs +++ b/src/DbClient.Tests/ValueConverterTests.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tests +namespace DbClient.Tests { using System; using Shouldly; diff --git a/src/DbReader.Tests/VerifiableMethodSkeleton.cs b/src/DbClient.Tests/VerifiableMethodSkeleton.cs similarity index 97% rename from src/DbReader.Tests/VerifiableMethodSkeleton.cs rename to src/DbClient.Tests/VerifiableMethodSkeleton.cs index 515f843..cb08633 100644 --- a/src/DbReader.Tests/VerifiableMethodSkeleton.cs +++ b/src/DbClient.Tests/VerifiableMethodSkeleton.cs @@ -1,10 +1,10 @@ using System; using System.Reflection; using System.Reflection.Emit; -using DbReader.Construction; +using DbClient.Construction; using ILVerifier; -namespace DbReader.Tests +namespace DbClient.Tests { public class VerifiableMethodSkeleton : IMethodSkeleton { diff --git a/src/DbReader.Tests/VerifiableMethodSkeletonFactory.cs b/src/DbClient.Tests/VerifiableMethodSkeletonFactory.cs similarity index 95% rename from src/DbReader.Tests/VerifiableMethodSkeletonFactory.cs rename to src/DbClient.Tests/VerifiableMethodSkeletonFactory.cs index 8887a03..ff1465b 100644 --- a/src/DbReader.Tests/VerifiableMethodSkeletonFactory.cs +++ b/src/DbClient.Tests/VerifiableMethodSkeletonFactory.cs @@ -1,5 +1,5 @@ #if NET7_0 -namespace DbReader.Tests +namespace DbClient.Tests { using System; using Construction; diff --git a/src/DbReader.Tests/coverlet.runsettings b/src/DbClient.Tests/coverlet.runsettings similarity index 100% rename from src/DbReader.Tests/coverlet.runsettings rename to src/DbClient.Tests/coverlet.runsettings diff --git a/src/DbReader.Tests/db/northwind.sql b/src/DbClient.Tests/db/northwind.sql similarity index 100% rename from src/DbReader.Tests/db/northwind.sql rename to src/DbClient.Tests/db/northwind.sql diff --git a/src/DbReader.Tests/packages.config b/src/DbClient.Tests/packages.config similarity index 100% rename from src/DbReader.Tests/packages.config rename to src/DbClient.Tests/packages.config diff --git a/src/DbReader.Tests/sqlmd.sh b/src/DbClient.Tests/sqlmd.sh similarity index 100% rename from src/DbReader.Tests/sqlmd.sh rename to src/DbClient.Tests/sqlmd.sh diff --git a/src/DbReader.Tests/xunit.runner.json b/src/DbClient.Tests/xunit.runner.json similarity index 100% rename from src/DbReader.Tests/xunit.runner.json rename to src/DbClient.Tests/xunit.runner.json diff --git a/src/DbReader.Tracking.SampleAssembly/DbReader.Tracking.SampleAssembly.csproj b/src/DbClient.Tracking.SampleAssembly/DbClient.Tracking.SampleAssembly.csproj similarity index 63% rename from src/DbReader.Tracking.SampleAssembly/DbReader.Tracking.SampleAssembly.csproj rename to src/DbClient.Tracking.SampleAssembly/DbClient.Tracking.SampleAssembly.csproj index c89fbd1..6a982d2 100644 --- a/src/DbReader.Tracking.SampleAssembly/DbReader.Tracking.SampleAssembly.csproj +++ b/src/DbClient.Tracking.SampleAssembly/DbClient.Tracking.SampleAssembly.csproj @@ -2,17 +2,17 @@ - + - $(MSBuildProjectDirectory)/bin/$(Configuration)/net8.0/DbReader.Tracking.dll + $(MSBuildProjectDirectory)/bin/$(Configuration)/net8.0/DbClient.Tracking.dll net8.0 enable enable false - + diff --git a/src/DbClient.Tracking.SampleAssembly/SampleClasses.cs b/src/DbClient.Tracking.SampleAssembly/SampleClasses.cs new file mode 100644 index 0000000..53539c4 --- /dev/null +++ b/src/DbClient.Tracking.SampleAssembly/SampleClasses.cs @@ -0,0 +1,6 @@ +namespace DbClient.Tracking.SampleAssembly; +using DbClient.Tracking; +[Tracked] +public record PositionalRecord(int Id, string Name); + + diff --git a/src/DbReader.Tracking/DbReader.Tracking.csproj b/src/DbClient.Tracking/DbClient.Tracking.csproj similarity index 95% rename from src/DbReader.Tracking/DbReader.Tracking.csproj rename to src/DbClient.Tracking/DbClient.Tracking.csproj index 4b5784c..37ab307 100644 --- a/src/DbReader.Tracking/DbReader.Tracking.csproj +++ b/src/DbClient.Tracking/DbClient.Tracking.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/DbReader.Tracking/DbReader.Tracking.nuspec b/src/DbClient.Tracking/DbClient.Tracking.nuspec similarity index 76% rename from src/DbReader.Tracking/DbReader.Tracking.nuspec rename to src/DbClient.Tracking/DbClient.Tracking.nuspec index ac0c472..9254885 100644 --- a/src/DbReader.Tracking/DbReader.Tracking.nuspec +++ b/src/DbClient.Tracking/DbClient.Tracking.nuspec @@ -2,7 +2,7 @@ - DbReader.Tracking + DbClient.Tracking 0.0.1 @@ -10,26 +10,26 @@ A custom MSBuild task package. - https://github.com/seesharper/DbReader + https://github.com/seesharper/DbClient MIT - DbReader Tracking + DbClient Tracking true - + - - + + - + diff --git a/src/DbClient.Tracking/DbClient.Tracking.targets b/src/DbClient.Tracking/DbClient.Tracking.targets new file mode 100644 index 0000000..7d3851b --- /dev/null +++ b/src/DbClient.Tracking/DbClient.Tracking.targets @@ -0,0 +1,19 @@ + + + $(MSBuildThisFileDirectory)../lib/net8.0/DbClient.Tracking.dll + TrackedAttribute + + + + + + + + + + + + + + + diff --git a/src/DbReader.Tracking/TrackingAssemblyWeaver.cs b/src/DbClient.Tracking/TrackingAssemblyWeaver.cs similarity index 99% rename from src/DbReader.Tracking/TrackingAssemblyWeaver.cs rename to src/DbClient.Tracking/TrackingAssemblyWeaver.cs index 63618ba..8b82d4f 100644 --- a/src/DbReader.Tracking/TrackingAssemblyWeaver.cs +++ b/src/DbClient.Tracking/TrackingAssemblyWeaver.cs @@ -2,7 +2,7 @@ using Mono.Cecil.Cil; using Mono.Cecil.Rocks; -namespace DbReader.Tracking; +namespace DbClient.Tracking; public class TrackingAssemblyWeaver { diff --git a/src/DbReader.Tracking/WeaveAssemby.cs b/src/DbClient.Tracking/WeaveAssemby.cs similarity index 94% rename from src/DbReader.Tracking/WeaveAssemby.cs rename to src/DbClient.Tracking/WeaveAssemby.cs index fdf801a..7f34c5a 100644 --- a/src/DbReader.Tracking/WeaveAssemby.cs +++ b/src/DbClient.Tracking/WeaveAssemby.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tracking; +namespace DbClient.Tracking; public class WeaveAssembly : Microsoft.Build.Utilities.Task { diff --git a/src/DbReader/ArgumentProcessor.cs b/src/DbClient/ArgumentProcessor.cs similarity index 99% rename from src/DbReader/ArgumentProcessor.cs rename to src/DbClient/ArgumentProcessor.cs index f44749e..7ba1788 100644 --- a/src/DbReader/ArgumentProcessor.cs +++ b/src/DbClient/ArgumentProcessor.cs @@ -1,12 +1,12 @@ using System; using System.Linq; -namespace DbReader +namespace DbClient { using System.Collections.Concurrent; using System.Data; using System.Reflection; - using DbReader.Extensions; + using DbClient.Extensions; internal static class ArgumentProcessor { diff --git a/src/DbReader/CompositionRoot.cs b/src/DbClient/CompositionRoot.cs similarity index 98% rename from src/DbReader/CompositionRoot.cs rename to src/DbClient/CompositionRoot.cs index 4a1a883..883dd46 100644 --- a/src/DbReader/CompositionRoot.cs +++ b/src/DbClient/CompositionRoot.cs @@ -1,4 +1,4 @@ -namespace DbReader +namespace DbClient { using System; using System.Collections; @@ -63,7 +63,7 @@ private static void RegisterSingletonServices(IServiceRegistry registry) .Register("FirstConstructorSelector", new PerContainerLifetime()) .Decorate(typeof(IConstructorSelector), typeof(ConstructorValidator), sr => sr.ImplementingType == typeof(ParameterlessConstructorSelector)) - .Register(factory => DbReaderOptions.ParameterParser, new PerContainerLifetime()) + .Register(factory => DbClientOptions.ParameterParser, new PerContainerLifetime()) .RegisterSingleton(); } diff --git a/src/DbReader/Construction/ArgumentParserMethodBuilder.cs b/src/DbClient/Construction/ArgumentParserMethodBuilder.cs similarity index 99% rename from src/DbReader/Construction/ArgumentParserMethodBuilder.cs rename to src/DbClient/Construction/ArgumentParserMethodBuilder.cs index 575b4da..86f5692 100644 --- a/src/DbReader/Construction/ArgumentParserMethodBuilder.cs +++ b/src/DbClient/Construction/ArgumentParserMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Collections.Generic; diff --git a/src/DbReader/Construction/Cache.cs b/src/DbClient/Construction/Cache.cs similarity index 97% rename from src/DbReader/Construction/Cache.cs rename to src/DbClient/Construction/Cache.cs index 86277e9..51cf2d7 100644 --- a/src/DbReader/Construction/Cache.cs +++ b/src/DbClient/Construction/Cache.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using LightInject; diff --git a/src/DbReader/Construction/CachedArgumentParserMethodBuilder.cs b/src/DbClient/Construction/CachedArgumentParserMethodBuilder.cs similarity index 96% rename from src/DbReader/Construction/CachedArgumentParserMethodBuilder.cs rename to src/DbClient/Construction/CachedArgumentParserMethodBuilder.cs index 1faca64..a4cf4ef 100644 --- a/src/DbReader/Construction/CachedArgumentParserMethodBuilder.cs +++ b/src/DbClient/Construction/CachedArgumentParserMethodBuilder.cs @@ -1,9 +1,9 @@ using System; -namespace DbReader.Construction +namespace DbClient.Construction { using System.Data; - using DbReader.Database; + using DbClient.Database; /// /// An decorator that caches diff --git a/src/DbReader/Construction/CachedInstanceReaderMethodBuilder.cs b/src/DbClient/Construction/CachedInstanceReaderMethodBuilder.cs similarity index 96% rename from src/DbReader/Construction/CachedInstanceReaderMethodBuilder.cs rename to src/DbClient/Construction/CachedInstanceReaderMethodBuilder.cs index 867378a..445ebde 100644 --- a/src/DbReader/Construction/CachedInstanceReaderMethodBuilder.cs +++ b/src/DbClient/Construction/CachedInstanceReaderMethodBuilder.cs @@ -1,8 +1,8 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; - using DbReader.Readers; + using DbClient.Readers; using Interfaces; /// diff --git a/src/DbReader/Construction/CachedKeyReaderMethodBuilder.cs b/src/DbClient/Construction/CachedKeyReaderMethodBuilder.cs similarity index 98% rename from src/DbReader/Construction/CachedKeyReaderMethodBuilder.cs rename to src/DbClient/Construction/CachedKeyReaderMethodBuilder.cs index 45789ce..9b67bd8 100644 --- a/src/DbReader/Construction/CachedKeyReaderMethodBuilder.cs +++ b/src/DbClient/Construction/CachedKeyReaderMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Collections; diff --git a/src/DbReader/Construction/CachedOneToManyMethodBuilder.cs b/src/DbClient/Construction/CachedOneToManyMethodBuilder.cs similarity index 96% rename from src/DbReader/Construction/CachedOneToManyMethodBuilder.cs rename to src/DbClient/Construction/CachedOneToManyMethodBuilder.cs index 2c948af..74fb64d 100644 --- a/src/DbReader/Construction/CachedOneToManyMethodBuilder.cs +++ b/src/DbClient/Construction/CachedOneToManyMethodBuilder.cs @@ -1,8 +1,8 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; - using DbReader.Readers; + using DbClient.Readers; /// /// An decorator that diff --git a/src/DbReader/Construction/CachedReaderMethodBuilder.cs b/src/DbClient/Construction/CachedReaderMethodBuilder.cs similarity index 97% rename from src/DbReader/Construction/CachedReaderMethodBuilder.cs rename to src/DbClient/Construction/CachedReaderMethodBuilder.cs index 60e2ab5..ef071ce 100644 --- a/src/DbReader/Construction/CachedReaderMethodBuilder.cs +++ b/src/DbClient/Construction/CachedReaderMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; diff --git a/src/DbReader/Construction/ConstructorReaderMethodBuilder.cs b/src/DbClient/Construction/ConstructorReaderMethodBuilder.cs similarity index 99% rename from src/DbReader/Construction/ConstructorReaderMethodBuilder.cs rename to src/DbClient/Construction/ConstructorReaderMethodBuilder.cs index 72431ee..00595ea 100644 --- a/src/DbReader/Construction/ConstructorReaderMethodBuilder.cs +++ b/src/DbClient/Construction/ConstructorReaderMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System.Data; using System.Reflection; diff --git a/src/DbReader/Construction/DynamicMethodSkeleton.cs b/src/DbClient/Construction/DynamicMethodSkeleton.cs similarity index 99% rename from src/DbReader/Construction/DynamicMethodSkeleton.cs rename to src/DbClient/Construction/DynamicMethodSkeleton.cs index bf5c3f8..03e5471 100644 --- a/src/DbReader/Construction/DynamicMethodSkeleton.cs +++ b/src/DbClient/Construction/DynamicMethodSkeleton.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Reflection; diff --git a/src/DbReader/Construction/IArgumentParserMethodBuilder.cs b/src/DbClient/Construction/IArgumentParserMethodBuilder.cs similarity index 94% rename from src/DbReader/Construction/IArgumentParserMethodBuilder.cs rename to src/DbClient/Construction/IArgumentParserMethodBuilder.cs index 1be328f..2f2d118 100644 --- a/src/DbReader/Construction/IArgumentParserMethodBuilder.cs +++ b/src/DbClient/Construction/IArgumentParserMethodBuilder.cs @@ -1,8 +1,8 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; - using DbReader.Database; + using DbClient.Database; /// /// Represents a class that based on a given sql and the type of the arguments object, diff --git a/src/DbReader/Construction/IKeyReaderMethodBuilder.cs b/src/DbClient/Construction/IKeyReaderMethodBuilder.cs similarity index 96% rename from src/DbReader/Construction/IKeyReaderMethodBuilder.cs rename to src/DbClient/Construction/IKeyReaderMethodBuilder.cs index efeb2ac..d0db551 100644 --- a/src/DbReader/Construction/IKeyReaderMethodBuilder.cs +++ b/src/DbClient/Construction/IKeyReaderMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Collections; diff --git a/src/DbReader/Construction/IManyToOneMethodBuilder.cs b/src/DbClient/Construction/IManyToOneMethodBuilder.cs similarity index 93% rename from src/DbReader/Construction/IManyToOneMethodBuilder.cs rename to src/DbClient/Construction/IManyToOneMethodBuilder.cs index cc4a9fd..9244a0a 100644 --- a/src/DbReader/Construction/IManyToOneMethodBuilder.cs +++ b/src/DbClient/Construction/IManyToOneMethodBuilder.cs @@ -1,8 +1,8 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; - using DbReader.Readers; + using DbClient.Readers; /// /// Represents a class that dynamically creates a method used to diff --git a/src/DbReader/Construction/IMethodSkeleton.cs b/src/DbClient/Construction/IMethodSkeleton.cs similarity index 95% rename from src/DbReader/Construction/IMethodSkeleton.cs rename to src/DbClient/Construction/IMethodSkeleton.cs index c6a5398..8f9bd97 100644 --- a/src/DbReader/Construction/IMethodSkeleton.cs +++ b/src/DbClient/Construction/IMethodSkeleton.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Reflection.Emit; diff --git a/src/DbReader/Construction/IMethodSkeletonFactory.cs b/src/DbClient/Construction/IMethodSkeletonFactory.cs similarity index 97% rename from src/DbReader/Construction/IMethodSkeletonFactory.cs rename to src/DbClient/Construction/IMethodSkeletonFactory.cs index f8c9240..ccecc02 100644 --- a/src/DbReader/Construction/IMethodSkeletonFactory.cs +++ b/src/DbClient/Construction/IMethodSkeletonFactory.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; diff --git a/src/DbReader/Construction/IOneToManyMethodBuilder.cs b/src/DbClient/Construction/IOneToManyMethodBuilder.cs similarity index 93% rename from src/DbReader/Construction/IOneToManyMethodBuilder.cs rename to src/DbClient/Construction/IOneToManyMethodBuilder.cs index fdeecab..abb858c 100644 --- a/src/DbReader/Construction/IOneToManyMethodBuilder.cs +++ b/src/DbClient/Construction/IOneToManyMethodBuilder.cs @@ -1,8 +1,8 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; - using DbReader.Readers; + using DbClient.Readers; /// /// Represents a class that dynamically creates a method used to diff --git a/src/DbReader/Construction/IParameterMatcher.cs b/src/DbClient/Construction/IParameterMatcher.cs similarity index 96% rename from src/DbReader/Construction/IParameterMatcher.cs rename to src/DbClient/Construction/IParameterMatcher.cs index a83bb98..5aef197 100644 --- a/src/DbReader/Construction/IParameterMatcher.cs +++ b/src/DbClient/Construction/IParameterMatcher.cs @@ -1,7 +1,7 @@ using System; using System.Data; -namespace DbReader.Construction +namespace DbClient.Construction { /// /// Represents a class that is capable of matching the properties of a given arguments type to the parameters found in a SQL statement. diff --git a/src/DbReader/Construction/IPrefixResolver.cs b/src/DbClient/Construction/IPrefixResolver.cs similarity index 95% rename from src/DbReader/Construction/IPrefixResolver.cs rename to src/DbClient/Construction/IPrefixResolver.cs index b5afc18..b35d5e6 100644 --- a/src/DbReader/Construction/IPrefixResolver.cs +++ b/src/DbClient/Construction/IPrefixResolver.cs @@ -17,11 +17,11 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************** - DbReader version 1.0.0.1 - https://github.com/seesharper/DbReader + DbClient version 1.0.0.1 + https://github.com/seesharper/DbClient http://twitter.com/bernhardrichter ******************************************************************************/ -namespace DbReader.Construction +namespace DbClient.Construction { using System.Data; using System.Reflection; diff --git a/src/DbReader/Construction/IReaderMethodBuilder.cs b/src/DbClient/Construction/IReaderMethodBuilder.cs similarity index 95% rename from src/DbReader/Construction/IReaderMethodBuilder.cs rename to src/DbClient/Construction/IReaderMethodBuilder.cs index 19db0e0..d51d61f 100644 --- a/src/DbReader/Construction/IReaderMethodBuilder.cs +++ b/src/DbClient/Construction/IReaderMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; diff --git a/src/DbReader/Construction/InstanceReaderMethodBuilder.cs b/src/DbClient/Construction/InstanceReaderMethodBuilder.cs similarity index 98% rename from src/DbReader/Construction/InstanceReaderMethodBuilder.cs rename to src/DbClient/Construction/InstanceReaderMethodBuilder.cs index a239da8..350182c 100644 --- a/src/DbReader/Construction/InstanceReaderMethodBuilder.cs +++ b/src/DbClient/Construction/InstanceReaderMethodBuilder.cs @@ -1,8 +1,8 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; - using DbReader.Readers; + using DbClient.Readers; using Interfaces; using Selectors; diff --git a/src/DbReader/Construction/KeyReaderMethodBuilder.cs b/src/DbClient/Construction/KeyReaderMethodBuilder.cs similarity index 98% rename from src/DbReader/Construction/KeyReaderMethodBuilder.cs rename to src/DbClient/Construction/KeyReaderMethodBuilder.cs index 6658d01..0acef15 100644 --- a/src/DbReader/Construction/KeyReaderMethodBuilder.cs +++ b/src/DbClient/Construction/KeyReaderMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Collections; diff --git a/src/DbReader/Construction/ManyToOneMethodBuilder.cs b/src/DbClient/Construction/ManyToOneMethodBuilder.cs similarity index 99% rename from src/DbReader/Construction/ManyToOneMethodBuilder.cs rename to src/DbClient/Construction/ManyToOneMethodBuilder.cs index f9be018..02b5f01 100644 --- a/src/DbReader/Construction/ManyToOneMethodBuilder.cs +++ b/src/DbClient/Construction/ManyToOneMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Collections.Generic; diff --git a/src/DbReader/Construction/MatchedParameter.cs b/src/DbClient/Construction/MatchedParameter.cs similarity index 95% rename from src/DbReader/Construction/MatchedParameter.cs rename to src/DbClient/Construction/MatchedParameter.cs index abb2df2..9516b67 100644 --- a/src/DbReader/Construction/MatchedParameter.cs +++ b/src/DbClient/Construction/MatchedParameter.cs @@ -1,7 +1,7 @@ using System.Reflection; -using DbReader.Database; +using DbClient.Database; -namespace DbReader.Construction +namespace DbClient.Construction { /// /// Represents a match between an argument object property and parameter found in a given sql statement. diff --git a/src/DbReader/Construction/MethodSkeletonFactory.cs b/src/DbClient/Construction/MethodSkeletonFactory.cs similarity index 98% rename from src/DbReader/Construction/MethodSkeletonFactory.cs rename to src/DbClient/Construction/MethodSkeletonFactory.cs index b318b4a..8303f6a 100644 --- a/src/DbReader/Construction/MethodSkeletonFactory.cs +++ b/src/DbClient/Construction/MethodSkeletonFactory.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Reflection; diff --git a/src/DbReader/Construction/OneToManyMethodBuilder.cs b/src/DbClient/Construction/OneToManyMethodBuilder.cs similarity index 99% rename from src/DbReader/Construction/OneToManyMethodBuilder.cs rename to src/DbClient/Construction/OneToManyMethodBuilder.cs index 27bba92..415c8a4 100644 --- a/src/DbReader/Construction/OneToManyMethodBuilder.cs +++ b/src/DbClient/Construction/OneToManyMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Collections.Generic; diff --git a/src/DbReader/Construction/ParameterMatcher.cs b/src/DbClient/Construction/ParameterMatcher.cs similarity index 97% rename from src/DbReader/Construction/ParameterMatcher.cs rename to src/DbClient/Construction/ParameterMatcher.cs index d242873..1138521 100644 --- a/src/DbReader/Construction/ParameterMatcher.cs +++ b/src/DbClient/Construction/ParameterMatcher.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Data; using System.Linq; -using DbReader.Database; -using DbReader.Extensions; -using DbReader.Selectors; +using DbClient.Database; +using DbClient.Extensions; +using DbClient.Selectors; -namespace DbReader.Construction +namespace DbClient.Construction { /// /// A class that matches the properties of a given arguments type to the parameters found in a SQL statement. diff --git a/src/DbReader/Construction/PrefixResolver.cs b/src/DbClient/Construction/PrefixResolver.cs similarity index 99% rename from src/DbReader/Construction/PrefixResolver.cs rename to src/DbClient/Construction/PrefixResolver.cs index 5e1b977..9f6c808 100644 --- a/src/DbReader/Construction/PrefixResolver.cs +++ b/src/DbClient/Construction/PrefixResolver.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; diff --git a/src/DbReader/Construction/PropertyReaderDelegate.cs b/src/DbClient/Construction/PropertyReaderDelegate.cs similarity index 93% rename from src/DbReader/Construction/PropertyReaderDelegate.cs rename to src/DbClient/Construction/PropertyReaderDelegate.cs index 8e5866d..056e15a 100644 --- a/src/DbReader/Construction/PropertyReaderDelegate.cs +++ b/src/DbClient/Construction/PropertyReaderDelegate.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; diff --git a/src/DbReader/Construction/PropertyReaderDelegateCache.cs b/src/DbClient/Construction/PropertyReaderDelegateCache.cs similarity index 88% rename from src/DbReader/Construction/PropertyReaderDelegateCache.cs rename to src/DbClient/Construction/PropertyReaderDelegateCache.cs index 2200911..8734dd6 100644 --- a/src/DbReader/Construction/PropertyReaderDelegateCache.cs +++ b/src/DbClient/Construction/PropertyReaderDelegateCache.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { /// /// Caches a diff --git a/src/DbReader/Construction/PropertyReaderMethodBuilder.cs b/src/DbClient/Construction/PropertyReaderMethodBuilder.cs similarity index 99% rename from src/DbReader/Construction/PropertyReaderMethodBuilder.cs rename to src/DbClient/Construction/PropertyReaderMethodBuilder.cs index f0c4404..04167ce 100644 --- a/src/DbReader/Construction/PropertyReaderMethodBuilder.cs +++ b/src/DbClient/Construction/PropertyReaderMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Collections.ObjectModel; diff --git a/src/DbReader/Construction/ReaderMethodBuilder.cs b/src/DbClient/Construction/ReaderMethodBuilder.cs similarity index 99% rename from src/DbReader/Construction/ReaderMethodBuilder.cs rename to src/DbClient/Construction/ReaderMethodBuilder.cs index 6eedc27..00199e7 100644 --- a/src/DbReader/Construction/ReaderMethodBuilder.cs +++ b/src/DbClient/Construction/ReaderMethodBuilder.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Data; diff --git a/src/DbReader/Construction/StaticCache.cs b/src/DbClient/Construction/StaticCache.cs similarity index 97% rename from src/DbReader/Construction/StaticCache.cs rename to src/DbClient/Construction/StaticCache.cs index f050741..669eedf 100644 --- a/src/DbReader/Construction/StaticCache.cs +++ b/src/DbClient/Construction/StaticCache.cs @@ -1,4 +1,4 @@ -namespace DbReader.Construction +namespace DbClient.Construction { using System; using System.Collections.Concurrent; diff --git a/src/DbReader/ContainerExtensions.cs b/src/DbClient/ContainerExtensions.cs similarity index 99% rename from src/DbReader/ContainerExtensions.cs rename to src/DbClient/ContainerExtensions.cs index 22d3db9..9c18ea4 100644 --- a/src/DbReader/ContainerExtensions.cs +++ b/src/DbClient/ContainerExtensions.cs @@ -1,4 +1,4 @@ -//namespace DbReader +//namespace DbClient //{ // using System; // using System.Linq; diff --git a/src/DbReader/DataReaderExtensions.cs b/src/DbClient/DataReaderExtensions.cs similarity index 99% rename from src/DbReader/DataReaderExtensions.cs rename to src/DbClient/DataReaderExtensions.cs index cee9260..0bad169 100644 --- a/src/DbReader/DataReaderExtensions.cs +++ b/src/DbClient/DataReaderExtensions.cs @@ -1,4 +1,4 @@ -namespace DbReader +namespace DbClient { using System; using System.Collections.Generic; diff --git a/src/DbReader/DataRecordExtensions.cs b/src/DbClient/DataRecordExtensions.cs similarity index 99% rename from src/DbReader/DataRecordExtensions.cs rename to src/DbClient/DataRecordExtensions.cs index d206898..fbe662f 100644 --- a/src/DbReader/DataRecordExtensions.cs +++ b/src/DbClient/DataRecordExtensions.cs @@ -1,4 +1,4 @@ -namespace DbReader +namespace DbClient { using System; using System.Data; diff --git a/src/DbReader/Database/ArgumentParser.cs b/src/DbClient/Database/ArgumentParser.cs similarity index 97% rename from src/DbReader/Database/ArgumentParser.cs rename to src/DbClient/Database/ArgumentParser.cs index 031b73f..df9e873 100644 --- a/src/DbReader/Database/ArgumentParser.cs +++ b/src/DbClient/Database/ArgumentParser.cs @@ -1,4 +1,4 @@ -namespace DbReader.Database +namespace DbClient.Database { using System; using System.Data; diff --git a/src/DbReader/Database/IArgumentParser.cs b/src/DbClient/Database/IArgumentParser.cs similarity index 97% rename from src/DbReader/Database/IArgumentParser.cs rename to src/DbClient/Database/IArgumentParser.cs index bf29dc3..85b6646 100644 --- a/src/DbReader/Database/IArgumentParser.cs +++ b/src/DbClient/Database/IArgumentParser.cs @@ -1,4 +1,4 @@ -namespace DbReader.Database +namespace DbClient.Database { using System; using System.Data; diff --git a/src/DbReader/Database/IParameterParser.cs b/src/DbClient/Database/IParameterParser.cs similarity index 98% rename from src/DbReader/Database/IParameterParser.cs rename to src/DbClient/Database/IParameterParser.cs index bd7cb69..03399de 100644 --- a/src/DbReader/Database/IParameterParser.cs +++ b/src/DbClient/Database/IParameterParser.cs @@ -1,4 +1,4 @@ -namespace DbReader.Database +namespace DbClient.Database { /// /// Represents a class that is capable of parsing a SQL statement diff --git a/src/DbReader/Database/QueryInfo.cs b/src/DbClient/Database/QueryInfo.cs similarity index 97% rename from src/DbReader/Database/QueryInfo.cs rename to src/DbClient/Database/QueryInfo.cs index b729cbd..40c035f 100644 --- a/src/DbReader/Database/QueryInfo.cs +++ b/src/DbClient/Database/QueryInfo.cs @@ -1,6 +1,6 @@ using System.Data; -namespace DbReader.Database +namespace DbClient.Database { /// diff --git a/src/DbReader/Database/RegExParameterParser.cs b/src/DbClient/Database/RegExParameterParser.cs similarity index 98% rename from src/DbReader/Database/RegExParameterParser.cs rename to src/DbClient/Database/RegExParameterParser.cs index 75bd563..70ff4b3 100644 --- a/src/DbReader/Database/RegExParameterParser.cs +++ b/src/DbClient/Database/RegExParameterParser.cs @@ -1,4 +1,4 @@ -namespace DbReader.Database +namespace DbClient.Database { using System; using System.Collections.Generic; diff --git a/src/DbReader/DbReader.csproj b/src/DbClient/DbClient.csproj similarity index 91% rename from src/DbReader/DbReader.csproj rename to src/DbClient/DbClient.csproj index 5bcde3a..2559d83 100644 --- a/src/DbReader/DbReader.csproj +++ b/src/DbClient/DbClient.csproj @@ -3,9 +3,9 @@ net8.0 Bernhard Richter - https://github.com/seesharper/DbReader + https://github.com/seesharper/DbClient git - https://github.com/seesharper/DbReader + https://github.com/seesharper/DbClient http://opensource.org/licenses/MIT Bernhard Richter data-access orm sql micro-orm diff --git a/src/DbReader/DbReaderOptions.cs b/src/DbClient/DbClientOptions.cs similarity index 97% rename from src/DbReader/DbReaderOptions.cs rename to src/DbClient/DbClientOptions.cs index 51eb9b0..8887118 100644 --- a/src/DbReader/DbReaderOptions.cs +++ b/src/DbClient/DbClientOptions.cs @@ -1,4 +1,4 @@ -namespace DbReader +namespace DbClient { using System; using System.Collections.Concurrent; @@ -13,14 +13,14 @@ using System.Threading; using System.Threading.Tasks; using Database; - using DbReader.Extensions; + using DbClient.Extensions; using Interfaces; using Selectors; /// /// Allows custom behavior to be specified /// - public static class DbReaderOptions + public static class DbClientOptions { private static readonly ConcurrentDictionary KeyProperties = new ConcurrentDictionary(); @@ -33,7 +33,7 @@ public static class DbReaderOptions /// public static Action CommandInitializer { get; set; } - static DbReaderOptions() + static DbClientOptions() { KeyConvention = p => p.Name.Equals("Id", StringComparison.OrdinalIgnoreCase) diff --git a/src/DbReader/DbConnectionExtensions.cs b/src/DbClient/DbConnectionExtensions.cs similarity index 99% rename from src/DbReader/DbConnectionExtensions.cs rename to src/DbClient/DbConnectionExtensions.cs index 280e852..81bbbe3 100644 --- a/src/DbReader/DbConnectionExtensions.cs +++ b/src/DbClient/DbConnectionExtensions.cs @@ -1,6 +1,6 @@ using System.Linq; -namespace DbReader +namespace DbClient { using System; using System.Collections; @@ -10,10 +10,10 @@ namespace DbReader using System.Threading; using System.Threading.Tasks; using Database; - using DbReader.Construction; - using DbReader.Extensions; + using DbClient.Construction; + using DbClient.Extensions; using LightInject; - using static DbReaderOptions; + using static DbClientOptions; /// /// Extends the interface. diff --git a/src/DbReader/DynamicArguments/ArgumentsBuilder.cs b/src/DbClient/DynamicArguments/ArgumentsBuilder.cs similarity index 98% rename from src/DbReader/DynamicArguments/ArgumentsBuilder.cs rename to src/DbClient/DynamicArguments/ArgumentsBuilder.cs index 9a9e3e7..44cd32c 100644 --- a/src/DbReader/DynamicArguments/ArgumentsBuilder.cs +++ b/src/DbClient/DynamicArguments/ArgumentsBuilder.cs @@ -4,10 +4,10 @@ using System.Linq; using System.Reflection; using System.Reflection.Emit; -using DbReader.DynamicArguments; -using DbReader.Tracking; +using DbClient.DynamicArguments; +using DbClient.Tracking; -namespace DbReader +namespace DbClient { /// /// Defines and creates new dynamic/anonymous types at runtime. diff --git a/src/DbReader/DynamicArguments/DynamicMemberInfo.cs b/src/DbClient/DynamicArguments/DynamicMemberInfo.cs similarity index 98% rename from src/DbReader/DynamicArguments/DynamicMemberInfo.cs rename to src/DbClient/DynamicArguments/DynamicMemberInfo.cs index 34c9a70..681ee34 100644 --- a/src/DbReader/DynamicArguments/DynamicMemberInfo.cs +++ b/src/DbClient/DynamicArguments/DynamicMemberInfo.cs @@ -1,6 +1,6 @@ using System; -namespace DbReader.DynamicArguments +namespace DbClient.DynamicArguments { /// /// Represents metadata about a dynamic member. diff --git a/src/DbReader/DynamicArguments/DynamicTypeActivator.cs b/src/DbClient/DynamicArguments/DynamicTypeActivator.cs similarity index 98% rename from src/DbReader/DynamicArguments/DynamicTypeActivator.cs rename to src/DbClient/DynamicArguments/DynamicTypeActivator.cs index e833ddc..bcc635e 100644 --- a/src/DbReader/DynamicArguments/DynamicTypeActivator.cs +++ b/src/DbClient/DynamicArguments/DynamicTypeActivator.cs @@ -1,7 +1,7 @@ using System; using System.Reflection.Emit; -namespace DbReader.DynamicArguments +namespace DbClient.DynamicArguments { /// /// Creates instances. diff --git a/src/DbReader/DynamicArguments/DynamicValueExtractor.cs b/src/DbClient/DynamicArguments/DynamicValueExtractor.cs similarity index 98% rename from src/DbReader/DynamicArguments/DynamicValueExtractor.cs rename to src/DbClient/DynamicArguments/DynamicValueExtractor.cs index 1e0f893..749df96 100644 --- a/src/DbReader/DynamicArguments/DynamicValueExtractor.cs +++ b/src/DbClient/DynamicArguments/DynamicValueExtractor.cs @@ -4,10 +4,10 @@ using System.Linq; using System.Reflection; using System.Reflection.Emit; -using DbReader.Extensions; -using DbReader.Tracking; +using DbClient.Extensions; +using DbClient.Tracking; -namespace DbReader.DynamicArguments +namespace DbClient.DynamicArguments { /// /// Extracts values from an existing object and creates an array of . diff --git a/src/DbReader/DynamicArguments/IDynamicType.cs b/src/DbClient/DynamicArguments/IDynamicType.cs similarity index 94% rename from src/DbReader/DynamicArguments/IDynamicType.cs rename to src/DbClient/DynamicArguments/IDynamicType.cs index 904d5e4..ba7d91f 100644 --- a/src/DbReader/DynamicArguments/IDynamicType.cs +++ b/src/DbClient/DynamicArguments/IDynamicType.cs @@ -1,4 +1,4 @@ -namespace DbReader.DynamicArguments +namespace DbClient.DynamicArguments { /// /// Implemented by the types generated by the `ArgumentsBuilder` class to be able to get an value by name. diff --git a/src/DbReader/DynamicArguments/TypeArrayEqualityComparer.cs b/src/DbClient/DynamicArguments/TypeArrayEqualityComparer.cs similarity index 96% rename from src/DbReader/DynamicArguments/TypeArrayEqualityComparer.cs rename to src/DbClient/DynamicArguments/TypeArrayEqualityComparer.cs index 9194ac5..36c65a0 100644 --- a/src/DbReader/DynamicArguments/TypeArrayEqualityComparer.cs +++ b/src/DbClient/DynamicArguments/TypeArrayEqualityComparer.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DbReader.DynamicArguments +namespace DbClient.DynamicArguments { internal class DynamicMemberInfoArrayEqualityComparer : IEqualityComparer { diff --git a/src/DbReader/DynamicArguments/ValueAccessor.cs b/src/DbClient/DynamicArguments/ValueAccessor.cs similarity index 98% rename from src/DbReader/DynamicArguments/ValueAccessor.cs rename to src/DbClient/DynamicArguments/ValueAccessor.cs index 5a6f4b4..55fdf11 100644 --- a/src/DbReader/DynamicArguments/ValueAccessor.cs +++ b/src/DbClient/DynamicArguments/ValueAccessor.cs @@ -3,7 +3,7 @@ using System.Reflection.Emit; using System.Runtime.CompilerServices; -namespace DbReader.DynamicArguments +namespace DbClient.DynamicArguments { /// /// Enables access to values by the field name. diff --git a/src/DbReader/ErrorMessages.cs b/src/DbClient/ErrorMessages.cs similarity index 87% rename from src/DbReader/ErrorMessages.cs rename to src/DbClient/ErrorMessages.cs index 53a1b7f..e4f105f 100644 --- a/src/DbReader/ErrorMessages.cs +++ b/src/DbClient/ErrorMessages.cs @@ -1,16 +1,16 @@ -namespace DbReader +namespace DbClient { internal class ErrorMessages { public const string ConstructorNotFound = "The type ({0}) does not contain a public parameterless constructor."; public const string DuplicateFieldName = "The data record contains a duplicate field name ({0}). Make sure that every column/field name in the data record is unique."; - public const string IncompatibleTypes = "The property ({0}) is not compatible with the column ({1})returned from the data record. Please make sure that the property is declared as ({2}) or that the column is returned as ({3}). Alternatively register a custom conversion function using the DbReaderOptions class."; + public const string IncompatibleTypes = "The property ({0}) is not compatible with the column ({1})returned from the data record. Please make sure that the property is declared as ({2}) or that the column is returned as ({3}). Alternatively register a custom conversion function using the DbClientOptions class."; public const string MissingKeyProperties = "The type ({0}) does not contain any properties that is considered a key property."; public const string UnmappedKeyProperty = "The property ({0}) is considered a key property, but is not available in the result set. Please make sure that the result set contains a field that can be mapped this property."; public const string MissingArgument = "Unable to resolve an argument value for parameter ({0}). Please make sure that the argument object has a property named '{0}'"; public const string DuplicateParameter = - "The parameter {0} is already specified. If this parameter is added in the DbReaderOptions.CommandInitializer method there is no need to define the argument when executing the query." + "The parameter {0} is already specified. If this parameter is added in the DbClientOptions.CommandInitializer method there is no need to define the argument when executing the query." ; public const string InvalidCollectionType = @@ -19,10 +19,10 @@ internal class ErrorMessages public const string SimpleProjectType = "{0} Simple types such as string and int are not allowed as the item type for a collection property."; - public const string UnknownArgumentType = "The property {0} has a type ({1}) that cannot be passed as an argument. Consider adding support for {1} using DbReaderOptions.WhenPassing()"; + public const string UnknownArgumentType = "The property {0} has a type ({1}) that cannot be passed as an argument. Consider adding support for {1} using DbClientOptions.WhenPassing()"; public const string InvalidListArgument = "The parameter {0} is defined a list parameter, but the property {1} is not IEnumerable"; - public const string InvalidParameterValue = "The parameter ({0}) did not accept the value `{1}` ({2}). If the value is a custom type, consider adding support for the type using DbReaderOptions.WhenPassing()"; + public const string InvalidParameterValue = "The parameter ({0}) did not accept the value `{1}` ({2}). If the value is a custom type, consider adding support for the type using DbClientOptions.WhenPassing()"; } } \ No newline at end of file diff --git a/src/DbReader/Extensions/CollectionExtensions.cs b/src/DbClient/Extensions/CollectionExtensions.cs similarity index 98% rename from src/DbReader/Extensions/CollectionExtensions.cs rename to src/DbClient/Extensions/CollectionExtensions.cs index 14883a9..8102472 100644 --- a/src/DbReader/Extensions/CollectionExtensions.cs +++ b/src/DbClient/Extensions/CollectionExtensions.cs @@ -1,4 +1,4 @@ -namespace DbReader.Extensions +namespace DbClient.Extensions { using System; using System.Collections.Concurrent; diff --git a/src/DbReader/Extensions/ExpressionExtensions.cs b/src/DbClient/Extensions/ExpressionExtensions.cs similarity index 97% rename from src/DbReader/Extensions/ExpressionExtensions.cs rename to src/DbClient/Extensions/ExpressionExtensions.cs index a7ae1be..9ce5a83 100644 --- a/src/DbReader/Extensions/ExpressionExtensions.cs +++ b/src/DbClient/Extensions/ExpressionExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq.Expressions; -namespace DbReader.Extensions +namespace DbClient.Extensions { /// /// Extends the class. diff --git a/src/DbReader/Extensions/GeneratorExtensions.cs b/src/DbClient/Extensions/GeneratorExtensions.cs similarity index 98% rename from src/DbReader/Extensions/GeneratorExtensions.cs rename to src/DbClient/Extensions/GeneratorExtensions.cs index 72b0f45..8a5a263 100644 --- a/src/DbReader/Extensions/GeneratorExtensions.cs +++ b/src/DbClient/Extensions/GeneratorExtensions.cs @@ -1,4 +1,4 @@ -namespace DbReader.Extensions +namespace DbClient.Extensions { using System.Diagnostics.CodeAnalysis; using System.Reflection.Emit; diff --git a/src/DbReader/Extensions/PropertyInfoEnumerableExtensions.cs b/src/DbClient/Extensions/PropertyInfoEnumerableExtensions.cs similarity index 97% rename from src/DbReader/Extensions/PropertyInfoEnumerableExtensions.cs rename to src/DbClient/Extensions/PropertyInfoEnumerableExtensions.cs index 66615eb..ae879fa 100644 --- a/src/DbReader/Extensions/PropertyInfoEnumerableExtensions.cs +++ b/src/DbClient/Extensions/PropertyInfoEnumerableExtensions.cs @@ -1,4 +1,4 @@ -namespace DbReader.Extensions +namespace DbClient.Extensions { using System.Collections.Generic; using System.Linq; diff --git a/src/DbReader/Extensions/PropertyReflectionExtensions.cs b/src/DbClient/Extensions/PropertyReflectionExtensions.cs similarity index 98% rename from src/DbReader/Extensions/PropertyReflectionExtensions.cs rename to src/DbClient/Extensions/PropertyReflectionExtensions.cs index 5a28f30..b42f2fa 100644 --- a/src/DbReader/Extensions/PropertyReflectionExtensions.cs +++ b/src/DbClient/Extensions/PropertyReflectionExtensions.cs @@ -1,4 +1,4 @@ -namespace DbReader.Extensions +namespace DbClient.Extensions { using System.Data; using System.Reflection; diff --git a/src/DbReader/Extensions/StringExtensions.cs b/src/DbClient/Extensions/StringExtensions.cs similarity index 99% rename from src/DbReader/Extensions/StringExtensions.cs rename to src/DbClient/Extensions/StringExtensions.cs index dee1c59..c1735fb 100644 --- a/src/DbReader/Extensions/StringExtensions.cs +++ b/src/DbClient/Extensions/StringExtensions.cs @@ -1,4 +1,4 @@ -namespace DbReader.Extensions +namespace DbClient.Extensions { using System; using System.Security.Cryptography; diff --git a/src/DbReader/Extensions/TypeReflectionExtensions.cs b/src/DbClient/Extensions/TypeReflectionExtensions.cs similarity index 99% rename from src/DbReader/Extensions/TypeReflectionExtensions.cs rename to src/DbClient/Extensions/TypeReflectionExtensions.cs index 303f97e..9958d90 100644 --- a/src/DbReader/Extensions/TypeReflectionExtensions.cs +++ b/src/DbClient/Extensions/TypeReflectionExtensions.cs @@ -1,4 +1,4 @@ -namespace DbReader.Extensions +namespace DbClient.Extensions { using System; using System.Collections.Concurrent; diff --git a/src/DbReader/Guard.cs b/src/DbClient/Guard.cs similarity index 96% rename from src/DbReader/Guard.cs rename to src/DbClient/Guard.cs index 6f24baf..b7a7554 100644 --- a/src/DbReader/Guard.cs +++ b/src/DbClient/Guard.cs @@ -1,4 +1,4 @@ -namespace DbReader +namespace DbClient { using System; diff --git a/src/DbReader/Interfaces/IInstanceReaderMethodBuilder.cs b/src/DbClient/Interfaces/IInstanceReaderMethodBuilder.cs similarity index 94% rename from src/DbReader/Interfaces/IInstanceReaderMethodBuilder.cs rename to src/DbClient/Interfaces/IInstanceReaderMethodBuilder.cs index 07d6e92..be93d88 100644 --- a/src/DbReader/Interfaces/IInstanceReaderMethodBuilder.cs +++ b/src/DbClient/Interfaces/IInstanceReaderMethodBuilder.cs @@ -1,8 +1,8 @@ -namespace DbReader.Interfaces +namespace DbClient.Interfaces { using System; using System.Data; - using DbReader.Readers; + using DbClient.Readers; /// /// Represents a class that creates an instance of diff --git a/src/DbReader/InternalsVisibleTo.cs b/src/DbClient/InternalsVisibleTo.cs similarity index 80% rename from src/DbReader/InternalsVisibleTo.cs rename to src/DbClient/InternalsVisibleTo.cs index def65e7..4a1148d 100644 --- a/src/DbReader/InternalsVisibleTo.cs +++ b/src/DbClient/InternalsVisibleTo.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("DbReader.Tests")] +[assembly: InternalsVisibleTo("DbClient.Tests")] [assembly: InternalsVisibleTo("OneToManyDynamicMethod")] [assembly: InternalsVisibleTo("ManyToOneDynamicMethod")] [assembly: InternalsVisibleTo("ReaderDynamicMethod")] \ No newline at end of file diff --git a/src/DbReader/Mapping/CachedPropertyMapper.cs b/src/DbClient/Mapping/CachedPropertyMapper.cs similarity index 98% rename from src/DbReader/Mapping/CachedPropertyMapper.cs rename to src/DbClient/Mapping/CachedPropertyMapper.cs index 327739f..b667b97 100644 --- a/src/DbReader/Mapping/CachedPropertyMapper.cs +++ b/src/DbClient/Mapping/CachedPropertyMapper.cs @@ -1,4 +1,4 @@ -namespace DbReader.Mapping +namespace DbClient.Mapping { using System; using System.Collections.Concurrent; diff --git a/src/DbReader/Mapping/IKeyPropertyMapper.cs b/src/DbClient/Mapping/IKeyPropertyMapper.cs similarity index 86% rename from src/DbReader/Mapping/IKeyPropertyMapper.cs rename to src/DbClient/Mapping/IKeyPropertyMapper.cs index d621244..792d801 100644 --- a/src/DbReader/Mapping/IKeyPropertyMapper.cs +++ b/src/DbClient/Mapping/IKeyPropertyMapper.cs @@ -1,12 +1,12 @@ using System; -namespace DbReader.Mapping +namespace DbClient.Mapping { using System.Data; /// /// Represents a class that is capable of mapping the key fields from a given - /// according to the specified . + /// according to the specified . /// public interface IKeyPropertyMapper { diff --git a/src/DbReader/Mapping/IPropertyMapper.cs b/src/DbClient/Mapping/IPropertyMapper.cs similarity index 97% rename from src/DbReader/Mapping/IPropertyMapper.cs rename to src/DbClient/Mapping/IPropertyMapper.cs index 1d6ab83..2f14883 100644 --- a/src/DbReader/Mapping/IPropertyMapper.cs +++ b/src/DbClient/Mapping/IPropertyMapper.cs @@ -1,4 +1,4 @@ -namespace DbReader.Mapping +namespace DbClient.Mapping { using System; using System.Data; diff --git a/src/DbReader/Mapping/KeyPropertyMapper.cs b/src/DbClient/Mapping/KeyPropertyMapper.cs similarity index 92% rename from src/DbReader/Mapping/KeyPropertyMapper.cs rename to src/DbClient/Mapping/KeyPropertyMapper.cs index 2152759..5c2b0c4 100644 --- a/src/DbReader/Mapping/KeyPropertyMapper.cs +++ b/src/DbClient/Mapping/KeyPropertyMapper.cs @@ -1,4 +1,4 @@ -namespace DbReader.Mapping +namespace DbClient.Mapping { using System; using System.Data; @@ -6,7 +6,7 @@ /// /// An decorator that maps key fields from a given - /// according to the specified . + /// according to the specified . /// public class KeyPropertyMapper : IKeyPropertyMapper { @@ -34,7 +34,7 @@ public MappingInfo[] Execute(Type type, IDataRecord dataRecord, string prefix) MappingInfo[] propertyMappings = propertyMapper.Execute(type, dataRecord, prefix); MappingInfo[] keyPropertyMappings = - propertyMappings.Where(pm => DbReaderOptions.KeyConvention(pm.Property)).ToArray(); + propertyMappings.Where(pm => DbClientOptions.KeyConvention(pm.Property)).ToArray(); return keyPropertyMappings; } diff --git a/src/DbReader/Mapping/KeyPropertyMapperValidator.cs b/src/DbClient/Mapping/KeyPropertyMapperValidator.cs similarity index 98% rename from src/DbReader/Mapping/KeyPropertyMapperValidator.cs rename to src/DbClient/Mapping/KeyPropertyMapperValidator.cs index 1e73938..ee5c84e 100644 --- a/src/DbReader/Mapping/KeyPropertyMapperValidator.cs +++ b/src/DbClient/Mapping/KeyPropertyMapperValidator.cs @@ -1,4 +1,4 @@ -namespace DbReader.Mapping +namespace DbClient.Mapping { using System; using System.Data; diff --git a/src/DbReader/Mapping/MappingInfo.cs b/src/DbClient/Mapping/MappingInfo.cs similarity index 98% rename from src/DbReader/Mapping/MappingInfo.cs rename to src/DbClient/Mapping/MappingInfo.cs index f22aa34..ec69c1c 100644 --- a/src/DbReader/Mapping/MappingInfo.cs +++ b/src/DbClient/Mapping/MappingInfo.cs @@ -1,4 +1,4 @@ -namespace DbReader.Mapping +namespace DbClient.Mapping { using System.Reflection; using Extensions; diff --git a/src/DbReader/Mapping/PropertyMapper.cs b/src/DbClient/Mapping/PropertyMapper.cs similarity index 98% rename from src/DbReader/Mapping/PropertyMapper.cs rename to src/DbClient/Mapping/PropertyMapper.cs index ff1cf87..ba24f5c 100644 --- a/src/DbReader/Mapping/PropertyMapper.cs +++ b/src/DbClient/Mapping/PropertyMapper.cs @@ -1,11 +1,11 @@ -namespace DbReader.Mapping +namespace DbClient.Mapping { using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Reflection; - using DbReader.Extensions; + using DbClient.Extensions; using Selectors; /// diff --git a/src/DbReader/Mapping/PropertyTypeValidator.cs b/src/DbClient/Mapping/PropertyTypeValidator.cs similarity index 99% rename from src/DbReader/Mapping/PropertyTypeValidator.cs rename to src/DbClient/Mapping/PropertyTypeValidator.cs index 146c536..ac676b8 100644 --- a/src/DbReader/Mapping/PropertyTypeValidator.cs +++ b/src/DbClient/Mapping/PropertyTypeValidator.cs @@ -1,4 +1,4 @@ -namespace DbReader.Mapping +namespace DbClient.Mapping { using System; using System.Data; diff --git a/src/DbReader/Nuget/DbReader.nuspec b/src/DbClient/Nuget/DbReader.nuspec similarity index 93% rename from src/DbReader/Nuget/DbReader.nuspec rename to src/DbClient/Nuget/DbReader.nuspec index d2a9556..e44d2f6 100644 --- a/src/DbReader/Nuget/DbReader.nuspec +++ b/src/DbClient/Nuget/DbReader.nuspec @@ -1,12 +1,12 @@  - DbReader + DbClient 1.0.0.0 Bernhard Richter Bernhard Richter http://opensource.org/licenses/MIT - https://github.com/seesharper/DbReader + https://github.com/seesharper/DbClient false A simple and fast database reader for the .Net framework. Bernhard Richter diff --git a/src/DbReader/PassDelegate.cs b/src/DbClient/PassDelegate.cs similarity index 97% rename from src/DbReader/PassDelegate.cs rename to src/DbClient/PassDelegate.cs index 59356b4..3092f74 100644 --- a/src/DbReader/PassDelegate.cs +++ b/src/DbClient/PassDelegate.cs @@ -1,4 +1,4 @@ -namespace DbReader +namespace DbClient { using System; using System.Data; diff --git a/src/DbReader/ReadDelegate.cs b/src/DbClient/ReadDelegate.cs similarity index 98% rename from src/DbReader/ReadDelegate.cs rename to src/DbClient/ReadDelegate.cs index 3f15a9e..37fa6e5 100644 --- a/src/DbReader/ReadDelegate.cs +++ b/src/DbClient/ReadDelegate.cs @@ -1,4 +1,4 @@ -namespace DbReader +namespace DbClient { using System; using System.Data; diff --git a/src/DbReader/Readers/CachedInstanceReader.cs b/src/DbClient/Readers/CachedInstanceReader.cs similarity index 99% rename from src/DbReader/Readers/CachedInstanceReader.cs rename to src/DbClient/Readers/CachedInstanceReader.cs index 1972a76..05f1b82 100644 --- a/src/DbReader/Readers/CachedInstanceReader.cs +++ b/src/DbClient/Readers/CachedInstanceReader.cs @@ -1,4 +1,4 @@ -namespace DbReader.Readers +namespace DbClient.Readers { using System.Collections; using System.Collections.Concurrent; diff --git a/src/DbReader/Readers/IInstanceReader.cs b/src/DbClient/Readers/IInstanceReader.cs similarity index 96% rename from src/DbReader/Readers/IInstanceReader.cs rename to src/DbClient/Readers/IInstanceReader.cs index 413284f..25a6384 100644 --- a/src/DbReader/Readers/IInstanceReader.cs +++ b/src/DbClient/Readers/IInstanceReader.cs @@ -1,4 +1,4 @@ -namespace DbReader.Readers +namespace DbClient.Readers { using System.Data; diff --git a/src/DbReader/Readers/IInstanceReaderFactory.cs b/src/DbClient/Readers/IInstanceReaderFactory.cs similarity index 96% rename from src/DbReader/Readers/IInstanceReaderFactory.cs rename to src/DbClient/Readers/IInstanceReaderFactory.cs index 5faf672..259e45e 100644 --- a/src/DbReader/Readers/IInstanceReaderFactory.cs +++ b/src/DbClient/Readers/IInstanceReaderFactory.cs @@ -1,4 +1,4 @@ -namespace DbReader.Readers +namespace DbClient.Readers { /// /// Represents a class that is capable of creating an based on the given type. diff --git a/src/DbReader/Readers/IKeyReader.cs b/src/DbClient/Readers/IKeyReader.cs similarity index 97% rename from src/DbReader/Readers/IKeyReader.cs rename to src/DbClient/Readers/IKeyReader.cs index 4ca3294..729ece1 100644 --- a/src/DbReader/Readers/IKeyReader.cs +++ b/src/DbClient/Readers/IKeyReader.cs @@ -1,4 +1,4 @@ -namespace DbReader.Readers +namespace DbClient.Readers { using System; using System.Collections; diff --git a/src/DbReader/Readers/IReader.cs b/src/DbClient/Readers/IReader.cs similarity index 96% rename from src/DbReader/Readers/IReader.cs rename to src/DbClient/Readers/IReader.cs index eadb7a0..3d50e87 100644 --- a/src/DbReader/Readers/IReader.cs +++ b/src/DbClient/Readers/IReader.cs @@ -1,4 +1,4 @@ -namespace DbReader.Readers +namespace DbClient.Readers { using System.Data; diff --git a/src/DbReader/Readers/InstanceReader.cs b/src/DbClient/Readers/InstanceReader.cs similarity index 98% rename from src/DbReader/Readers/InstanceReader.cs rename to src/DbClient/Readers/InstanceReader.cs index 3389f3f..88d13fd 100644 --- a/src/DbReader/Readers/InstanceReader.cs +++ b/src/DbClient/Readers/InstanceReader.cs @@ -1,4 +1,4 @@ -namespace DbReader.Readers +namespace DbClient.Readers { using System.Data; using Interfaces; diff --git a/src/DbReader/Readers/InstanceReaderFactory.cs b/src/DbClient/Readers/InstanceReaderFactory.cs similarity index 95% rename from src/DbReader/Readers/InstanceReaderFactory.cs rename to src/DbClient/Readers/InstanceReaderFactory.cs index 4ef3ee4..3b85d2e 100644 --- a/src/DbReader/Readers/InstanceReaderFactory.cs +++ b/src/DbClient/Readers/InstanceReaderFactory.cs @@ -1,6 +1,6 @@ -using DbReader.LightInject; +using DbClient.LightInject; -namespace DbReader.Readers +namespace DbClient.Readers { /// diff --git a/src/DbReader/Readers/KeyReader.cs b/src/DbClient/Readers/KeyReader.cs similarity index 96% rename from src/DbReader/Readers/KeyReader.cs rename to src/DbClient/Readers/KeyReader.cs index 74f31ee..610725e 100644 --- a/src/DbReader/Readers/KeyReader.cs +++ b/src/DbClient/Readers/KeyReader.cs @@ -1,10 +1,10 @@ -namespace DbReader.Readers +namespace DbClient.Readers { using System; using System.Collections; using System.Data; using Construction; - using DbReader.Interfaces; + using DbClient.Interfaces; /// /// A class that is capable of reading the key columns for a given . diff --git a/src/DbReader/Selectors/CachedFieldSelector.cs b/src/DbClient/Selectors/CachedFieldSelector.cs similarity index 97% rename from src/DbReader/Selectors/CachedFieldSelector.cs rename to src/DbClient/Selectors/CachedFieldSelector.cs index 4a1c987..f41df0b 100644 --- a/src/DbReader/Selectors/CachedFieldSelector.cs +++ b/src/DbClient/Selectors/CachedFieldSelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System.Collections.Generic; using System.Data; diff --git a/src/DbReader/Selectors/CachedPropertySelector.cs b/src/DbClient/Selectors/CachedPropertySelector.cs similarity index 97% rename from src/DbReader/Selectors/CachedPropertySelector.cs rename to src/DbClient/Selectors/CachedPropertySelector.cs index 52d87d5..4d631a9 100644 --- a/src/DbReader/Selectors/CachedPropertySelector.cs +++ b/src/DbClient/Selectors/CachedPropertySelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Collections.Concurrent; diff --git a/src/DbReader/Selectors/ColumnInfo.cs b/src/DbClient/Selectors/ColumnInfo.cs similarity index 98% rename from src/DbReader/Selectors/ColumnInfo.cs rename to src/DbClient/Selectors/ColumnInfo.cs index bec7ee3..66f3ddf 100644 --- a/src/DbReader/Selectors/ColumnInfo.cs +++ b/src/DbClient/Selectors/ColumnInfo.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using Extensions; diff --git a/src/DbReader/Selectors/ConstructorValidator.cs b/src/DbClient/Selectors/ConstructorValidator.cs similarity index 96% rename from src/DbReader/Selectors/ConstructorValidator.cs rename to src/DbClient/Selectors/ConstructorValidator.cs index f607ad7..a15c8a5 100644 --- a/src/DbReader/Selectors/ConstructorValidator.cs +++ b/src/DbClient/Selectors/ConstructorValidator.cs @@ -17,11 +17,11 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************** - DbReader version 1.0.0.1 - https://github.com/seesharper/DbReader + DbClient version 1.0.0.1 + https://github.com/seesharper/DbClient http://twitter.com/bernhardrichter ******************************************************************************/ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Reflection; diff --git a/src/DbReader/Selectors/FieldSelector.cs b/src/DbClient/Selectors/FieldSelector.cs similarity index 98% rename from src/DbReader/Selectors/FieldSelector.cs rename to src/DbClient/Selectors/FieldSelector.cs index 7222ae0..bd787f2 100644 --- a/src/DbReader/Selectors/FieldSelector.cs +++ b/src/DbClient/Selectors/FieldSelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Collections.Generic; diff --git a/src/DbReader/Selectors/FirstConstructorSelector.cs b/src/DbClient/Selectors/FirstConstructorSelector.cs similarity index 95% rename from src/DbReader/Selectors/FirstConstructorSelector.cs rename to src/DbClient/Selectors/FirstConstructorSelector.cs index 6f7f19f..4fd90ed 100644 --- a/src/DbReader/Selectors/FirstConstructorSelector.cs +++ b/src/DbClient/Selectors/FirstConstructorSelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Reflection; diff --git a/src/DbReader/Selectors/IConstructorSelector.cs b/src/DbClient/Selectors/IConstructorSelector.cs similarity index 95% rename from src/DbReader/Selectors/IConstructorSelector.cs rename to src/DbClient/Selectors/IConstructorSelector.cs index 19e1d4b..f27ba97 100644 --- a/src/DbReader/Selectors/IConstructorSelector.cs +++ b/src/DbClient/Selectors/IConstructorSelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Reflection; diff --git a/src/DbReader/Selectors/IFieldSelector.cs b/src/DbClient/Selectors/IFieldSelector.cs similarity index 95% rename from src/DbReader/Selectors/IFieldSelector.cs rename to src/DbClient/Selectors/IFieldSelector.cs index f12e492..7c756c1 100644 --- a/src/DbReader/Selectors/IFieldSelector.cs +++ b/src/DbClient/Selectors/IFieldSelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System.Collections.Generic; using System.Data; diff --git a/src/DbReader/Selectors/IMethodSelector.cs b/src/DbClient/Selectors/IMethodSelector.cs similarity index 95% rename from src/DbReader/Selectors/IMethodSelector.cs rename to src/DbClient/Selectors/IMethodSelector.cs index dc727cb..11bb654 100644 --- a/src/DbReader/Selectors/IMethodSelector.cs +++ b/src/DbClient/Selectors/IMethodSelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Data; diff --git a/src/DbReader/Selectors/IOrdinalSelector.cs b/src/DbClient/Selectors/IOrdinalSelector.cs similarity index 96% rename from src/DbReader/Selectors/IOrdinalSelector.cs rename to src/DbClient/Selectors/IOrdinalSelector.cs index 491c18d..ea91880 100644 --- a/src/DbReader/Selectors/IOrdinalSelector.cs +++ b/src/DbClient/Selectors/IOrdinalSelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Data; diff --git a/src/DbReader/Selectors/IPropertySelector.cs b/src/DbClient/Selectors/IPropertySelector.cs similarity index 94% rename from src/DbReader/Selectors/IPropertySelector.cs rename to src/DbClient/Selectors/IPropertySelector.cs index 8ae8295..df3be3e 100644 --- a/src/DbReader/Selectors/IPropertySelector.cs +++ b/src/DbClient/Selectors/IPropertySelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Reflection; diff --git a/src/DbReader/Selectors/ManyToOnePropertySelector.cs b/src/DbClient/Selectors/ManyToOnePropertySelector.cs similarity index 97% rename from src/DbReader/Selectors/ManyToOnePropertySelector.cs rename to src/DbClient/Selectors/ManyToOnePropertySelector.cs index 783fb3b..6e68460 100644 --- a/src/DbReader/Selectors/ManyToOnePropertySelector.cs +++ b/src/DbClient/Selectors/ManyToOnePropertySelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Linq; diff --git a/src/DbReader/Selectors/MethodSelector.cs b/src/DbClient/Selectors/MethodSelector.cs similarity index 99% rename from src/DbReader/Selectors/MethodSelector.cs rename to src/DbClient/Selectors/MethodSelector.cs index a19a1c8..02b4246 100644 --- a/src/DbReader/Selectors/MethodSelector.cs +++ b/src/DbClient/Selectors/MethodSelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Data; diff --git a/src/DbReader/Selectors/OneToManyPropertySelector.cs b/src/DbClient/Selectors/OneToManyPropertySelector.cs similarity index 96% rename from src/DbReader/Selectors/OneToManyPropertySelector.cs rename to src/DbClient/Selectors/OneToManyPropertySelector.cs index 7dc5502..7e85373 100644 --- a/src/DbReader/Selectors/OneToManyPropertySelector.cs +++ b/src/DbClient/Selectors/OneToManyPropertySelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Linq; diff --git a/src/DbReader/Selectors/OneToManyPropertyValidator.cs b/src/DbClient/Selectors/OneToManyPropertyValidator.cs similarity index 99% rename from src/DbReader/Selectors/OneToManyPropertyValidator.cs rename to src/DbClient/Selectors/OneToManyPropertyValidator.cs index 759961a..5b5cf8a 100644 --- a/src/DbReader/Selectors/OneToManyPropertyValidator.cs +++ b/src/DbClient/Selectors/OneToManyPropertyValidator.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Collections.Generic; diff --git a/src/DbReader/Selectors/OrdinalSelector.cs b/src/DbClient/Selectors/OrdinalSelector.cs similarity index 97% rename from src/DbReader/Selectors/OrdinalSelector.cs rename to src/DbClient/Selectors/OrdinalSelector.cs index f9633fb..bc463d1 100644 --- a/src/DbReader/Selectors/OrdinalSelector.cs +++ b/src/DbClient/Selectors/OrdinalSelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Data; diff --git a/src/DbReader/Selectors/ParameterlessConstructorSelector.cs b/src/DbClient/Selectors/ParameterlessConstructorSelector.cs similarity index 93% rename from src/DbReader/Selectors/ParameterlessConstructorSelector.cs rename to src/DbClient/Selectors/ParameterlessConstructorSelector.cs index afaf20b..62a2a58 100644 --- a/src/DbReader/Selectors/ParameterlessConstructorSelector.cs +++ b/src/DbClient/Selectors/ParameterlessConstructorSelector.cs @@ -1,8 +1,8 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Reflection; - using DbReader.Extensions; + using DbClient.Extensions; /// /// An that looks for a parameterless diff --git a/src/DbReader/Selectors/ReadableArgumentPropertiesValidator.cs b/src/DbClient/Selectors/ReadableArgumentPropertiesValidator.cs similarity index 97% rename from src/DbReader/Selectors/ReadableArgumentPropertiesValidator.cs rename to src/DbClient/Selectors/ReadableArgumentPropertiesValidator.cs index 58c1ab7..d211346 100644 --- a/src/DbReader/Selectors/ReadableArgumentPropertiesValidator.cs +++ b/src/DbClient/Selectors/ReadableArgumentPropertiesValidator.cs @@ -1,8 +1,8 @@ using System; using System.Reflection; -using DbReader.Extensions; +using DbClient.Extensions; -namespace DbReader.Selectors +namespace DbClient.Selectors { /// /// An decorator that ensures that diff --git a/src/DbReader/Selectors/ReadablePropertySelector.cs b/src/DbClient/Selectors/ReadablePropertySelector.cs similarity index 95% rename from src/DbReader/Selectors/ReadablePropertySelector.cs rename to src/DbClient/Selectors/ReadablePropertySelector.cs index 893b44c..3053995 100644 --- a/src/DbReader/Selectors/ReadablePropertySelector.cs +++ b/src/DbClient/Selectors/ReadablePropertySelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Data; diff --git a/src/DbReader/Selectors/SimplePropertySelector.cs b/src/DbClient/Selectors/SimplePropertySelector.cs similarity index 96% rename from src/DbReader/Selectors/SimplePropertySelector.cs rename to src/DbClient/Selectors/SimplePropertySelector.cs index 112fe5c..93c90f7 100644 --- a/src/DbReader/Selectors/SimplePropertySelector.cs +++ b/src/DbClient/Selectors/SimplePropertySelector.cs @@ -1,4 +1,4 @@ -namespace DbReader.Selectors +namespace DbClient.Selectors { using System; using System.Linq; diff --git a/src/DbReader/Settings.StyleCop b/src/DbClient/Settings.StyleCop similarity index 100% rename from src/DbReader/Settings.StyleCop rename to src/DbClient/Settings.StyleCop diff --git a/src/DbReader/SqlStatement.cs b/src/DbClient/SqlStatement.cs similarity index 93% rename from src/DbReader/SqlStatement.cs rename to src/DbClient/SqlStatement.cs index 92f1b0e..b2c6357 100644 --- a/src/DbReader/SqlStatement.cs +++ b/src/DbClient/SqlStatement.cs @@ -1,4 +1,4 @@ -namespace DbReader +namespace DbClient { using System; diff --git a/src/DbReader/Tracking/ITrackedObject.cs b/src/DbClient/Tracking/ITrackedObject.cs similarity index 92% rename from src/DbReader/Tracking/ITrackedObject.cs rename to src/DbClient/Tracking/ITrackedObject.cs index 102a4f7..8d2cb56 100644 --- a/src/DbReader/Tracking/ITrackedObject.cs +++ b/src/DbClient/Tracking/ITrackedObject.cs @@ -1,4 +1,4 @@ -namespace DbReader.Tracking; +namespace DbClient.Tracking; using System.Collections.Generic; diff --git a/src/DbReader/Tracking/TrackedAttribute.cs b/src/DbClient/Tracking/TrackedAttribute.cs similarity index 68% rename from src/DbReader/Tracking/TrackedAttribute.cs rename to src/DbClient/Tracking/TrackedAttribute.cs index 9b31bd7..34d9af6 100644 --- a/src/DbReader/Tracking/TrackedAttribute.cs +++ b/src/DbClient/Tracking/TrackedAttribute.cs @@ -1,10 +1,10 @@ using System; -namespace DbReader.Tracking; +namespace DbClient.Tracking; /// /// Used to indicate that a class should be tracked. -/// Note that the DbReader.Tracking package is required to use this attribute. +/// Note that the DbClient.Tracking package is required to use this attribute. /// [AttributeUsage(AttributeTargets.Class)] public class TrackedAttribute : Attribute diff --git a/src/DbReader/TypeEvaluator.cs b/src/DbClient/TypeEvaluator.cs similarity index 97% rename from src/DbReader/TypeEvaluator.cs rename to src/DbClient/TypeEvaluator.cs index 14c38ca..339323d 100644 --- a/src/DbReader/TypeEvaluator.cs +++ b/src/DbClient/TypeEvaluator.cs @@ -1,4 +1,4 @@ -namespace DbReader +namespace DbClient { using System; using System.Linq; diff --git a/src/DbReader/ValueConverter.cs b/src/DbClient/ValueConverter.cs similarity index 98% rename from src/DbReader/ValueConverter.cs rename to src/DbClient/ValueConverter.cs index 2a770fb..d3f6552 100644 --- a/src/DbReader/ValueConverter.cs +++ b/src/DbClient/ValueConverter.cs @@ -17,11 +17,11 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************** - DbReader version 1.0.0.1 - https://github.com/seesharper/DbReader + DbClient version 1.0.0.1 + https://github.com/seesharper/DbClient http://twitter.com/bernhardrichter ******************************************************************************/ -namespace DbReader +namespace DbClient { using System; using System.Collections.Concurrent; diff --git a/src/DbReader/packages.config b/src/DbClient/packages.config similarity index 100% rename from src/DbReader/packages.config rename to src/DbClient/packages.config diff --git a/src/DbReader.Tests/Failing.playlist b/src/DbReader.Tests/Failing.playlist deleted file mode 100644 index 3785e1d..0000000 --- a/src/DbReader.Tests/Failing.playlist +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/DbReader.Tracking.SampleAssembly/SampleClasses.cs b/src/DbReader.Tracking.SampleAssembly/SampleClasses.cs deleted file mode 100644 index 5e156fe..0000000 --- a/src/DbReader.Tracking.SampleAssembly/SampleClasses.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace DbReader.Tracking.SampleAssembly; -using DbReader.Tracking; -[Tracked] -public record PositionalRecord(int Id, string Name); - - diff --git a/src/DbReader.Tracking/DbReader.Tracking.targets b/src/DbReader.Tracking/DbReader.Tracking.targets deleted file mode 100644 index 0c1451f..0000000 --- a/src/DbReader.Tracking/DbReader.Tracking.targets +++ /dev/null @@ -1,19 +0,0 @@ - - - $(MSBuildThisFileDirectory)../lib/net8.0/DbReader.Tracking.dll - TrackedAttribute - - - - - - - - - - - - - - -