Skip to content

Commit 194590f

Browse files
GillesTourreauGillesTourreau
committed
Remove SystemTypeId property in the columns and the user type.
1 parent f544ac2 commit 194590f

File tree

9 files changed

+3
-54
lines changed

9 files changed

+3
-54
lines changed

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ public static IList<SqlTableDifferences> Compare(IReadOnlyList<SqlTable> source,
7676
return this.CreateDifferences(
7777
column,
7878
this.CompareProperty(column, t => t.Position, nameof(column.Position)),
79-
this.CompareProperty(column, t => t.SystemTypeId, nameof(column.SystemTypeId)),
8079
this.CompareProperty(column, t => t.MaxLength, nameof(column.MaxLength)),
8180
this.CompareProperty(column, t => t.Precision, nameof(column.Precision)),
8281
this.CompareProperty(column, t => t.Scale, nameof(column.Scale)),
@@ -253,8 +252,7 @@ public static IList<SqlTableDifferences> Compare(IReadOnlyList<SqlTable> source,
253252
userType,
254253
this.CompareProperty(userType, ut => ut.IsNullable, nameof(userType.IsNullable)),
255254
this.CompareProperty(userType, ut => ut.IsTableType, nameof(userType.IsTableType)),
256-
this.CompareProperty(userType, ut => ut.MaxLength, nameof(userType.MaxLength)),
257-
this.CompareProperty(userType, ut => ut.SystemTypeId, nameof(userType.SystemTypeId)));
255+
this.CompareProperty(userType, ut => ut.MaxLength, nameof(userType.MaxLength)));
258256
}
259257

260258
public SqlObjectDifferences? Visit(SqlView view)

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

-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ internal SqlColumn()
2525
/// </summary>
2626
public required int Position { get; init; }
2727

28-
/// <summary>
29-
/// Gets the system type identifier of the column.
30-
/// </summary>
31-
public required byte SystemTypeId { get; init; }
32-
3328
/// <summary>
3429
/// Gets the type name of the column.
3530
/// </summary>

‎src/UnitTests.Databases.SqlServer/ObjectModel/SqlUserType.cs

-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ internal SqlUserType()
2020
/// </summary>
2121
public required string Name { get; init; }
2222

23-
/// <summary>
24-
/// Gets the system type identifier which is based the user type.
25-
/// </summary>
26-
public required byte SystemTypeId { get; init; }
27-
2823
/// <summary>
2924
/// Gets the max length of the type.
3025
/// </summary>

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

-4
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ public static async Task<IReadOnlyList<SqlUserType>> GetUserTypesAsync(this SqlS
214214
const string sql = @"
215215
SELECT
216216
[t].[name] AS [Name],
217-
[t].[system_type_id] AS [SystemTypeId],
218217
[t].[max_length] AS [MaxLength],
219218
[t].[is_nullable] AS [IsNullable],
220219
[t].[is_table_type] AS [IsTableType]
@@ -286,7 +285,6 @@ private static async Task<ILookup<int, DataRow>> GetColumnsAsync(SqlServerDataba
286285
[t].[object_id] AS [TableId],
287286
[c].[name] AS [Name],
288287
ROW_NUMBER() OVER(PARTITION BY [t].[name] ORDER BY [t].[name], [c].[column_id]) AS [Position],
289-
[c].[system_type_id] AS [SystemTypeId],
290288
[ty].[name] AS [TypeName],
291289
[c].[max_length] AS [MaxLength],
292290
[c].[precision] AS [Precision],
@@ -486,7 +484,6 @@ private static SqlColumn ToColumn(DataRow row)
486484
Precision = (byte)row["Precision"],
487485
Position = Convert.ToInt32(row["Position"], CultureInfo.InvariantCulture),
488486
Scale = (byte)row["Scale"],
489-
SystemTypeId = (byte)row["SystemTypeId"],
490487
TypeName = (string)row["TypeName"],
491488
};
492489
}
@@ -592,7 +589,6 @@ private static SqlUserType ToUserType(DataRow row)
592589
IsTableType = (bool)row["IsTableType"],
593590
Name = (string)row["Name"],
594591
MaxLength = (short)row["MaxLength"],
595-
SystemTypeId = (byte)row["SystemTypeId"],
596592
};
597593
}
598594

