Clone(newName)

Author: SergeiPavlov

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.cs

@@ -791,8 +791,7 @@ private IEnumerable<ColumnInfo> GatherValueColumns(IEnumerable<ColumnInfo> colum
           yield return column;
         }
         else if (!column.IsSystem) {
-          var clone = column.Clone();
-          clone.Name = nameBuilder.BuildColumnName(column);
+          var clone = column.Clone(nameBuilder.BuildColumnName(column));
           clone.Field.MappingName = clone.Name;
           _ = valueColumns.Add(clone.Name);
           yield return clone;

Orm/Xtensive.Orm/Orm/Building/Builders/TypeBuilder.cs

@@ -325,7 +325,7 @@ private FieldInfo BuildDeclaredField(TypeInfo type, FieldDef fieldDef)
     private void BuildInheritedField(TypeInfo type, FieldInfo inheritedField)
     {
       BuildLog.Info(nameof(Strings.LogBuildingInheritedFieldXY), type.Name, inheritedField.Name);
-      var field = inheritedField.Clone();
+      var field = inheritedField.Clone(null);
       type.Fields.Add(field);
       field.ReflectedType = type;
       field.DeclaringType = inheritedField.DeclaringType;
@@ -343,15 +343,15 @@ private void BuildNestedFields(FieldInfo source, FieldInfo target, IEnumerable<F
       var buffer = fields.ToList();
 
       foreach (var field in buffer) {
-        var clone = field.Clone();
+        var newName = target.IsDeclared ? context.NameBuilder.BuildNestedFieldName(target, field) : null;
+        var clone = field.Clone(newName);
         if (target.SkipVersion) {
           clone.SkipVersion = true;
         }
 
         clone.IsSystem = false;
         clone.IsLazyLoad = field.IsLazyLoad || target.IsLazyLoad;
         if (target.IsDeclared) {
-          clone.Name = context.NameBuilder.BuildNestedFieldName(target, field);
           clone.OriginalName = field.OriginalName;
           // One-field reference
           if (target.IsEntity && buffer.Count == 1) {
@@ -428,9 +428,8 @@ private ColumnInfo BuildDeclaredColumn(FieldInfo field)
 
     private ColumnInfo BuildInheritedColumn(FieldInfo field, ColumnInfo ancestor)
     {
-      var column = ancestor.Clone();
+      var column = ancestor.Clone(context.NameBuilder.BuildColumnName(field, ancestor));
       column.Field = field;
-      column.Name = context.NameBuilder.BuildColumnName(field, ancestor);
       column.IsDeclared = field.IsDeclared;
       column.IsPrimaryKey = field.IsPrimaryKey;
       column.IsNullable = field.IsNullable;

Orm/Xtensive.Orm/Orm/Model/ColumnInfo.cs

@@ -242,14 +242,14 @@ public override bool Equals(object obj) =>
     #region ICloneable methods
 
     /// <inheritdoc/>
-    object ICloneable.Clone() => Clone();
+    object ICloneable.Clone() => Clone(null);
 
     /// <summary>
     /// Clones this instance.
     /// </summary>
-    public ColumnInfo Clone()
+    public ColumnInfo Clone(string newName)
     {
-      ColumnInfo clone = new(fld) { Name = Name };
+      ColumnInfo clone = new(fld) { Name = newName ?? Name };
       clone.attributes = attributes;
       clone.valueType = valueType;
       clone.length = length;

Orm/Xtensive.Orm/Orm/Model/FieldInfo.cs

@@ -758,15 +758,15 @@ public override int GetHashCode()
     #region ICloneable methods
 
     /// <inheritdoc/>
-    object ICloneable.Clone() => Clone();
+    object ICloneable.Clone() => Clone(null);
 
     /// <summary>
     /// Clones this instance.
     /// </summary>
-    public FieldInfo Clone()
+    public FieldInfo Clone(string newName)
     {
       var clone = new FieldInfo(declaringType, reflectedType, Attributes) {
-        Name = Name,
+        Name = newName ?? Name,
         OriginalName = OriginalName,
         MappingName = MappingName,
         underlyingProperty = underlyingProperty,