Merge branch '6.0' into 7.0

alex-kulakov · alex-kulakov · commit 2e39a4567534 · 2023-03-06T19:18:34.000+05:00
diff --git a/Orm/Xtensive.Orm/Sql/Info/DataTypeCollection.cs b/Orm/Xtensive.Orm/Sql/Info/DataTypeCollection.cs
@@ -57,8 +57,10 @@ public DataTypeInfo this[SqlType sqlType]
     public void Add(SqlType sqlType, DataTypeInfo dataTypeInfo)
     {
       this.EnsureNotLocked();
-      if (!IsLocked)
-        sqlTypes.Add(sqlType, dataTypeInfo);
+      sqlTypes.Add(sqlType, dataTypeInfo);
+      foreach (var nativeType in dataTypeInfo.NativeTypes) {
+        nativeTypes.Add(nativeType, dataTypeInfo);
+      }
     }
 
     /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,10 @@ public DataTypeInfo this[SqlType sqlType]`
`57`	`57`	`public void Add(SqlType sqlType, DataTypeInfo dataTypeInfo)`
`58`	`58`	`{`
`59`	`59`	`this.EnsureNotLocked();`
`60`		`- if (!IsLocked)`
`61`		`- sqlTypes.Add(sqlType, dataTypeInfo);`
	`60`	`+ sqlTypes.Add(sqlType, dataTypeInfo);`
	`61`	`+ foreach (var nativeType in dataTypeInfo.NativeTypes) {`
	`62`	`+ nativeTypes.Add(nativeType, dataTypeInfo);`
	`63`	`+ }`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`/// <summary>`