Skip to content

Addresses issues appeared in tagging #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-kulakov merged 2 commits into from
Dec 13, 2021
Merged

Addresses issues appeared in tagging #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f02ca52
Comment cloning only if comment is not null
alex-kulakov Dec 7, 2021
2c4c497
Incompatible tests ignored for certain providers
alex-kulakov Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Orm/Xtensive.Orm.Tests/Linq/TagTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ protected override void CheckRequirements() =>
[TestCase(TagsLocation.AfterStatement, TestName = nameof(TagsLocation.AfterStatement))]
public void VariousPlacements(TagsLocation tagsLocation)
{
Require.ProviderIsNot(StorageProvider.Sqlite | StorageProvider.Firebird);
var config = Domain.Configuration.Clone();
config.TagsLocation = tagsLocation;
config.UpgradeMode = DomainUpgradeMode.Skip;
Expand Down Expand Up @@ -290,6 +291,8 @@ public void TagInConcat()
[Test]
public void TagInExcept()
{
Require.ProviderIsNot(StorageProvider.MySql | StorageProvider.Firebird);

var session = Session.Demand();

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

using (var innerTx = session.OpenTransaction(TransactionOpenMode.New)) {
Expand Down
2 changes: 1 addition & 1 deletion Orm/Xtensive.Orm/Sql/Dml/Statements/SqlSelect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ internal override object Clone(SqlNodeCloneContext context)
clone.Limit = Limit;
clone.Offset = Offset;
clone.Lock = Lock;
clone.Comment = (SqlComment)Comment.Clone(context);
clone.Comment = (SqlComment) Comment?.Clone(context);

if (Hints.Count > 0)
foreach (SqlHint hint in Hints)
Expand Down