Merge branch 'main' into bugfix/drop-postgreslistdbdbdrop

HicServices · Jul 16, 2024 · 52c3ba3 · 52c3ba3
2 parents fd047d3 + ceaa29f
commit 52c3ba3
Show file tree

Hide file tree

Showing 19 changed files with 430 additions and 434 deletions.
diff --git a/FAnsiSql/DatabaseOperationArgs.cs b/FAnsiSql/DatabaseOperationArgs.cs
@@ -58,7 +58,7 @@ public int ExecuteNonQuery(DbCommand cmd)
     /// </summary>
     /// <param name="cmd"></param>
     /// <exception cref="OperationCanceledException"></exception>
-    public object ExecuteScalar(DbCommand cmd)
+    public object? ExecuteScalar(DbCommand cmd)
     {
         return Execute(cmd, ()=>cmd.ExecuteScalarAsync(CancellationToken));
     }

diff --git a/FAnsiSql/Discovery/BulkCopy.cs b/FAnsiSql/Discovery/BulkCopy.cs
@@ -119,7 +119,7 @@ protected void ConvertStringTypesToHardTypes(DataTable dt)
         {
             //if the destination column is a problematic type
             var dataType = discoveredColumn.DataType?.GetCSharpDataType();
-            if (!deciders.TryGetValue(dataType, out var decider)) continue;
+            if (dataType == null || !deciders.TryGetValue(dataType, out var decider)) continue;
             //if it's already not a string then that's fine (hopefully it's a legit Type e.g. DateTime!)
             if (dataColumn.DataType != typeof(string))
                 continue;

diff --git a/FAnsiSql/Discovery/DatabaseColumnRequest.cs b/FAnsiSql/Discovery/DatabaseColumnRequest.cs
@@ -57,7 +57,7 @@ public sealed class DatabaseColumnRequest(string columnName, DatabaseTypeRequest
     /// Applies only if the <see cref="TypeRequested"/> is string based.  Setting this will override the default collation and specify
     /// a specific collation.  The value specified must be an installed collation supported by the DBMS
     /// </summary>
-    public string Collation { get; set; }
+    public string? Collation { get; set; }
 
     public DatabaseColumnRequest(string columnName, string explicitDbType, bool allowNulls = true) : this(columnName, (DatabaseTypeRequest?)null, allowNulls)
     {

diff --git a/FAnsiSql/Discovery/DiscoveredParameter.cs b/FAnsiSql/Discovery/DiscoveredParameter.cs
@@ -13,5 +13,5 @@ public sealed class DiscoveredParameter(string parameterName)
     /// <summary>
     /// The <see cref="DiscoveredDataType"/> the parameter is declared as e.g. varchar(10)
     /// </summary>
-    public DiscoveredDataType DataType { get; set; }
+    public DiscoveredDataType? DataType { get; set; }
 }
diff --git a/FAnsiSql/Discovery/DiscoveredServer.cs b/FAnsiSql/Discovery/DiscoveredServer.cs
@@ -90,7 +90,7 @@ public DiscoveredServer(string? connectionString, DatabaseType databaseType)
     /// <param name="usernameIfAny">Optional username to set in the connection string</param>
     /// <param name="passwordIfAny">Optional password to set in the connection string</param>
     /// <exception cref="ImplementationNotFoundException"></exception>
-    public DiscoveredServer(string server, string database, DatabaseType databaseType, string usernameIfAny, string passwordIfAny)
+    public DiscoveredServer(string server, string? database, DatabaseType databaseType, string usernameIfAny, string passwordIfAny)
     {
         Helper = ImplementationManager.GetImplementation(databaseType).GetServerHelper();
 

diff --git a/FAnsiSql/FAnsi.csproj b/FAnsiSql/FAnsi.csproj
@@ -1,79 +1,79 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <id>HIC.FAnsiSql</id>
-    <PackageId>HIC.FAnsiSql</PackageId>
-    <version>0.0.7</version>
-    <title>HIC.FAnsiSql</title>
-    <authors>Health Informatics Centre - University of Dundee</authors>
-    <owners>Health Informatics Centre - University of Dundee</owners>
-    <PackageProjectUrl>https://github.com/HicServices/FAnsiSql</PackageProjectUrl>
-    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <description>FAnsiSql is a database management/ETL library that allows you to perform common SQL operations without having to know which Database Management System (DBMS) you are targetting (e.g. Sql Server, My Sql, Oracle).</description>
-    <PackageTags>Ansi,SQL</PackageTags>
-    <TargetFramework>net8.0</TargetFramework>
-    <AssemblyTitle>HIC.FAnsiSql</AssemblyTitle>
-    <Company>Health Informatics Centre, University of Dundee</Company>
-    <Product>HIC.FAnsiSql</Product>
-    <Description>FAnsiSql is a database management/ETL library that allows you to perform common SQL operations without having to know which Database Management System (DBMS) you are targetting (e.g. Sql Server, My Sql, Oracle).</Description>
-    <Copyright>Copyright ©  2019-2024</Copyright>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <IsAotCompatible>true</IsAotCompatible>
-    <NoWarn>CS1591</NoWarn>
-    <NeutralLanguage>en-GB</NeutralLanguage>
-    <DebugType>embedded</DebugType>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <WarningLevel>1</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Discovery\TypeTranslation\TypeTranslation.cd" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="HIC.TypeGuesser" Version="1.2.4" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="MySqlConnector" Version="2.3.7" />
-    <PackageReference Include="Npgsql" Version="8.0.3" />
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.4.0" />
-    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\README.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="FAnsiStrings.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>FAnsiStrings.resx</DependentUpon>
-    </Compile>
-    <Compile Update="SR.Designer.cs">
-      <DependentUpon>SR.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="FAnsiStrings.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>FAnsiStrings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Update="SR.resx">
-      <SubType>Designer</SubType>
-      <LastGenOutput>SR.Designer.cs</LastGenOutput>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Aggregation\" />
-    <Folder Include="Update\" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <id>HIC.FAnsiSql</id>
+    <PackageId>HIC.FAnsiSql</PackageId>
+    <version>0.0.7</version>
+    <title>HIC.FAnsiSql</title>
+    <authors>Health Informatics Centre - University of Dundee</authors>
+    <owners>Health Informatics Centre - University of Dundee</owners>
+    <PackageProjectUrl>https://github.com/HicServices/FAnsiSql</PackageProjectUrl>
+    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <description>FAnsiSql is a database management/ETL library that allows you to perform common SQL operations without having to know which Database Management System (DBMS) you are targetting (e.g. Sql Server, My Sql, Oracle).</description>
+    <PackageTags>Ansi,SQL</PackageTags>
+    <TargetFramework>net8.0</TargetFramework>
+    <AssemblyTitle>HIC.FAnsiSql</AssemblyTitle>
+    <Company>Health Informatics Centre, University of Dundee</Company>
+    <Product>HIC.FAnsiSql</Product>
+    <Description>FAnsiSql is a database management/ETL library that allows you to perform common SQL operations without having to know which Database Management System (DBMS) you are targetting (e.g. Sql Server, My Sql, Oracle).</Description>
+    <Copyright>Copyright ©  2019-2024</Copyright>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsAotCompatible>true</IsAotCompatible>
+    <NoWarn>CS1591</NoWarn>
+    <NeutralLanguage>en-GB</NeutralLanguage>
+    <DebugType>embedded</DebugType>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <WarningLevel>1</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Discovery\TypeTranslation\TypeTranslation.cd" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="HIC.TypeGuesser" Version="1.2.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="MySqlConnector" Version="2.3.7" />
+    <PackageReference Include="Npgsql" Version="8.0.3" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.5.0" />
+    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="FAnsiStrings.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>FAnsiStrings.resx</DependentUpon>
+    </Compile>
+    <Compile Update="SR.Designer.cs">
+      <DependentUpon>SR.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="FAnsiStrings.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>FAnsiStrings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="SR.resx">
+      <SubType>Designer</SubType>
+      <LastGenOutput>SR.Designer.cs</LastGenOutput>
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Aggregation\" />
+    <Folder Include="Update\" />
+  </ItemGroup>
+</Project>