Skip to content

Commit 4b38d6f

Browse files
authored
Merge pull request #243 from DataObjects-NET/catalog-cloner-fix
No more NRE on Views cloning in CatalogCloner
2 parents f1a1651 + 0239e5b commit 4b38d6f

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

ChangeLog/6.0.10_dev.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[main] Fixed certain cases of NRE happened on Domain build due to views in extracted schema

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

Lines changed: 3 additions & 1 deletion
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)