‎tests/UnitTests.Databases.SqlServer.Tests/Comparer/SqlObjectDifferencesTest.cs

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public void ToStringTest()
1717
IsTableType = default,
1818
MaxLength = default,
1919
Name = "The source",
20-
SystemTypeId = default,
2120
};
2221

2322
var target = new SqlUserType()
@@ -26,7 +25,6 @@ public void ToStringTest()
2625
IsTableType = default,
2726
MaxLength = default,
2827
Name = "The source",
29-
SystemTypeId = default,
3028
};
3129

3230
var properties = new[]

‎tests/UnitTests.Databases.SqlServer.Tests/ObjectModel/SqlColumnTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public void ToStringTest()
2323
Position = default,
2424
Precision = default,
2525
Scale = default,
26-
SystemTypeId = default,
2726
TypeName = default,
2827
};
2928

‎tests/UnitTests.Databases.SqlServer.Tests/ObjectModel/SqlUserTypeTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public void ToStringTest()
1717
IsNullable = default,
1818
IsTableType = default,
1919
MaxLength = default,
20-
SystemTypeId = default
2120
};
2221

2322
userType.ToString().Should().Be("The name");

‎tests/UnitTests.Databases.SqlServer.Tests/SqlServerDatabaseComparerTest.CompareAsync.txt

-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
------ Columns ------
1010
- Type
11-
* SystemTypeId:
12-
Source: 56
13-
Target: 167
1411
* MaxLength:
1512
Source: 4
1613
Target: 50
@@ -182,9 +179,6 @@
182179
* MaxLength:
183180
Source: 11
184181
Target: 4
185-
* SystemTypeId:
186-
Source: 167
187-
Target: 56
188182
- TypeTarget (Missing in the source)
189183
- TypeSource (Missing in the target)
190184

‎tests/UnitTests.Databases.SqlServer.Tests/SqlServerDatabaseComparerTest.cs

+2-27
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public async Task CompareAsync()
7979
differences.Tables[0].Source.Columns[0].Position.Should().Be(1);
8080
differences.Tables[0].Source.Columns[0].Precision.Should().Be(10);
8181
differences.Tables[0].Source.Columns[0].Scale.Should().Be(0);
82-
differences.Tables[0].Source.Columns[0].SystemTypeId.Should().Be(56);
8382
differences.Tables[0].Source.Columns[0].TypeName.Should().Be("int");
8483

8584
differences.Tables[0].Source.Columns[1].CollationName.Should().Be("SQL_Latin1_General_CP1_CI_AS");
@@ -92,7 +91,6 @@ public async Task CompareAsync()
9291
differences.Tables[0].Source.Columns[1].Position.Should().Be(2);
9392
differences.Tables[0].Source.Columns[1].Precision.Should().Be(0);
9493
differences.Tables[0].Source.Columns[1].Scale.Should().Be(0);
95-
differences.Tables[0].Source.Columns[1].SystemTypeId.Should().Be(167);
9694
differences.Tables[0].Source.Columns[1].TypeName.Should().Be("varchar");
9795

9896
differences.Tables[0].Source.Columns[2].CollationName.Should().Be("SQL_Latin1_General_CP1_CI_AS");
@@ -105,7 +103,6 @@ public async Task CompareAsync()
105103
differences.Tables[0].Source.Columns[2].Position.Should().Be(3);
106104
differences.Tables[0].Source.Columns[2].Precision.Should().Be(0);
107105
differences.Tables[0].Source.Columns[2].Scale.Should().Be(0);
108-
differences.Tables[0].Source.Columns[2].SystemTypeId.Should().Be(167);
109106
differences.Tables[0].Source.Columns[2].TypeName.Should().Be("varchar");
110107

111108
differences.Tables[0].Source.Columns[3].CollationName.Should().BeNull();
@@ -118,7 +115,6 @@ public async Task CompareAsync()
118115
differences.Tables[0].Source.Columns[3].Position.Should().Be(4);
119116
differences.Tables[0].Source.Columns[3].Precision.Should().Be(10);
120117
differences.Tables[0].Source.Columns[3].Scale.Should().Be(2);
121-
differences.Tables[0].Source.Columns[3].SystemTypeId.Should().Be(106);
122118
differences.Tables[0].Source.Columns[3].TypeName.Should().Be("decimal");
123119

