Skip to content

Commit 6ca4f63

Browse files
committed
Merge branch '6.0' into datetimeoffset-accessor-on-x86-issue
# Conflicts: # ChangeLog/6.0.10_dev.txt
2 parents 0df506f + 4b38d6f commit 6ca4f63

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

ChangeLog/6.0.10_dev.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
[main] Fixed NotSupportedException appeared on x86 architecture when DateTimeOffset is used in entites
1+
[main] Fixed certain cases of NRE happened on Domain build due to views in extracted schema
2+
[main] Fixed NotSupportedException appeared on x86 architecture when DateTimeOffset is used in entites

Orm/Xtensive.Orm/Orm/Upgrade/Internals/CatalogCloner.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ private void CloneViews(Schema newSchema, Schema sourceSchema)
157157
var newView = newSchema.CreateView(sourceView.Name);
158158
CopyDbName(newView, sourceView);
159159
newView.CheckOptions = sourceView.CheckOptions;
160-
newView.Definition = (SqlNative) sourceView.Definition.Clone();
160+
if (sourceView.Definition != null) {
161+
newView.Definition = (SqlNative) sourceView.Definition.Clone();
162+
}
161163
CloneViewColumns(newView, sourceView);
162164
CloneIndexes(newView, sourceView);
163165
}

0 commit comments

Comments
 (0)