Merge pull request #299 from DataObjects-NET/6.0-pgsql-schema-extraction-fix

PostgreSql: Dedicated exception when schema info can't be extracted

Author: alex-kulakov

ChangeLog/6.0.11_dev.txt

@@ -0,0 +1 @@
+[postgresql] Dedicated exception when an extracting schema doesn't exist or it belongs to another user

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>