diff options
| author | raghuramn <ranadimi@microsoft.com> | 2012-11-07 05:57:08 +0400 |
|---|---|---|
| committer | raghuramn <ranadimi@microsoft.com> | 2012-11-07 23:45:23 +0400 |
| commit | adb41372f7f986ad54a73b407f64ae6f5eb320c0 (patch) | |
| tree | 9f00dc6517d2fbf2dfaa375af1f777963059b1f4 /src | |
| parent | 15e7a6101b011b6d9ed8ca940bdb818066b18fa3 (diff) | |
Issue 534: Error creating multiple entity sets for an entity type in
Conventional mb.
Forgot to include the source entity set name in the error message in
earlier commit. Including it now.
Diffstat (limited to 'src')
3 files changed, 3 insertions, 2 deletions
diff --git a/src/System.Web.Http.OData/OData/Builder/EntitySetConfiguration.cs b/src/System.Web.Http.OData/OData/Builder/EntitySetConfiguration.cs index ad88495c..f8790418 100644 --- a/src/System.Web.Http.OData/OData/Builder/EntitySetConfiguration.cs +++ b/src/System.Web.Http.OData/OData/Builder/EntitySetConfiguration.cs @@ -208,6 +208,7 @@ namespace System.Web.Http.OData.Builder SRResources.CannotAutoCreateMultipleCandidates, navigationConfiguration.Name, navigationConfiguration.DeclaringEntityType.FullName, + Name, String.Join(", ", matchingSets.Select(entitySet => entitySet.Name))); } } diff --git a/src/System.Web.Http.OData/Properties/SRResources.Designer.cs b/src/System.Web.Http.OData/Properties/SRResources.Designer.cs index 125a52e3..ae91df78 100644 --- a/src/System.Web.Http.OData/Properties/SRResources.Designer.cs +++ b/src/System.Web.Http.OData/Properties/SRResources.Designer.cs @@ -151,7 +151,7 @@ namespace System.Web.Http.OData.Properties { } /// <summary> - /// Looks up a localized string similar to Cannot automatically bind the navigation property '{0}' on entity type '{1}' because there are two or more candidate entity sets. The matching entity sets are {2}.. + /// Looks up a localized string similar to Cannot automatically bind the navigation property '{0}' on entity type '{1}' for the source entity set '{2}' because there are two or more matching target entity sets. The matching entity sets are {3}.. /// </summary> internal static string CannotAutoCreateMultipleCandidates { get { diff --git a/src/System.Web.Http.OData/Properties/SRResources.resx b/src/System.Web.Http.OData/Properties/SRResources.resx index ef9160be..e5d2ee43 100644 --- a/src/System.Web.Http.OData/Properties/SRResources.resx +++ b/src/System.Web.Http.OData/Properties/SRResources.resx @@ -226,7 +226,7 @@ <value>The type '{0}' is not supported by the ODataErrorSerializer. The type must be ODataError or HttpError.</value> </data> <data name="CannotAutoCreateMultipleCandidates" xml:space="preserve"> - <value>Cannot automatically bind the navigation property '{0}' on entity type '{1}' because there are two or more candidate entity sets. The matching entity sets are {2}.</value> + <value>Cannot automatically bind the navigation property '{0}' on entity type '{1}' for the source entity set '{2}' because there are two or more matching target entity sets. The matching entity sets are {3}.</value> </data> <data name="EntitySetHasNoBuildLinkAnnotation" xml:space="preserve"> <value>The entity set '{0}' is missing link generation configuration. Check that the self and edit links are configured during model building.</value> |