Skip to content

Commit 407fbe8

Browse files
committed
Fix build
1 parent de6cb4f commit 407fbe8

2 files changed

Lines changed: 13 additions & 18 deletions

File tree

Orm/Xtensive.Orm/Sql/Compiler/SqlCompiler.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,10 +1109,7 @@ public virtual void Visit(SqlDropIndex node)
11091109
/// <param name="node">Statement to visit.</param>
11101110
public virtual void Visit(SqlDropView node) => translator.Translate(context, node);
11111111

1112-
public virtual void Visit(SqlTruncateTable node)
1113-
{
1114-
context.Output.AppendText(translator.Translate(context, node));
1115-
}
1112+
public virtual void Visit(SqlTruncateTable node) => translator.Translate(context, node);
11161113

11171114
/// <summary>
11181115
/// Visits <see cref="SqlFastFirstRowsHint"/> node and translates its parts.
@@ -1260,7 +1257,7 @@ public virtual void Visit(SqlInsert node)
12601257
var columns = node.Values.Columns;
12611258
if (columns.Count > 0) {
12621259
using (context.EnterCollectionScope()) {
1263-
foreach (var item in cplumns) {
1260+
foreach (var item in columns) {
12641261
AppendCollectionDelimiterIfNecessary(AppendColumnDelimiter);
12651262
translator.TranslateIdentifier(context.Output, item.Name);
12661263
}
@@ -1282,13 +1279,16 @@ public virtual void Visit(SqlInsert node)
12821279
var rowCount = node.Values.ValuesByColumn(columns.First()).Count;
12831280
for (int i = 0; i < rowCount; i++) {
12841281
if (i > 0) {
1285-
context.Output.AppendText(translator.Translate(context, node, InsertSection.NewRow));
1282+
translator.Translate(context, node, InsertSection.NewRow);
12861283
}
12871284
using var _ = context.EnterCollectionScope();
1285+
bool firstColumn = true;
12881286
foreach (var column in columns) {
1289-
if (!context.IsEmpty) {
1290-
context.Output.AppendDelimiter(translator.ColumnDelimiter);
1287+
if (!firstColumn) {
1288+
var __ = context.Output.Append(translator.ColumnDelimiter);
1289+
AppendSpaceIfNecessary();
12911290
}
1291+
firstColumn = false;
12921292
var item = node.Values.ValuesByColumn(column)[i];
12931293
item.AcceptVisitor(this);
12941294
}

Orm/Xtensive.Orm/Sql/Compiler/SqlTranslator.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,11 +1214,12 @@ public virtual void Translate(SqlCompilerContext context, SqlDropSequence node)
12141214
_ = context.Output.Append(node.Cascade ? " CASCADE" : " RESTRICT");
12151215
}
12161216

1217-
public virtual string Translate(SqlCompilerContext context, SqlTruncateTable node)
1217+
public virtual void Translate(SqlCompilerContext context, SqlTruncateTable node)
12181218
{
1219-
return "TRUNCATE TABLE " + Translate(context, node.Table);
1219+
_ = context.Output.Append("TRUNCATE TABLE ");
1220+
Translate(context, node.Table);
12201221
}
1221-
1222+
12221223
/// <summary>
12231224
/// Translates <see cref="SqlDropTable"/> statement and writes result to to <see cref="SqlCompilerContext.Output"/>.
12241225
/// </summary>
@@ -1254,12 +1255,6 @@ public virtual void Translate(SqlCompilerContext context, SqlDropView node)
12541255
_ = context.Output.Append(node.Cascade ? " CASCADE" : " RESTRICT");
12551256
}
12561257

1257-
public virtual string Translate(SqlCompilerContext context, SqlDropTable node)
1258-
{
1259-
return "DROP TABLE " + Translate(context, node.Table) + (node.Cascade ? " CASCADE" : " RESTRICT");
1260-
}
1261-
1262-
public virtual string Translate(SqlCompilerContext context, SqlFetch node, FetchSection section)
12631258
/// <summary>
12641259
/// Translates <see cref="SqlFetch"/> statement and writes result to to <see cref="SqlCompilerContext.Output"/>.
12651260
/// </summary>
@@ -1969,7 +1964,7 @@ public virtual void Translate(SqlCompilerContext context, SchemaNode node)
19691964
var dbQualified = node.Schema.Catalog != null
19701965
&& context.HasOptions(SqlCompilerNamingOptions.DatabaseQualifiedObjects);
19711966

1972-
1967+
19731968
if (node.Schema.IsNamesReadingDenied) {
19741969
// if schema is shared we use placeholders to translate
19751970
// schema node in PostCompiler

0 commit comments

Comments
 (0)