Skip to content

Fixes some problems that appeared after main PR merge #252

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
merged 3 commits into from
Jun 15, 2022
Merged

Fixes some problems that appeared after main PR merge #252

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da1c957
SqlCompiler: Append space with no conditions in some places
alex-kulakov Jun 2, 2022
45c9edb
Wrap SqlNative translation with spaces from both sides
alex-kulakov Jun 3, 2022
b289e4b
Special handling for RawConcat
alex-kulakov Jun 3, 2022
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
19 changes: 17 additions & 2 deletions Orm/Xtensive.Orm/Sql/Compiler/SqlCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,18 @@ public virtual void Visit(SqlBinary node)
return;
}

if (node.NodeType == SqlNodeType.RawConcat) {
AppendSpace();
translator.Translate(context, node, NodeSection.Entry);
node.Left.AcceptVisitor(this);
AppendSpace();
translator.Translate(context.Output, node.NodeType);
node.Right.AcceptVisitor(this);
translator.Translate(context, node, NodeSection.Exit);

return;
}

using (context.EnterScope(node)) {
AppendTranslatedEntry(node);
node.Left.AcceptVisitor(this);
Expand Down Expand Up @@ -1385,7 +1397,7 @@ public virtual void Visit(SqlOrder node)
else if (node.Position > 0) {
_ = context.Output.Append(node.Position.ToString());
}
AppendSpaceIfNecessary();
AppendSpace();
translator.Translate(context, node, NodeSection.Exit);
}
}
Expand Down Expand Up @@ -1608,7 +1620,9 @@ protected virtual void VisitSelectFrom(SqlSelect node)
return;
}

AppendTranslated(node, SelectSection.From);
AppendSpace();
translator.Translate(context, node, SelectSection.From);
AppendSpace();

var joinedFrom = node.From as SqlJoinedTable;
var linearJoinRequired = CheckFeature(QueryFeatures.StrictJoinSyntax) && joinedFrom != null;
Expand Down Expand Up @@ -2790,6 +2804,7 @@ protected void AppendTranslated(SqlNative node)
{
AppendSpaceIfNecessary();
translator.Translate(context, node);
AppendSpaceIfNecessary();
}

protected void AppendTranslated(SqlAssignment node, NodeSection section) =>
Expand Down