Skip to content

Commit f35abb8

Browse files
GillesTourreauGillesTourreau
authored
v2.3.0 (#12)
* Add the support to retrieve the seed/increment for the IDENTITY column (fixes #10). * Improve code coverage and unit tests. * Improvate the unit tests. * Upgrade the version. * Upgrade NuGet packages for the samples. * Upgrade the NuGet packages.
1 parent 318a98e commit f35abb8

22 files changed

+364
-116
lines changed

‎.github/workflows/github-actions-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
type: string
88
description: The version of the library
99
required: true
10-
default: 2.2.0
10+
default: 2.3.0
1111
VersionSuffix:
1212
type: string
1313
description: The version suffix of the library (for example rc.1)

‎CodeCoverage.runsettings‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131
</Exclude>
3232
</Attributes>
3333

34-
<CompanyNames>
35-
<Include>
36-
<CompanyName>.*PosInformatique.*</CompanyName>
37-
</Include>
38-
</CompanyNames>
39-
4034
<!-- We recommend you do not change the following values: -->
4135
<UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>
4236
<AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>

‎Directory.Packages.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
7-
<PackageVersion Include="FluentAssertions" Version="6.12.1" />
6+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
7+
<PackageVersion Include="FluentAssertions" Version="7.2.0" />
88
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.0.1" />
99
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
1010
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
1111
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />
12-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
12+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1313
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="162.1.172" />
1414
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
15-
<PackageVersion Include="xunit" Version="2.9.2" />
16-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
15+
<PackageVersion Include="xunit" Version="2.9.3" />
16+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
1717
</ItemGroup>
1818
</Project>

‎samples/DemoApp.DataAccessLayer.Migrations.Tests/DemoApp.DataAccessLayer.Migrations.Tests.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,18 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" />
13+
<PackageReference Include="coverlet.collector">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
<PackageReference Include="FluentAssertions" />
1518
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1619
<PackageReference Include="PosInformatique.Testing.Databases.SqlServer.EntityFramework" />
1720
<PackageReference Include="xunit" />
18-
<PackageReference Include="xunit.runner.visualstudio" />
21+
<PackageReference Include="xunit.runner.visualstudio">
22+
<PrivateAssets>all</PrivateAssets>
23+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24+
</PackageReference>
1925
</ItemGroup>
2026

2127
<ItemGroup>

‎samples/DemoApp.DataAccessLayer.Tests/DemoApp.DataAccessLayer.Tests.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,18 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="coverlet.collector" />
23+
<PackageReference Include="coverlet.collector">
24+
<PrivateAssets>all</PrivateAssets>
25+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26+
</PackageReference>
2427
<PackageReference Include="FluentAssertions" />
2528
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2629
<PackageReference Include="PosInformatique.Testing.Databases.SqlServer.EntityFramework" />
2730
<PackageReference Include="xunit" />
28-
<PackageReference Include="xunit.runner.visualstudio" />
31+
<PackageReference Include="xunit.runner.visualstudio">
32+
<PrivateAssets>all</PrivateAssets>
33+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34+
</PackageReference>
2935
</ItemGroup>
3036

3137
<ItemGroup>

‎samples/Directory.Packages.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
7-
<PackageVersion Include="FluentAssertions" Version="6.12.1" />
6+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
7+
<PackageVersion Include="FluentAssertions" Version="7.2.0" />
88
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.0.1" />
99
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
10-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
11-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10" />
12-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
10+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9" />
11+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9" />
12+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1313
<PackageVersion Include="Microsoft.SqlServer.DacFx" Version="161.6374.0" />
14-
<PackageVersion Include="PosInformatique.Testing.Databases.SqlServer.EntityFramework" Version="2.1.0-rc.3" />
14+
<PackageVersion Include="PosInformatique.Testing.Databases.SqlServer.EntityFramework" Version="2.3.0-rc.1" />
1515
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
16-
<PackageVersion Include="xunit" Version="2.9.2" />
17-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
16+
<PackageVersion Include="xunit" Version="2.9.3" />
17+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
1818
</ItemGroup>
1919
</Project>

‎src/Testing.Databases.SqlServer/Comparer/SqlObjectComparer.cs‎

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
namespace PosInformatique.Testing.Databases.SqlServer
88
{
9+
using System.Diagnostics.CodeAnalysis;
10+
911
internal sealed class SqlObjectComparer : ISqlObjectVisitor<SqlObjectDifferences?>
1012
{
1113
private readonly SqlObject source;
@@ -73,7 +75,7 @@ public static IList<SqlTableDifferences> Compare(IReadOnlyList<SqlTable> source,
7375
this.CompareProperty(column, t => t.Precision, nameof(column.Precision)),
7476
this.CompareProperty(column, t => t.Scale, nameof(column.Scale)),
7577
this.CompareProperty(column, t => t.IsNullable, nameof(column.IsNullable)),
76-
this.CompareProperty(column, t => t.IsIdentity, nameof(column.IsIdentity)),
78+
this.CompareProperty(column, t => t.Identity, nameof(column.Identity), equalityComparer: SqlColumnIdentityComparer.Instance),
7779
this.CompareProperty(column, t => t.CollationName, nameof(column.CollationName)),
7880
this.CompareProperty(column, t => t.IsComputed, nameof(column.IsComputed)),
7981
this.CompareProperty(column, t => TsqlCodeHelper.RemoveNotUsefulCharacters(t.ComputedExpression), nameof(column.ComputedExpression), t => t.ComputedExpression));
@@ -331,7 +333,7 @@ private static IReadOnlyList<SqlObjectPropertyDifference> GetPropertyDifferences
331333
return objects.SingleOrDefault(o => Equals(keySelector(o), value));
332334
}
333335

334-
private SqlObjectPropertyDifference? CompareProperty<TSqlObject>(TSqlObject target, Func<TSqlObject, object?> propertyValueForComparison, string name, Func<TSqlObject, object?>? propertyValueToDisplay = null)
336+
private SqlObjectPropertyDifference? CompareProperty<TSqlObject, TProperty>(TSqlObject target, Func<TSqlObject, TProperty?> propertyValueForComparison, string name, Func<TSqlObject, TProperty?>? propertyValueToDisplay = null, IEqualityComparer<TProperty?>? equalityComparer = null)
335337
where TSqlObject : SqlObject
336338
{
337339
var source = (TSqlObject)this.source;
@@ -344,7 +346,12 @@ private static IReadOnlyList<SqlObjectPropertyDifference> GetPropertyDifferences
344346
var sourceValue = propertyValueForComparison(source);
345347
var targetValue = propertyValueForComparison(target);
346348

347-
if (!Equals(sourceValue, targetValue))
349+
if (equalityComparer is null)
350+
{
351+
equalityComparer = EqualityComparer<TProperty?>.Default;
352+
}
353+
354+
if (!equalityComparer.Equals(sourceValue, targetValue))
348355
{
349356
return new SqlObjectPropertyDifference(name, propertyValueToDisplay(source), propertyValueToDisplay(target));
350357
}
@@ -364,5 +371,50 @@ private static IReadOnlyList<SqlObjectPropertyDifference> GetPropertyDifferences
364371

365372
return new SqlObjectDifferences<TSqlObject>((TSqlObject)this.source, target, SqlObjectDifferenceType.Different, properties!);
366373
}
374+
375+
private sealed class SqlColumnIdentityComparer : IEqualityComparer<SqlColumnIdentity?>
376+
{
377+
private SqlColumnIdentityComparer()
378+
{
379+
}
380+
381+
public static SqlColumnIdentityComparer Instance { get; } = new SqlColumnIdentityComparer();
382+
383+
public bool Equals(SqlColumnIdentity? x, SqlColumnIdentity? y)
384+
{
385+
if (x is null)
386+
{
387+
if (y is null)
388+
{
389+
return true;
390+
}
391+
392+
return false;
393+
}
394+
395+
if (y is null)
396+
{
397+
return false;
398+
}
399+
400+
if (x.Seed != y.Seed)
401+
{
402+
return false;
403+
}
404+
405+
if (x.Increment != y.Increment)
406+
{
407+
return false;
408+
}
409+
410+
return true;
411+
}
412+
413+
[ExcludeFromCodeCoverage]
414+
public int GetHashCode(SqlColumnIdentity? obj)
415+
{
416+
throw new NotImplementedException();
417+
}
418+
}
367419
}
368420
}

‎src/Testing.Databases.SqlServer/ObjectModel/SqlColumn.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ internal SqlColumn(
7070
/// <summary>
7171
/// Gets a value indicating whether if the column is identity.
7272
/// </summary>
73-
public bool IsIdentity { get; internal set; }
73+
public SqlColumnIdentity? Identity { get; internal set; }
7474

7575
/// <summary>
7676
/// Gets a value indicating whether if the column is computed.

‎src/Testing.Databases.SqlServer/ObjectModel/SqlColumnIdentity.cs‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
//-----------------------------------------------------------------------
2+
// <copyright file="SqlColumnIdentity.cs" company="P.O.S Informatique">
3+
// Copyright (c) P.O.S Informatique. All rights reserved.
4+
// </copyright>
5+
//-----------------------------------------------------------------------
6+
7+
namespace PosInformatique.Testing.Databases
8+
{
9+
/// <summary>
10+
/// Represents the <see cref="SqlColumn.Identity"/> information when
11+
/// a <see cref="SqlColumn"/> is an <c>IDENTITY</c> column.
12+
/// </summary>
13+
public class SqlColumnIdentity
14+
{
15+
/// <summary>
16+
/// Initializes a new instance of the <see cref="SqlColumnIdentity"/> class.
17+
/// </summary>
18+
/// <param name="seed">Seed of the <c>IDENTITY</c> column.</param>
19+
/// <param name="increment">Increment of the <c>IDENTITY</c> column.</param>
20+
public SqlColumnIdentity(int seed, int increment)
21+
{
22+
this.Seed = seed;
23+
this.Increment = increment;
24+
}
25+
26+
/// <summary>
27+
/// Gets the seed of the <c>IDENTITY</c> column.
28+
/// </summary>
29+
public int Seed { get; }
30+
31+
/// <summary>
32+
/// Gets the increment of the <c>IDENTITY</c> column.
33+
/// </summary>
34+
public int Increment { get; }
35+
36+
/// <inheritdoc />
37+
public override string ToString()
38+
{
39+
return $"(Seed: {this.Seed}, Increment: {this.Increment})";
40+
}
41+
}
42+
}

‎src/Testing.Databases.SqlServer/SqlServerDatabaseObjectExtensions.cs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,18 @@ private static async Task<ILookup<int, DataRow>> GetColumnsAsync(SqlServerDataba
298298
[c].[collation_name] AS [CollationName],
299299
[c].[is_nullable] AS [IsNullable],
300300
[c].[is_identity] AS [IsIdentity],
301+
[ic].[seed_value] AS [IdentitySeed],
302+
[ic].[increment_value] AS [IdentityIncrement],
301303
[c].[is_computed] AS [IsComputed],
302304
[cc].[definition] AS [ComputedExpression]
303305
FROM
304306
[sys].[columns] AS [c]
305307
LEFT OUTER JOIN
306308
[sys].[computed_columns] AS [cc]
307-
ON ([c].[object_id] = [cc].[object_id] AND [c].[column_id] = [cc].[column_id]),
309+
ON ([c].[object_id] = [cc].[object_id] AND [c].[column_id] = [cc].[column_id])
310+
LEFT OUTER JOIN
311+
[sys].[identity_columns] AS [ic]
312+
ON ([c].[object_id] = [ic].[object_id] AND [c].[column_id] = [ic].[column_id]),
308313
[sys].[tables] AS [t],
309314
[sys].[types] AS [ty]
310315
WHERE
@@ -500,6 +505,13 @@ private static SqlCheckConstraint ToCheckConstraint(DataRow row)
500505

501506
private static SqlColumn ToColumn(DataRow row, DataRow? defaultConstraintRow)
502507
{
508+
SqlColumnIdentity? identity = null;
509+
510+
if ((bool)row["IsIdentity"] == true)
511+
{
512+
identity = new SqlColumnIdentity((int)row["IdentitySeed"], (int)row["IdentityIncrement"]);
513+
}
514+
503515
return new SqlColumn(
504516
(string)row["Name"],
505517
Convert.ToInt32(row["Position"], CultureInfo.InvariantCulture),
@@ -512,7 +524,7 @@ private static SqlColumn ToColumn(DataRow row, DataRow? defaultConstraintRow)
512524
ComputedExpression = NullIfDbNull<string>(row["ComputedExpression"]),
513525
DefaultConstraint = defaultConstraintRow != null ? ToDefaultConstraint(defaultConstraintRow) : null,
514526
IsComputed = (bool)row["IsComputed"],
515-
IsIdentity = (bool)row["IsIdentity"],
527+
Identity = identity,
516528
IsNullable = (bool)row["IsNullable"],
517529
};
518530
}

0 commit comments

Comments
 (0)