Merge branch '6.0' into 6.0-node-stale-querycache

Author: alex-kulakov

ChangeLog/6.0.11_dev.txt

@@ -0,0 +1,2 @@
+[postgresql] Dedicated exception when an extracting schema doesn't exist or it belongs to another user
+[weaver] Fixed ctor processing with try...catch where there was broken catch section leaving

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.Designer.cs

@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ExPostgreSqlBelow83IsNotSupported" xml:space="preserve">
     <value>PostgreSQL below 8.3 is not supported.</value>
@@ -132,4 +132,7 @@
   <data name="ExTheTypeOfGivenParameterCannotBeTreatedAsOffsetForDateTimeOffsetConstruction" xml:space="preserve">
     <value>The type of given parameter cannot be treated as offset for DateTimeOffset construction.</value>
   </data>
+  <data name="ExSchemaXDoesNotExistOrBelongsToAnotherUser" xml:space="preserve">
+    <value>Schema '{0}' either does not exist or belongs to another user.</value>
+  </data>
 </root>

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.resx

@@ -441,7 +441,12 @@ protected virtual void ExtractSchemaContents(ExtractionContext context)
           && SqlDml.In(relationsTable["relkind"], SqlDml.Row('r', 'v', 'S'));
 
         if (targetSchemes!=null && targetSchemes.Count > 0) {
-          var schemesIndexes = catalog.Schemas.Where(sch => targetSchemes.ContainsKey(sch.Name)).Select(sch => context.ReversedSchemaMap[sch]);
+          var schemesIndexes = catalog.Schemas.Where(sch => targetSchemes.ContainsKey(sch.Name))
+            .Select(sch =>
+              context.ReversedSchemaMap.TryGetValue(sch, out var oid)
+                ? oid
+                : throw new InvalidOperationException(string.Format(Resources.Strings.ExSchemaXDoesNotExistOrBelongsToAnotherUser, sch.Name))
+             );
           select.Where &= SqlDml.In(relationsTable["relnamespace"], CreateOidRow(schemesIndexes));
         }
         select.Columns.Add(relationsTable["oid"], "reloid");

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -32,4 +32,16 @@
       <Link>Properties\Visibility.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Sql.Drivers.PostgreSql\Resources\Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <SubType>Designer</SubType>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Update="Sql.Drivers.PostgreSql\Resources\Strings.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
 </Project>

Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj

@@ -1,6 +1,6 @@
-// Copyright (C) 2013 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2013-2022 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
 // Created:    2013.08.19
 
@@ -20,6 +20,7 @@ public override ActionResult Execute(ProcessorContext context)
     {
       var body = constructor.Body;
       var il = body.GetILProcessor();
+      var originalLastRet = body.Instructions.Reverse().FirstOrDefault(i => i != null && i.OpCode.Code == Code.Ret);
       var leavePlaceholder = il.Create(OpCodes.Nop);
 
       var initializeCall = EmitInitializeCall(context, il);
@@ -36,6 +37,12 @@ public override ActionResult Execute(ProcessorContext context)
       var ret = il.Create(OpCodes.Ret);
       il.Append(ret);
       il.Replace(leavePlaceholder, il.Create(OpCodes.Leave, ret));
+      if (body.ExceptionHandlers.Count != 0) {
+        if (originalLastRet != null)
+          foreach (var eHandler in body.ExceptionHandlers) {
+            FixCatchLeave(eHandler.HandlerStart, eHandler.HandlerEnd, originalLastRet, initializeCall);
+          }
+      }
 
       body.InitLocals = true;
       var handler = new ExceptionHandler(ExceptionHandlerType.Catch) {
@@ -61,6 +68,19 @@ private void ReplaceRetWithBr(ILProcessor il, Instruction start, Instruction end
       }
     }
 
+    private void FixCatchLeave(Instruction start, Instruction end, Instruction oldRetTarget, Instruction newTarget)
+    {
+      var current = start;
+      while (current != end && current != null) {
+        var next = current.Next;
+        var code = current.OpCode.Code;
+        if ((code == Code.Leave || code == Code.Leave_S) && current.Operand == oldRetTarget) {
+          current.Operand = newTarget;
+        }
+        current = next;
+      }
+    }
+
     private Instruction GetStartInstruction(ILProcessor il)
     {
       var instructions = constructor.Body.Instructions;