124120
differences.Tables[0].Source.Columns[4].CollationName.Should().BeNull();
@@ -131,7 +127,6 @@ public async Task CompareAsync()
131127
differences.Tables[0].Source.Columns[4].Position.Should().Be(5);
132128
differences.Tables[0].Source.Columns[4].Precision.Should().Be(10);
133129
differences.Tables[0].Source.Columns[4].Scale.Should().Be(2);
134-
differences.Tables[0].Source.Columns[4].SystemTypeId.Should().Be(106);
135130
differences.Tables[0].Source.Columns[4].TypeName.Should().Be("decimal");
136131

137132
differences.Tables[0].Source.Columns[5].CollationName.Should().BeNull();
@@ -144,7 +139,6 @@ public async Task CompareAsync()
144139
differences.Tables[0].Source.Columns[5].Position.Should().Be(6);
145140
differences.Tables[0].Source.Columns[5].Precision.Should().Be(10);
146141
differences.Tables[0].Source.Columns[5].Scale.Should().Be(0);
147-
differences.Tables[0].Source.Columns[5].SystemTypeId.Should().Be(56);
148142
differences.Tables[0].Source.Columns[5].TypeName.Should().Be("int");
149143

150144
differences.Tables[0].Source.Columns[6].CollationName.Should().BeNull();
@@ -157,7 +151,6 @@ public async Task CompareAsync()
157151
differences.Tables[0].Source.Columns[6].Position.Should().Be(7);
158152
differences.Tables[0].Source.Columns[6].Precision.Should().Be(10);
159153
differences.Tables[0].Source.Columns[6].Scale.Should().Be(0);
160-
differences.Tables[0].Source.Columns[6].SystemTypeId.Should().Be(56);
161154
differences.Tables[0].Source.Columns[6].TypeName.Should().Be("int");
162155

163156
differences.Tables[0].Source.Columns[7].CollationName.Should().BeNull();
@@ -170,7 +163,6 @@ public async Task CompareAsync()
170163
differences.Tables[0].Source.Columns[7].Position.Should().Be(8);
171164
differences.Tables[0].Source.Columns[7].Precision.Should().Be(11);
172165
differences.Tables[0].Source.Columns[7].Scale.Should().Be(2);
173-
differences.Tables[0].Source.Columns[7].SystemTypeId.Should().Be(106);
174166
differences.Tables[0].Source.Columns[7].TypeName.Should().Be("decimal");
175167

176168
differences.Tables[0].Source.Columns[8].CollationName.Should().BeNull();
@@ -183,7 +175,6 @@ public async Task CompareAsync()
183175
differences.Tables[0].Source.Columns[8].Position.Should().Be(9);
184176
differences.Tables[0].Source.Columns[8].Precision.Should().Be(10);
185177
differences.Tables[0].Source.Columns[8].Scale.Should().Be(0);
186-
differences.Tables[0].Source.Columns[8].SystemTypeId.Should().Be(56);
187178
differences.Tables[0].Source.Columns[8].TypeName.Should().Be("int");
188179

189180
differences.Tables[0].Source.Columns[9].CollationName.Should().BeNull();
@@ -196,7 +187,6 @@ public async Task CompareAsync()
196187
differences.Tables[0].Source.Columns[9].Position.Should().Be(10);
197188
differences.Tables[0].Source.Columns[9].Precision.Should().Be(10);
198189
differences.Tables[0].Source.Columns[9].Scale.Should().Be(0);
199-
differences.Tables[0].Source.Columns[9].SystemTypeId.Should().Be(56);
200190
differences.Tables[0].Source.Columns[9].TypeName.Should().Be("int");
201191

202192
differences.Tables[0].Target.Name.Should().Be("TableDifference");
@@ -214,7 +204,6 @@ public async Task CompareAsync()
214204
differences.Tables[0].Target.Columns[0].Position.Should().Be(1);
215205
differences.Tables[0].Target.Columns[0].Precision.Should().Be(0);
216206
differences.Tables[0].Target.Columns[0].Scale.Should().Be(0);
217-
differences.Tables[0].Target.Columns[0].SystemTypeId.Should().Be(167);
218207
differences.Tables[0].Target.Columns[0].TypeName.Should().Be("varchar");
219208

