Merge remote-tracking branch 'origin/master' into master-zombie-transaction-rollback-commit

alex-kulakov · alex-kulakov · commit b32a99898f91 · 2021-01-18T12:36:32.000+05:00
diff --git a/Extensions/Xtensive.Orm.BulkOperations/Internals/Operation.cs b/Extensions/Xtensive.Orm.BulkOperations/Internals/Operation.cs
@@ -81,13 +81,13 @@ protected Operation(QueryProvider queryProvider)
       var entityType = typeof (T);
       var session = queryProvider.Session;
       DomainHandler = session.Domain.Services.Get<DomainHandler>();
+      QueryBuilder = session.Services.Get<QueryBuilder>();
       TypeInfo = GetTypeInfo(entityType);
       var mapping = session.StorageNode.Mapping;
       PrimaryIndexes = TypeInfo.AffectedIndexes
         .Where(i => i.IsPrimary)
         .Select(i => new PrimaryIndexMapping(i, mapping[i.ReflectedType]))
         .ToArray();
-      QueryBuilder = session.Services.Get<QueryBuilder>();
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -81,13 +81,13 @@ protected Operation(QueryProvider queryProvider)`
`81`	`81`	`var entityType = typeof (T);`
`82`	`82`	`var session = queryProvider.Session;`
`83`	`83`	`DomainHandler = session.Domain.Services.Get<DomainHandler>();`
	`84`	`+ QueryBuilder = session.Services.Get<QueryBuilder>();`
`84`	`85`	`TypeInfo = GetTypeInfo(entityType);`
`85`	`86`	`var mapping = session.StorageNode.Mapping;`
`86`	`87`	`PrimaryIndexes = TypeInfo.AffectedIndexes`
`87`	`88`	`.Where(i => i.IsPrimary)`
`88`	`89`	`.Select(i => new PrimaryIndexMapping(i, mapping[i.ReflectedType]))`
`89`	`90`	`.ToArray();`
`90`		`- QueryBuilder = session.Services.Get<QueryBuilder>();`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`