Merge pull request #289 from DataObjects-NET/master-shared-model-improvements

Improved mechanism of schema and catalog name replacement
when ShareSchemaOverNodes option is activated

Author: alex-kulakov

ChangeLog/7.1.0-Beta-2-dev.txt

@@ -7,6 +7,10 @@
 [main] Obsolete Query's members have been removed
 [main] Obsolete members of DelayedScalarQuery<T> have been removed
 [main] Obsolete FieldInfo.IsDynalicallyDefined property's been removed (FieldInfo.IsDynamicallyDefined is still there)
+[main] Changed translation of queries when DomainConfiguration.ShareStorageSchemaOverNodes set to true
+[main] StorageDriver.Compile(ISqlCompileUnit, NodeConfiguration) became obsolete
+[main] SqlNodeActualizer became obsolete
+[main] SqlCompilerConfiguration's DatabaseMapping and SchemaMapping moved to SqlPostCompilerConfiguration
 [main] Some EventArgs inheritors that were sealed classes transformed to read-only structures
 [main] DbCommandEventArgs became read-only structure
 [main] SqlCustomFunctionCall and SqlFunctionCall share one base type

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

@@ -215,7 +215,8 @@ public override void Translate(SqlCompilerContext context, SqlConcat node, NodeS
     }
 
     /// <inheritdoc/>
-    public override void Translate(SqlCompilerContext context, SchemaNode node) => TranslateIdentifier(context.Output, node.Name);
+    public override void Translate(SqlCompilerContext context, SchemaNode node) =>
+      base.Translate(context, node);
 
     /// <inheritdoc/>
     public override void Translate(SqlCompilerContext context, SqlCreateTable node, CreateTableSection section)
@@ -578,21 +579,20 @@ protected virtual string TranslateClrType(Type type)
 
     public virtual void Translate(SqlCompilerContext context, SqlRenameColumn action) //TODO: Work on this.
     {
-      string schemaName = action.Column.Table.Schema.DbName;
-      string tableName = action.Column.Table.DbName;
-      string columnName = action.Column.DbName;
+      var column = action.Column;
+      var tableName = column.Table.DbName;
 
       //alter table `actor` change column last_name1 last_name varchar(45)
 
       var output = context.Output;
       _ = output.Append("ALTER TABLE ");
       TranslateIdentifier(output, tableName);
       _ = output.Append(" CHANGE COLUMN ");
-      TranslateIdentifier(output, columnName);
+      TranslateIdentifier(output, column.DbName);
       _ = output.AppendSpace();
       TranslateIdentifier(output, action.NewName);
       _ = output.AppendSpace()
-        .Append(Translate(action.Column.DataType));
+        .Append(Translate(column.DataType));
     }
 
     // Constructors

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

@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2020 Xtensive LLC.
+// Copyright (C) 2009-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 
@@ -1250,15 +1250,15 @@ protected virtual ISqlCompileUnit BuildExtractSequencesQuery(ExtractionContext c
         var sequenceMap = context.SequenceMap;
         foreach (var (segId, seq) in sequenceMap) {
           if (query.Length == 0) {
-            query.AppendFormat("SELECT * FROM (\nSELECT {0} as id, * FROM {1}", segId,
-              Driver.Translator.TranslateToString(null, seq)); // context is not used in PostrgreSQL translator
+            _ = query.AppendFormat("SELECT * FROM (\nSELECT {0} as id, * FROM {1}", segId,
+              SqlHelper.Quote(SqlHelper.EscapeSetup.WithQuotes, new[] { seq.Schema.DbName, seq.DbName }));
           }
           else {
-            query.AppendFormat("\nUNION ALL\nSELECT {0} as id, * FROM {1}", segId,
-              Driver.Translator.TranslateToString(null, seq)); // context is not used in PostgreSQL translator
+            _ = query.AppendFormat("\nUNION ALL\nSELECT {0} as id, * FROM {1}", segId,
+              SqlHelper.Quote(SqlHelper.EscapeSetup.WithQuotes, new[] { seq.Schema.DbName, seq.DbName }));
           }
         }
-        query.Append("\n) all_sequences\nORDER BY id");
+        _ = query.Append("\n) all_sequences\nORDER BY id");
       }
       return SqlDml.Fragment(SqlDml.Native(query.ToString()));
     }

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

