Skip to content

Commit 52712a1

Browse files
authored
Merge pull request #204 from DataObjects-NET/tagging-issues-fix
Addresses issues appeared in tagging
2 parents b852fb7 + 2c4c497 commit 52712a1

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

Orm/Xtensive.Orm.Tests/Linq/TagTest.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ protected override void CheckRequirements() =>
152152
[TestCase(TagsLocation.AfterStatement, TestName = nameof(TagsLocation.AfterStatement))]
153153
public void VariousPlacements(TagsLocation tagsLocation)
154154
{
155+
Require.ProviderIsNot(StorageProvider.Sqlite | StorageProvider.Firebird);
155156
var config = Domain.Configuration.Clone();
156157
config.TagsLocation = tagsLocation;
157158
config.UpgradeMode = DomainUpgradeMode.Skip;
@@ -290,6 +291,8 @@ public void TagInConcat()
290291
[Test]
291292
public void TagInExcept()
292293
{
294+
Require.ProviderIsNot(StorageProvider.MySql | StorageProvider.Firebird);
295+
293296
var session = Session.Demand();
294297

295298
using (var innerTx = session.OpenTransaction(TransactionOpenMode.New)) {
@@ -310,6 +313,7 @@ public void TagInExcept()
310313
[Test]
311314
public void TagInIntersect()
312315
{
316+
Require.ProviderIsNot(StorageProvider.MySql | StorageProvider.Firebird);
313317
var session = Session.Demand();
314318

315319
using (var innerTx = session.OpenTransaction(TransactionOpenMode.New)) {

Orm/Xtensive.Orm/Sql/Dml/Statements/SqlSelect.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ internal override object Clone(SqlNodeCloneContext context)
217217
clone.Limit = Limit;
218218
clone.Offset = Offset;
219219
clone.Lock = Lock;
220-
clone.Comment = (SqlComment)Comment.Clone(context);
220+
clone.Comment = (SqlComment) Comment?.Clone(context);
221221

222222
if (Hints.Count > 0)
223223
foreach (SqlHint hint in Hints)

0 commit comments

Comments
 (0)