Skip to content

Commit c7c9d33

Browse files
committed
Merge branch 'release-4.0.1' into develop
2 parents 8e56be8 + a717517 commit c7c9d33

5 files changed

Lines changed: 12 additions & 10 deletions

File tree

OnTopic.Data.Sql.Database/Stored Procedures/UpdateRelationships.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ INSERT
2222
INTO @Existing_TopicIDs (
2323
TopicId
2424
)
25-
SELECT Target_TopicID
25+
SELECT Target_TopicId
2626
FROM Relationships
27-
WHERE Source_TopicID = @TopicID
27+
WHERE Source_TopicId = @TopicID
2828
AND RelationshipKey = @RelationshipKey
2929

3030
--------------------------------------------------------------------------------------------------------------------------------
@@ -41,8 +41,8 @@ SELECT @TopicId,
4141
Target.TopicId
4242
FROM @RelatedTopics Target
4343
FULL JOIN @Existing_TopicIDs Existing
44-
ON Existing.TopicID = Target.TopicID
45-
WHERE Existing.TopicID is null
44+
ON Existing.TopicId = Target.TopicId
45+
WHERE Existing.TopicId is null
4646

4747
--------------------------------------------------------------------------------------------------------------------------------
4848
-- RETURN TOPIC ID

OnTopic.Tests/ViewModels/DisableMappingTopicViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace OnTopic.Tests.ViewModels {
1111
| VIEW MODEL: DISABLE MAPPING
1212
\---------------------------------------------------------------------------------------------------------------------------*/
1313
/// <summary>
14-
/// Provides a simple view model with a single property (<see cref="Key") which is annotated with the <see
14+
/// Provides a simple view model with a single property (<see cref="Key" />) which is annotated with the <see
1515
/// cref="DisableMappingAttribute"/>.
1616
/// </summary>
1717
/// <remarks>

OnTopic.Tests/ViewModels/Metadata/AttributeDescriptorTopicViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace OnTopic.Tests.ViewModels.Metadata {
1111
\---------------------------------------------------------------------------------------------------------------------------*/
1212
/// <summary>
1313
/// Provides a strongly-typed data transfer object for testing view models with properties that map to custom collections
14-
/// on the source <see cref="Topic"/>, as part of <see cref="TopicMappingServiceTest.CustomCollection"/>.
14+
/// on the source <see cref="Topic"/>.
1515
/// </summary>
1616
/// <remarks>
1717
/// This is a sample class intended for test purposes only; it is not designed for use in a production environment.

OnTopic.Tests/ViewModels/Metadata/TextAttributeTopicViewModel.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6+
using OnTopic.Metadata.AttributeTypes;
67

78
namespace OnTopic.Tests.ViewModels.Metadata {
89

910
/*============================================================================================================================
1011
| VIEW MODEL: TEXT ATTRIBUTE (DESCRIPTOR)
1112
\---------------------------------------------------------------------------------------------------------------------------*/
1213
/// <summary>
13-
/// Provides a strongly-typed data transfer object for testing view models with properties that map to custom collections
14-
/// on the source <see cref="Topic"/>, as part of <see cref="TopicMappingServiceTest.CustomCollection"/>.
14+
/// Provides a dummy implementation of a view model for an <see cref="AttributeTypeDescriptor"/> view model, in order to
15+
/// allow the dynamic resolution of mapping <see cref="TextAttribute"/> topics to view models.
1516
/// </summary>
1617
/// <remarks>
1718
/// This is a sample class intended for test purposes only; it is not designed for use in a production environment.

OnTopic.Tests/ViewModels/Metadata/TopicReferenceAttributeTopicViewModel.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6+
using OnTopic.Metadata.AttributeTypes;
67

78
namespace OnTopic.Tests.ViewModels.Metadata {
89

910
/*============================================================================================================================
1011
| VIEW MODEL: TOPIC REFERENCE ATTRIBUTE (DESCRIPTOR)
1112
\---------------------------------------------------------------------------------------------------------------------------*/
1213
/// <summary>
13-
/// Provides a strongly-typed data transfer object for testing view models with properties that map to custom collections
14-
/// on the source <see cref="Topic"/>, as part of <see cref="TopicMappingServiceTest.CustomCollection"/>.
14+
/// Provides a dummy implementation of a view model for an <see cref="AttributeTypeDescriptor"/> view model, in order to
15+
/// allow the dynamic resolution of mapping <see cref="TopicReferenceAttribute"/> topics to view models.
1516
/// </summary>
1617
/// <remarks>
1718
/// This is a sample class intended for test purposes only; it is not designed for use in a production environment.

0 commit comments

Comments
 (0)