Skip to content

Commit 4da10cc

Browse files
Merge pull request #61 from The-Poolz/update-to-version-1.3.2
Update to version 1.3.2
2 parents d65fb6f + 3d59548 commit 4da10cc

6 files changed

Lines changed: 62 additions & 11 deletions

File tree

QuickSQL.Tests/QuickSQL.Tests.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,4 @@
2626
<ProjectReference Include="..\QuickSQL\QuickSQL.csproj" />
2727
</ItemGroup>
2828

29-
<ItemGroup>
30-
<Folder Include="Tests\Request\" />
31-
</ItemGroup>
32-
3329
</Project>
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using Xunit;
2+
using System.Text.Json;
3+
4+
namespace QuickSQL.Tests.Requests
5+
{
6+
public static class OrderRuleTests
7+
{
8+
[Fact]
9+
public static void CreateOrderRule()
10+
{
11+
var orederRule = new OrderRule();
12+
13+
Assert.NotNull(orederRule);
14+
Assert.IsType<OrderRule>(orederRule);
15+
}
16+
17+
[Fact]
18+
public static void CreateOrderRuleWithParams()
19+
{
20+
var orederRule = new OrderRule("Id", SortBy.DESC);
21+
22+
Assert.NotNull(orederRule);
23+
Assert.IsType<OrderRule>(orederRule);
24+
}
25+
26+
[Fact]
27+
public static void SerializeObject()
28+
{
29+
var orederRule = new OrderRule("Id", SortBy.DESC);
30+
31+
var result = JsonSerializer.Serialize(orederRule);
32+
33+
Assert.NotNull(result);
34+
Assert.IsType<string>(result);
35+
Assert.Equal("{\"ColumnName\":\"Id\",\"Sort\":1}", result);
36+
}
37+
}
38+
}

QuickSQL/QuickSQL.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,4 @@
3333
</None>
3434
</ItemGroup>
3535

36-
<ItemGroup>
37-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
38-
</ItemGroup>
39-
4036
</Project>

QuickSQL/QuickSql.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Newtonsoft.Json;
1+
using System.Text.Json;
22

33
using QuickSQL.DataReader;
44
using QuickSQL.QueryCreator;
@@ -35,7 +35,7 @@ public static object InvokeRequest(Request request, string connectionString, Bas
3535

3636
string commandQuery = queryCreator.CreateCommandQuery(request);
3737
string jsonResult = dataReader.GetJsonData(commandQuery, connectionString);
38-
return JsonConvert.DeserializeObject(jsonResult);
38+
return JsonSerializer.Deserialize<object>(jsonResult);
3939
}
4040
}
4141
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,33 @@
11
namespace QuickSQL
22
{
3+
/// <summary>
4+
/// This class is an object that combines the name of the sorted column and the sorting direction.
5+
/// </summary>
36
public class OrderRule
47
{
8+
/// <summary>
9+
/// Don't use this, as object parameters are only set on initialization.<br/>
10+
/// This constructor for JSON serializing.
11+
/// </summary>
12+
public OrderRule() { }
13+
/// <summary>
14+
/// Create a order rule.
15+
/// </summary>
16+
/// <param name="columnName">Enter the name of the column to be sorted.</param>
17+
/// <param name="sort">Enter <see cref="SortBy"/> to customize sorting.<br/>
18+
/// Default value: <see cref="SortBy.ASC"/> </param>
519
public OrderRule(string columnName, SortBy sort = SortBy.ASC)
620
{
721
ColumnName = columnName;
822
Sort = sort;
923
}
24+
/// <summary>
25+
/// The name of the column that will be sorted.
26+
/// </summary>
1027
public string ColumnName { get; init; }
28+
/// <summary>
29+
/// Sorting direction. Default value: <see cref="SortBy.ASC"/>
30+
/// </summary>
1131
public SortBy Sort { get; init; }
1232
}
1333
}

QuickSQL/Request/Request.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ namespace QuickSQL
1212
public class Request
1313
{
1414
/// <summary>
15-
/// Constructor for JSON serializing.
15+
/// Don't use this, as object parameters are only set on initialization.<br/>
16+
/// This constructor for JSON serializing.
1617
/// </summary>
1718
public Request() { }
1819
/// <summary>

0 commit comments

Comments
 (0)