Hint validation: Add check for renaming field type existance in both models

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Upgrade/Internals/UpgradeHintValidator.cs

@@ -65,7 +65,8 @@ private void ValidateRenameFieldHints(IEnumerable<RenameFieldHint> hints)
         var targetType = currentModel.Types.SingleOrDefault(type => type.UnderlyingType == targetTypeName);
         if (targetType==null)
           throw TypeNotFound(targetTypeName);
-        var sourceType = reverseTypeMapping[targetType];
+        if (!reverseTypeMapping.TryGetValue(targetType, out var sourceType))
+          throw TypeNotFoundInStorageModel(targetTypeName, hint.OldFieldName);
         var sourceTypeName = sourceType.UnderlyingType;
         if (sourceType.GetField(hint.OldFieldName)==null)
           throw FieldNotFound(sourceTypeName, hint.OldFieldName);
@@ -145,20 +146,17 @@ private void ValidateRemoveTypeHints(IEnumerable<RemoveTypeHint> hints)
       }
     }
 
-    private static InvalidOperationException TypeNotFound(string name)
-    {
-      return new InvalidOperationException(string.Format(Strings.ExTypeXIsNotFound, name));
-    }
+    private static InvalidOperationException TypeNotFound(string name) =>
+      new InvalidOperationException(string.Format(Strings.ExTypeXIsNotFound, name));
 
-    private static InvalidOperationException FieldNotFound(string typeName, string fieldName)
-    {
-      return new InvalidOperationException(string.Format(Strings.ExFieldXYIsNotFound, typeName, fieldName));
-    }
+    private static InvalidOperationException TypeNotFoundInStorageModel(string typeName, string oldFieldName) =>
+      new InvalidOperationException(string.Format(Strings.ExTypeXWhichContainsRenamingFieldYDoesntExistInStorageModel, typeName, oldFieldName));
 
-    private static InvalidOperationException HintConflict(UpgradeHint hintOne, UpgradeHint hintTwo)
-    {
-      return new InvalidOperationException(string.Format(Strings.ExHintXIsConflictingWithHintY, hintOne, hintTwo));
-    }
+    private static InvalidOperationException FieldNotFound(string typeName, string fieldName) =>
+      new InvalidOperationException(string.Format(Strings.ExFieldXYIsNotFound, typeName, fieldName));
+
+    private static InvalidOperationException HintConflict(UpgradeHint hintOne, UpgradeHint hintTwo) =>
+      new InvalidOperationException(string.Format(Strings.ExHintXIsConflictingWithHintY, hintOne, hintTwo));
 
     public UpgradeHintValidator(StoredDomainModel currentModel, StoredDomainModel extractedModel, Dictionary<StoredTypeInfo, StoredTypeInfo> typeMapping, Dictionary<StoredTypeInfo, StoredTypeInfo> reverseTypeMapping)
     {

Orm/Xtensive.Orm/Strings.Designer.cs

@@ -3479,4 +3479,7 @@ Error: {1}</value>
   <data name="ExJoinHasSameInnerAndOuterParameterInstances" xml:space="preserve">
     <value>Inner and outer selector expressions have the same parameter instance. Probably you use the same lambda expression for both selectors, which is currently not supported.</value>
   </data>
+  <data name="ExTypeXWhichContainsRenamingFieldYDoesntExistInStorageModel" xml:space="preserve">
+    <value>The type '{0}',which contains renaming field '{1}', doesn't exist in storage model.</value>
+  </data>
 </root>