No SharedStorageSchema in SqlCompilerConfiguration

Author: alex-kulakov

Orm/Xtensive.Orm.Tests.Sql/MakeNamesUnreadableTest.cs

@@ -364,7 +364,7 @@ private void TestQueryNamesUnreadable(ISqlCompileUnit query, Schema defaultSchem
       var queryText = string.Empty;
 
       if (IsMultidatabaseSupported) {
-        var compilerConfiguration = new SqlCompilerConfiguration() { DatabaseQualifiedObjects = true, SharedStorageSchema = true };
+        var compilerConfiguration = new SqlCompilerConfiguration() { DatabaseQualifiedObjects = true };
 
         _ = Assert.Throws<InvalidOperationException>(() => queryText = Driver.Compile(query, compilerConfiguration).GetCommandText());
 
@@ -383,36 +383,33 @@ private void TestQueryNamesUnreadable(ISqlCompileUnit query, Schema defaultSchem
         Assert.That(queryText.Contains(DummySchemaName), Is.True);
       }
       if (IsMultischemaSupported) {
-        var compilerConfiguration = new SqlCompilerConfiguration() { SharedStorageSchema = true };
-
-        _ = Assert.Throws<InvalidOperationException>(() => queryText = Driver.Compile(query, compilerConfiguration).GetCommandText());
+        _ = Assert.Throws<InvalidOperationException>(() => queryText = Driver.Compile(query).GetCommandText());
 
         var postCompilerConfiguration = new SqlPostCompilerConfiguration(emptyMap, emptyMap);
-        Assert.DoesNotThrow(() => queryText = Driver.Compile(query, compilerConfiguration).GetCommandText(postCompilerConfiguration));
+        Assert.DoesNotThrow(() => queryText = Driver.Compile(query).GetCommandText(postCompilerConfiguration));
         Assert.That(queryText.Contains(defaultSchema.GetDbNameInternal()), Is.True);
         Assert.That(queryText.Contains(defaultSchema.Catalog.GetDbNameInternal()), Is.False);
 
         postCompilerConfiguration = new SqlPostCompilerConfiguration(GetDatabaseMap(defaultSchema.Catalog), GetSchemaMap(defaultSchema));
 
-        Assert.DoesNotThrow(() => queryText = Driver.Compile(query,compilerConfiguration).GetCommandText(postCompilerConfiguration));
+        Assert.DoesNotThrow(() => queryText = Driver.Compile(query).GetCommandText(postCompilerConfiguration));
         Assert.That(queryText.Contains(defaultSchema.GetDbNameInternal()), Is.False);
         Assert.That(queryText.Contains(defaultSchema.Catalog.GetDbNameInternal()), Is.False);
         Assert.That(queryText.Contains(DummyDatabaseName), Is.False);
         Assert.That(queryText.Contains(DummySchemaName), Is.True);
       }
       else {
-        var compilerConfiguration = new SqlCompilerConfiguration() { SharedStorageSchema = true };
-        Assert.DoesNotThrow(() => queryText = Driver.Compile(query, compilerConfiguration).GetCommandText());
+        Assert.DoesNotThrow(() => queryText = Driver.Compile(query).GetCommandText());
 
         var postCompilerConfiguration = new SqlPostCompilerConfiguration(emptyMap, emptyMap);
 
-        Assert.DoesNotThrow(() => queryText = Driver.Compile(query, compilerConfiguration).GetCommandText(postCompilerConfiguration));
+        Assert.DoesNotThrow(() => queryText = Driver.Compile(query).GetCommandText(postCompilerConfiguration));
         Assert.That(queryText.Contains(defaultSchema.GetDbNameInternal()), Is.False);
         Assert.That(queryText.Contains(defaultSchema.Catalog.GetDbNameInternal()), Is.False);
 
         postCompilerConfiguration = new SqlPostCompilerConfiguration(GetDatabaseMap(defaultSchema.Catalog), GetSchemaMap(defaultSchema));
 
-        Assert.DoesNotThrow(() => queryText = Driver.Compile(query, compilerConfiguration).GetCommandText());
+        Assert.DoesNotThrow(() => queryText = Driver.Compile(query).GetCommandText());
         Assert.That(queryText.Contains(defaultSchema.GetDbNameInternal()), Is.False);
         Assert.That(queryText.Contains(defaultSchema.Catalog.GetDbNameInternal()), Is.False);
         Assert.That(queryText.Contains(DummyDatabaseName), Is.False);

Orm/Xtensive.Orm/Orm/Providers/StorageDriver.cs

@@ -84,7 +84,6 @@ public SqlCompilationResult Compile(ISqlCompileUnit statement)
       var options = new SqlCompilerConfiguration {
         DatabaseQualifiedObjects = configuration.IsMultidatabase,
         CommentLocation = configuration.TagsLocation.ToCommentLocation(),
-        SharedStorageSchema = false,
       };
       return underlyingDriver.Compile(statement, options);
     }
@@ -94,7 +93,6 @@ public SqlCompilationResult Compile(ISqlCompileUnit statement, NodeConfiguration
 #pragma warning restore IDE0060 // Remove unused parameter
     {
       var options = new SqlCompilerConfiguration {
-        SharedStorageSchema = configuration.ShareStorageSchemaOverNodes,
         DatabaseQualifiedObjects = configuration.IsMultidatabase,
         CommentLocation = configuration.TagsLocation.ToCommentLocation()
       };

Orm/Xtensive.Orm/Sql/Compiler/SqlCompilerConfiguration.cs

@@ -35,21 +35,16 @@ public sealed class SqlCompilerConfiguration
     /// </summary>
     public SqlCommentLocation CommentLocation { get; set; } = SqlCommentLocation.Nowhere;
 
-    /// <summary>
-    /// Indicated whether storage schema was shared over several storage nodes.
-    /// </summary>
-    public bool SharedStorageSchema { get; init; } = false;
-
     /// <summary>
     /// Gets database mapping.
     /// </summary>
-    [Obsolete("No longer in use")]
+    [Obsolete("No longer in use. Moved to SqlPostCompilerConfiguration.")]
     public IReadOnlyDictionary<string, string> SchemaMapping { get; private set; }
 
     /// <summary>
     /// Gets database mapping.
     /// </summary>
-    [Obsolete("No longer in use")]
+    [Obsolete("No longer in use. Moved to SqlPostCompilerConfiguration.")]
     public IReadOnlyDictionary<string, string> DatabaseMapping { get; private set; }
 
     /// <summary>

Orm/Xtensive.Orm/Sql/Compiler/SqlCompilerContext.cs

@@ -30,8 +30,6 @@ public class SqlCompilerContext
     public SqlNode[] GetTraversalPath() =>
       traversalPath ??= traversalStack.ToArray();
 
-    public bool SharedStorageSchema { get; }
-
     public bool HasOptions(SqlCompilerNamingOptions requiredOptions)
     {
       return (NamingOptions & requiredOptions)==requiredOptions;
@@ -146,8 +144,6 @@ internal SqlCompilerContext(SqlCompilerConfiguration configuration)
       if (configuration.DatabaseQualifiedObjects)
         NamingOptions |= SqlCompilerNamingOptions.DatabaseQualifiedObjects;
 
-      SharedStorageSchema = configuration.SharedStorageSchema;
-
       TableNameProvider = new SqlTableNameProvider(this);
       ParameterNameProvider = new SqlParameterNameProvider(configuration);
       Output = new ContainerNode();

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

@@ -1955,7 +1955,8 @@ public virtual void Translate(SqlCompilerContext context, SchemaNode node)
       var dbQualified = node.Schema.Catalog != null
         && context.HasOptions(SqlCompilerNamingOptions.DatabaseQualifiedObjects);
 
-      if (context.SharedStorageSchema) {
+      
+      if (node.Schema.IsNamesReadingDenied) {
         // if schema is shared we use placeholders to translate
         // schema node in PostCompiler
         output.AppendSchemaNodePlaceholder(node, EscapeSetup, dbQualified);

Orm/Xtensive.Orm/Sql/Model/Catalog.cs

@@ -14,8 +14,6 @@ namespace Xtensive.Sql.Model
   [Serializable]
   public class Catalog : Node
   {
-    private bool isNamesReadingDenied = false;
-
     private Schema defaultSchema;
     private PairedNodeCollection<Catalog, Schema> schemas;
     private PairedNodeCollection<Catalog, PartitionFunction> partitionFunctions;
@@ -25,12 +23,12 @@ public class Catalog : Node
     public override string Name
     {
       get {
-        if (!isNamesReadingDenied)
+        if (!IsNamesReadingDenied)
           return base.Name;
         throw new InvalidOperationException(Strings.ExNameValueReadingOrSettingIsDenied);
       }
       set {
-        if (!isNamesReadingDenied)
+        if (!IsNamesReadingDenied)
           base.Name = value;
         else
           throw new InvalidOperationException(Strings.ExNameValueReadingOrSettingIsDenied);
@@ -41,50 +39,18 @@ public override string Name
     public override string DbName
     {
       get {
-        if (!isNamesReadingDenied)
+        if (!IsNamesReadingDenied)
           return base.DbName;
         throw new InvalidOperationException(Strings.ExDbNameValueReadingOrSettingIsDenied);
       }
       set {
-        if (!isNamesReadingDenied)
+        if (!IsNamesReadingDenied)
           base.DbName = value;
         else
           throw new InvalidOperationException(Strings.ExDbNameValueReadingOrSettingIsDenied);
       }
     }
 
-    /// <summary>
-    /// Creates a schema.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <returns></returns>
-    public Schema CreateSchema(string name)
-    {
-      return new Schema(this, name);
-    }
-
-    /// <summary>
-    /// Creates the partition function.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="dataType">Type of the input parameter.</param>
-    /// <param name="boundaryValues">The boundary values.</param>
-    public PartitionFunction CreatePartitionFunction(string name, SqlValueType dataType, params string[] boundaryValues)
-    {
-      return new PartitionFunction(this, name, dataType, boundaryValues);
-    }
-
-    /// <summary>
-    /// Creates the partition schema.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="partitionFunction">The partition function.</param>
-    /// <param name="filegroups">The filegroups.</param>
-    public PartitionSchema CreatePartitionSchema(string name, PartitionFunction partitionFunction, params string[] filegroups)
-    {
-      return new PartitionSchema(this, name, partitionFunction, filegroups);
-    }
-
     /// <summary>
     /// Default <see cref="Schema"/> of this instance.
     /// </summary>
@@ -113,10 +79,7 @@ public Schema DefaultSchema
     /// Gets the schemas.
     /// </summary>
     /// <value>The schemas.</value>
-    public PairedNodeCollection<Catalog, Schema> Schemas
-    {
-      get { return schemas; }
-    }
+    public PairedNodeCollection<Catalog, Schema> Schemas => schemas;
 
     /// <summary>
     /// Gets the partition functions.
@@ -140,13 +103,41 @@ public PairedNodeCollection<Catalog, PartitionSchema> PartitionSchemas
     {
       get
       {
-        if (partitionSchemas==null)
+        if (partitionSchemas == null)
           partitionSchemas =
             new PairedNodeCollection<Catalog, PartitionSchema>(this, "PartitionSchemas");
         return partitionSchemas;
       }
     }
 
+    internal bool IsNamesReadingDenied { get; private set; }
+
+    /// <summary>
+    /// Creates a schema.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <returns></returns>
+    public Schema CreateSchema(string name) => new(this, name);
+
+    /// <summary>
+    /// Creates the partition function.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="dataType">Type of the input parameter.</param>
+    /// <param name="boundaryValues">The boundary values.</param>
+    public PartitionFunction CreatePartitionFunction(string name, SqlValueType dataType, params string[] boundaryValues) =>
+      new(this, name, dataType, boundaryValues);
+
+    /// <summary>
+    /// Creates the partition schema.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="partitionFunction">The partition function.</param>
+    /// <param name="filegroups">The filegroups.</param>
+    public PartitionSchema CreatePartitionSchema(string name, PartitionFunction partitionFunction, params string[] filegroups) =>
+      new(this, name, partitionFunction, filegroups);
+
+
     #region ILockable Members 
 
     /// <summary>
@@ -163,37 +154,32 @@ public override void Lock(bool recursive)
 
     internal void MakeNamesUnreadable()
     {
-      isNamesReadingDenied = true;
-      this.Schemas.ForEach(s => s.MakeNamesUnreadable());
-      this.PartitionFunctions.ForEach(pf => pf.MakeNamesUnreadable());
-      this.PartitionSchemas.ForEach(ps => ps.MakeNamesUnreadable());
+      IsNamesReadingDenied = true;
+      Schemas.ForEach(s => s.MakeNamesUnreadable());
+      PartitionFunctions.ForEach(pf => pf.MakeNamesUnreadable());
+      PartitionSchemas.ForEach(ps => ps.MakeNamesUnreadable());
     }
 
     internal string GetActualName(IReadOnlyDictionary<string, string> catalogNameMap)
     {
-      if (!isNamesReadingDenied)
+      if (!IsNamesReadingDenied)
         return Name;
       if (catalogNameMap==null)
         throw new ArgumentNullException("catalogNameMap");
 
       var name = GetNameInternal();
-      string actualName;
-      if (catalogNameMap.TryGetValue(name, out actualName))
-        return actualName;
-      return name;
+      return catalogNameMap.TryGetValue(name, out var actualName) ? actualName : name;
     }
 
     internal string GetActualDbName(IReadOnlyDictionary<string, string> catalogNameMap)
     {
-      if (!isNamesReadingDenied)
+      if (!IsNamesReadingDenied)
         return DbName;
       if (catalogNameMap==null)
         throw new ArgumentNullException("Unable to calculate real name for catalog");
+
       var name = GetDbNameInternal();
-      string actualName;
-      if (catalogNameMap.TryGetValue(name, out actualName))
-        return actualName;
-      return name;
+      return catalogNameMap.TryGetValue(name, out var actualName) ? actualName : name;
     }
 
     // Constructors
@@ -212,6 +198,5 @@ public Catalog(string name, bool caseSensitiveNames = false)
         ? new PairedNodeCollection<Catalog, Schema>(this, "Schemas", 1, StringComparer.Ordinal)
         : new PairedNodeCollection<Catalog, Schema>(this, "Schemas", 1, StringComparer.OrdinalIgnoreCase);
     }
-
   }
 }

Orm/Xtensive.Orm/Sql/Model/CatalogNode.cs

@@ -15,18 +15,17 @@ namespace Xtensive.Sql.Model
   public abstract class CatalogNode : Node, IPairedNode<Catalog>
   {
     private Catalog catalog;
-    private bool isNamesReadingDenied = false;
 
     /// <inheritdoc />
     public override string Name
     {
       get {
-        if (!isNamesReadingDenied)
+        if (!IsNamesReadingDenied)
           return base.Name;
         throw new InvalidOperationException(Strings.ExNameValueReadingOrSettingIsDenied);
       }
       set {
-        if (!isNamesReadingDenied)
+        if (!IsNamesReadingDenied)
           base.Name = value;
         else
           throw new InvalidOperationException(Strings.ExNameValueReadingOrSettingIsDenied);
@@ -37,12 +36,12 @@ public override string Name
     public override string DbName
     {
       get {
-        if (!isNamesReadingDenied)
+        if (!IsNamesReadingDenied)
           return base.DbName;
         throw new InvalidOperationException(Strings.ExDbNameValueReadingOrSettingIsDenied);
       }
       set {
-        if (!isNamesReadingDenied)
+        if (!IsNamesReadingDenied)
           base.DbName = value;
         else
           throw new InvalidOperationException(Strings.ExDbNameValueReadingOrSettingIsDenied);
@@ -63,6 +62,8 @@ public Catalog Catalog
       }
     }
 
+    internal bool IsNamesReadingDenied { get; private set; }
+
     /// <summary>
     /// Changes the catalog.
     /// </summary>
@@ -86,12 +87,12 @@ void IPairedNode<Catalog>.UpdatePairedProperty(string property, Catalog value)
 
     internal void MakeNamesUnreadable()
     {
-      isNamesReadingDenied = true;
+      IsNamesReadingDenied = true;
     }
 
     internal string GetActualName(IReadOnlyDictionary<string, string> nodeNameMap)
     {
-      if (!isNamesReadingDenied)
+      if (!IsNamesReadingDenied)
         return Name;
       if (nodeNameMap==null)
         throw new ArgumentNullException("nodeNameMap");
@@ -105,14 +106,13 @@ internal string GetActualName(IReadOnlyDictionary<string, string> nodeNameMap)
 
     internal string GetActualDbName(IReadOnlyDictionary<string, string> nodeNameMap)
     {
-      if (!isNamesReadingDenied)
+      if (!IsNamesReadingDenied)
         return DbName;
       if (nodeNameMap==null)
         throw new ArgumentNullException("nodeNameMap");
 
       var name = GetDbNameInternal();
-      string actualName;
-      if (nodeNameMap.TryGetValue(name, out actualName))
+      if (nodeNameMap.TryGetValue(name, out var actualName))
         return actualName;
       return name;
     }