@@ -222,23 +222,28 @@ public override void Translate(IOutput output, SqlMatchType mt)
       });
     }
 
+    ///// <inheritdoc/>
+    //public override string TranslateToString(SqlCompilerContext context, SchemaNode node)
+    //{
+    //  //temporary tables need no schema qualifier
+    //  if (node is TemporaryTable || node.Schema == null) {
+    //    return QuoteIdentifier(new[] { node.Name });
+    //  }
+    //  return QuoteIdentifier(new[] { node.Schema.Name, node.Name });
+    //}
+
     /// <inheritdoc/>
-    public override string TranslateToString(SqlCompilerContext context, SchemaNode node)
+    public override void Translate(SqlCompilerContext context, SchemaNode node)
     {
-      //temporary tables need no schema qualifier
-      if (!(node is TemporaryTable) && node.Schema != null) {
-        return context == null
-          ? QuoteIdentifier(new[] { node.Schema.Name, node.Name })
-          : QuoteIdentifier(new[] { context.SqlNodeActualizer.Actualize(node.Schema), node.Name });
-
+      if (node is TemporaryTable) {
+        TranslateIdentifier(context.Output, node.Name);
+      }
+      else {
+        base.Translate(context, node);
       }
-      return QuoteIdentifier(new[] { node.Name });
+      //context.Output.Append(TranslateToString(context, node));
     }
 
-    /// <inheritdoc/>
-    public override void Translate(SqlCompilerContext context, SchemaNode node) =>
-      context.Output.Append(TranslateToString(context, node));
-
     /// <inheritdoc/>
     public override void Translate(SqlCompilerContext context, SqlCreateTable node, CreateTableSection section)
     {
@@ -309,9 +314,9 @@ protected virtual void AppendIndexStorageParameters(IOutput output, Index index)
     /// <inheritdoc/>
     public override void Translate(SqlCompilerContext context, SqlDropIndex node)
     {
+      var index = node.Index;
       _ = context.Output.Append("DROP INDEX ");
-      TranslateIdentifier(context.Output,
-        context.SqlNodeActualizer.Actualize(node.Index.DataTable.Schema), node.Index.Name);
+      TranslateIdentifier(context.Output, index.DataTable.Schema.DbName, index.DbName);
     }
 
     /// <inheritdoc/>

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

@@ -83,7 +83,7 @@ private void TranslateSequenceStatement(SqlCompilerContext context, Sequence seq
       AddUseStatement(context, sequence.Schema.Catalog);
       _ = context.Output.Append(action)
         .Append(" SEQUENCE ");
-      TranslateIdentifier(context.Output, sequence.Schema.Name, sequence.Name);
+      TranslateIdentifier(context.Output, sequence.Schema.DbName, sequence.DbName);
     }
 
     public Translator(SqlDriver driver)

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

@@ -306,10 +306,9 @@ public override void Translate(SqlCompilerContext context, SqlCreateIndex node,
     /// <inheritdoc/>
     public override void Translate(SqlCompilerContext context, SqlDropIndex node)
     {
-      _ = context.Output.Append("DROP INDEX ")
-        .Append(context.SqlNodeActualizer.Actualize(node.Index.DataTable.Schema))
-        .Append(".");
-      TranslateIdentifier(context.Output, node.Index.DbName);
+      var index = node.Index;
+      _ = context.Output.Append("DROP INDEX ");
+      TranslateIdentifier(context.Output, index.DataTable.Schema.DbName, index.DbName);
     }
 
     /// <inheritdoc/>