Merge pull request #308 from DataObjects-NET/6.0-datatypecollection-add-fix

alex-kulakov · web-flow · commit 25a7e8120433 · 2023-03-06T19:09:19.000+05:00
DataTypeCollection: fix adding provider-specific types
diff --git a/ChangeLog/6.0.12_dev.txt b/ChangeLog/6.0.12_dev.txt
@@ -0,0 +1 @@
+[main] Addressed DataTypeCollection.Add method issue of wrong adding storage-specifid types to the collection
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
`@@ -0,0 +1 @@`
	`1`	`+[main] Addressed DataTypeCollection.Add method issue of wrong adding storage-specifid types to the collection`
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>`