220209
differences.Tables[0].Target.Columns[1].CollationName.Should().Be("SQL_Latin1_General_CP1_CI_AS");
@@ -227,7 +216,6 @@ public async Task CompareAsync()
227216
differences.Tables[0].Target.Columns[1].Position.Should().Be(2);
228217
differences.Tables[0].Target.Columns[1].Precision.Should().Be(0);
229218
differences.Tables[0].Target.Columns[1].Scale.Should().Be(0);
230-
differences.Tables[0].Target.Columns[1].SystemTypeId.Should().Be(167);
231219
differences.Tables[0].Target.Columns[1].TypeName.Should().Be("varchar");
232220

233221
differences.Tables[0].Target.Columns[2].CollationName.Should().BeNull();
@@ -240,7 +228,6 @@ public async Task CompareAsync()
240228
differences.Tables[0].Target.Columns[2].Position.Should().Be(3);
241229
differences.Tables[0].Target.Columns[2].Precision.Should().Be(5);
242230
differences.Tables[0].Target.Columns[2].Scale.Should().Be(2);
243-
differences.Tables[0].Target.Columns[2].SystemTypeId.Should().Be(106);
244231
differences.Tables[0].Target.Columns[2].TypeName.Should().Be("decimal");
245232

246233
differences.Tables[0].Target.Columns[3].CollationName.Should().Be("SQL_Latin1_General_CP1_CI_AS");
@@ -253,7 +240,6 @@ public async Task CompareAsync()
253240
differences.Tables[0].Target.Columns[3].Position.Should().Be(4);
254241
differences.Tables[0].Target.Columns[3].Precision.Should().Be(0);
255242
differences.Tables[0].Target.Columns[3].Scale.Should().Be(0);
256-
differences.Tables[0].Target.Columns[3].SystemTypeId.Should().Be(167);
257243
differences.Tables[0].Target.Columns[3].TypeName.Should().Be("varchar");
258244

259245
differences.Tables[0].Target.Columns[4].CollationName.Should().BeNull();
@@ -266,7 +252,6 @@ public async Task CompareAsync()
266252
differences.Tables[0].Target.Columns[4].Position.Should().Be(5);
267253
differences.Tables[0].Target.Columns[4].Precision.Should().Be(10);
268254
differences.Tables[0].Target.Columns[4].Scale.Should().Be(4);
269-
differences.Tables[0].Target.Columns[4].SystemTypeId.Should().Be(106);
270255
differences.Tables[0].Target.Columns[4].TypeName.Should().Be("decimal");
271256

272257
differences.Tables[0].Target.Columns[5].CollationName.Should().BeNull();
@@ -279,7 +264,6 @@ public async Task CompareAsync()
279264
differences.Tables[0].Target.Columns[5].Position.Should().Be(6);
280265
differences.Tables[0].Target.Columns[5].Precision.Should().Be(10);
281266
differences.Tables[0].Target.Columns[5].Scale.Should().Be(0);
282-
differences.Tables[0].Target.Columns[5].SystemTypeId.Should().Be(56);
283267
differences.Tables[0].Target.Columns[5].TypeName.Should().Be("int");
284268

285269
differences.Tables[0].Target.Columns[6].CollationName.Should().BeNull();
@@ -292,7 +276,6 @@ public async Task CompareAsync()
292276
differences.Tables[0].Target.Columns[6].Position.Should().Be(7);
293277
differences.Tables[0].Target.Columns[6].Precision.Should().Be(10);
294278
differences.Tables[0].Target.Columns[6].Scale.Should().Be(0);
295-
differences.Tables[0].Target.Columns[6].SystemTypeId.Should().Be(56);
296279
differences.Tables[0].Target.Columns[6].TypeName.Should().Be("int");
297280

298281
differences.Tables[0].Target.Columns[7].CollationName.Should().BeNull();
@@ -305,7 +288,6 @@ public async Task CompareAsync()
305288
differences.Tables[0].Target.Columns[7].Position.Should().Be(8);
306289
differences.Tables[0].Target.Columns[7].Precision.Should().Be(11);
307290
differences.Tables[0].Target.Columns[7].Scale.Should().Be(4);
308-
differences.Tables[0].Target.Columns[7].SystemTypeId.Should().Be(106);
309291
differences.Tables[0].Target.Columns[7].TypeName.Should().Be("decimal");
310292

