Skip to content

Commit d438852

Browse files
committed
Some changes of using SchemaNode/TableNode names
use DbNames, no actualization on MySql DROP INDEX
1 parent df01b89 commit d438852

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/v5_0/Translator.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -579,21 +579,20 @@ protected virtual string TranslateClrType(Type type)
579579

580580
public virtual void Translate(SqlCompilerContext context, SqlRenameColumn action) //TODO: Work on this.
581581
{
582-
string schemaName = action.Column.Table.Schema.DbName;
583-
string tableName = action.Column.Table.DbName;
584-
string columnName = action.Column.DbName;
582+
var column = action.Column;
583+
var tableName = column.Table.DbName;
585584

586585
//alter table `actor` change column last_name1 last_name varchar(45)
587586

588587
var output = context.Output;
589588
_ = output.Append("ALTER TABLE ");
590589
TranslateIdentifier(output, tableName);
591590
_ = output.Append(" CHANGE COLUMN ");
592-
TranslateIdentifier(output, columnName);
591+
TranslateIdentifier(output, column.DbName);
593592
_ = output.AppendSpace();
594593
TranslateIdentifier(output, action.NewName);
595594
_ = output.AppendSpace()
596-
.Append(Translate(action.Column.DataType));
595+
.Append(Translate(column.DataType));
597596
}
598597

599598
// Constructors

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v8_0/Translator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,9 @@ protected virtual void AppendIndexStorageParameters(IOutput output, Index index)
314314
/// <inheritdoc/>
315315
public override void Translate(SqlCompilerContext context, SqlDropIndex node)
316316
{
317+
var index = node.Index;
317318
_ = context.Output.Append("DROP INDEX ");
318-
TranslateIdentifier(context.Output,
319-
context.SqlNodeActualizer.Actualize(node.Index.DataTable.Schema), node.Index.Name);
319+
TranslateIdentifier(context.Output, index.DataTable.Schema.DbName, index.DbName);
320320
}
321321

322322
/// <inheritdoc/>

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v11/Translator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private void TranslateSequenceStatement(SqlCompilerContext context, Sequence seq
8383
AddUseStatement(context, sequence.Schema.Catalog);
8484
_ = context.Output.Append(action)
8585
.Append(" SEQUENCE ");
86-
TranslateIdentifier(context.Output, sequence.Schema.Name, sequence.Name);
86+
TranslateIdentifier(context.Output, sequence.Schema.DbName, sequence.DbName);
8787
}
8888

8989
public Translator(SqlDriver driver)

Orm/Xtensive.Orm.Sqlite/Sql.Drivers.Sqlite/v3/Translator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@ public override void Translate(SqlCompilerContext context, SqlCreateIndex node,
306306
/// <inheritdoc/>
307307
public override void Translate(SqlCompilerContext context, SqlDropIndex node)
308308
{
309+
var index = node.Index
309310
_ = context.Output.Append("DROP INDEX ");
310-
TranslateIdentifier(context.Output, node.Index.DataTable.Schema.DbName, node.Index.DbName);
311+
TranslateIdentifier(context.Output, index.DataTable.Schema.DbName, index.DbName);
311312
}
312313

313314
/// <inheritdoc/>

0 commit comments

Comments
 (0)