311293
differences.Tables[0].Target.Columns[8].CollationName.Should().BeNull();
@@ -318,7 +300,6 @@ public async Task CompareAsync()
318300
differences.Tables[0].Target.Columns[8].Position.Should().Be(9);
319301
differences.Tables[0].Target.Columns[8].Precision.Should().Be(10);
320302
differences.Tables[0].Target.Columns[8].Scale.Should().Be(0);
321-
differences.Tables[0].Target.Columns[8].SystemTypeId.Should().Be(56);
322303
differences.Tables[0].Target.Columns[8].TypeName.Should().Be("int");
323304

324305
differences.Tables[0].Target.Columns[9].CollationName.Should().BeNull();
@@ -331,7 +312,6 @@ public async Task CompareAsync()
331312
differences.Tables[0].Target.Columns[9].Position.Should().Be(10);
332313
differences.Tables[0].Target.Columns[9].Precision.Should().Be(10);
333314
differences.Tables[0].Target.Columns[9].Scale.Should().Be(0);
334-
differences.Tables[0].Target.Columns[9].SystemTypeId.Should().Be(56);
335315
differences.Tables[0].Target.Columns[9].TypeName.Should().Be("int");
336316

337317
differences.Tables[0].Columns.Should().HaveCount(9);
@@ -573,7 +553,6 @@ public async Task CompareAsync()
573553
differences.Tables[1].Target.Columns[0].Position.Should().Be(1);
574554
differences.Tables[1].Target.Columns[0].Precision.Should().Be(10);
575555
differences.Tables[1].Target.Columns[0].Scale.Should().Be(0);
576-
differences.Tables[1].Target.Columns[0].SystemTypeId.Should().Be(56);
577556
differences.Tables[1].Target.Columns[0].TypeName.Should().Be("int");
578557
differences.Tables[1].Target.ForeignKeys.Should().HaveCount(1);
579558
differences.Tables[1].Target.ForeignKeys[0].Columns.Should().HaveCount(1);
@@ -631,7 +610,6 @@ public async Task CompareAsync()
631610
differences.Tables[2].Source.Columns[0].Position.Should().Be(1);
632611
differences.Tables[2].Source.Columns[0].Precision.Should().Be(10);
633612
differences.Tables[2].Source.Columns[0].Scale.Should().Be(0);
634-
differences.Tables[2].Source.Columns[0].SystemTypeId.Should().Be(56);
635613
differences.Tables[2].Source.Columns[0].TypeName.Should().Be("int");
636614
differences.Tables[2].Source.Indexes.Should().HaveCount(2);
637615
differences.Tables[2].Source.Indexes[0].Columns.Should().HaveCount(1);
@@ -676,7 +654,8 @@ public async Task CompareAsync()
676654

677655
differences.UserTypes[0].Source.Name.Should().Be("TypeDifference");
678656
differences.UserTypes[0].Target.Name.Should().Be("TypeDifference");
679-
differences.UserTypes[0].Properties.Should().HaveCount(3);
657+
658+
differences.UserTypes[0].Properties.Should().HaveCount(2);
680659

681660
differences.UserTypes[0].Properties[0].Name.Should().Be("IsNullable");
682661
differences.UserTypes[0].Properties[0].Source.Should().Be(false);
@@ -686,10 +665,6 @@ public async Task CompareAsync()
686665
differences.UserTypes[0].Properties[1].Source.Should().Be(11);
687666
differences.UserTypes[0].Properties[1].Target.Should().Be(4);
688667

689-
differences.UserTypes[0].Properties[2].Name.Should().Be("SystemTypeId");
690-
differences.UserTypes[0].Properties[2].Source.Should().Be(167);
691-
differences.UserTypes[0].Properties[2].Target.Should().Be(56);
692-
693668
differences.UserTypes[1].Source.Should().BeNull();
694669
differences.UserTypes[1].Target.Name.Should().Be("TypeTarget");
695670
differences.UserTypes[1].Type.Should().Be(SqlObjectDifferenceType.MissingInSource);

0 commit comments

Comments
 (0)