Merge branch 'scrocquesel-feat/npgsqldatasource' into release/6.0.0

droyad · droyad · commit 2169d2b57f89 · 2024-07-26T15:28:25.000+10:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -10,18 +10,4 @@
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true' Or '$(CI)' == 'true'">
-
-    <!-- Perform a deterministic build, so our binaries aren't impacted by build server environmental factors (e.g. file paths). -->
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-
-    <!-- Embed source files that are not tracked by the source control manager in the PDB -->
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-
-    <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
-    <DebugType>embedded</DebugType>
-
-  </PropertyGroup>
-
 </Project>
diff --git a/src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.approved.txt b/src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.approved.txt
@@ -1,11 +1,11 @@
 ﻿DB Operation: Open connection
 Info:         Beginning database upgrade
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'schemaversions'
 DB Operation: Dispose command
 Info:         Journal table does not exist
 Info:         Executing Database Server script 'Script0001.sql'
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'schemaversions'
 DB Operation: Dispose command
 Info:         Creating the "schemaversions" table
diff --git a/src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.approved.txt b/src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.approved.txt
@@ -1,11 +1,11 @@
 ﻿DB Operation: Open connection
 Info:         Beginning database upgrade
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'TestSchemaVersions' and TABLE_SCHEMA = 'test'
 DB Operation: Dispose command
 Info:         Journal table does not exist
 Info:         Executing Database Server script 'Script0001.sql'
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'TestSchemaVersions' and TABLE_SCHEMA = 'test'
 DB Operation: Dispose command
 Info:         Creating the "test"."TestSchemaVersions" table
diff --git a/src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyVariableSubstitutions.approved.txt b/src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyVariableSubstitutions.approved.txt
@@ -1,11 +1,11 @@
 ﻿DB Operation: Open connection
 Info:         Beginning database upgrade
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'schemaversions'
 DB Operation: Dispose command
 Info:         Journal table does not exist
 Info:         Executing Database Server script 'Script0001.sql'
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'schemaversions'
 DB Operation: Dispose command
 Info:         Creating the "schemaversions" table
diff --git a/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.Net.verified.cs b/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.Net.verified.cs
diff --git a/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs b/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs
diff --git a/src/Tests/PostgresTableJournalTests.cs b/src/Tests/PostgresTableJournalTests.cs
@@ -11,21 +11,22 @@ namespace DbUp.Postgresql.Tests;
 
 public class PostgresTableJournalTests : IDisposable
 {
-  [Fact]
+    [Fact]
     public void uses_positional_parameters_when_sql_rewriting_disabled()
     {
         AppContext.SetSwitch("Npgsql.EnableSqlRewriting", false);
 
         var dbConnection = Substitute.For<IDbConnection>();
-        var connectionManager = new TestConnectionManager(dbConnection, true);
+        var connectionManager = new TestConnectionManager(dbConnection);
         var command = Substitute.For<IDbCommand>();
         var param1 = Substitute.For<IDbDataParameter>();
         var param2 = Substitute.For<IDbDataParameter>();
         dbConnection.CreateCommand().Returns(command);
         command.CreateParameter().Returns(param1, param2);
         command.ExecuteScalar().Returns(x => 0);
         var consoleUpgradeLog = new ConsoleUpgradeLog();
-        var journal = new PostgresqlTableJournal(() => connectionManager, () => consoleUpgradeLog, "public", "SchemaVersions");
+        var journal = new PostgresqlTableJournal(() => connectionManager, () => consoleUpgradeLog, "public",
+            "SchemaVersions");
 
         // Act
         journal.StoreExecutedScript(new SqlScript("test", "select 1"), () => command);
@@ -45,15 +46,16 @@ public void uses_named_parameters_when_sql_rewriting_enabled()
         AppContext.SetSwitch("Npgsql.EnableSqlRewriting", true);
 
         var dbConnection = Substitute.For<IDbConnection>();
-        var connectionManager = new TestConnectionManager(dbConnection, true);
+        var connectionManager = new TestConnectionManager(dbConnection);
         var command = Substitute.For<IDbCommand>();
         var param1 = Substitute.For<IDbDataParameter>();
         var param2 = Substitute.For<IDbDataParameter>();
         dbConnection.CreateCommand().Returns(command);
         command.CreateParameter().Returns(param1, param2);
         command.ExecuteScalar().Returns(x => 0);
         var consoleUpgradeLog = new ConsoleUpgradeLog();
-        var journal = new PostgresqlTableJournal(() => connectionManager, () => consoleUpgradeLog, "public", "SchemaVersions");
+        var journal = new PostgresqlTableJournal(() => connectionManager, () => consoleUpgradeLog, "public",
+            "SchemaVersions");
 
         // Act
         journal.StoreExecutedScript(new SqlScript("test", "select 1"), () => command);
@@ -62,7 +64,8 @@ public void uses_named_parameters_when_sql_rewriting_enabled()
         command.Received(2).CreateParameter();
         param1.ParameterName.ShouldBe("scriptName");
         param2.ParameterName.ShouldBe("applied");
-        command.CommandText.ShouldBe("""insert into "public"."SchemaVersions" (ScriptName, Applied) values (@scriptName, @applied)""");
+        command.CommandText.ShouldBe(
+            """insert into "public"."SchemaVersions" (ScriptName, Applied) values (@scriptName, @applied)""");
         command.Received().ExecuteNonQuery();
     }
 
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net8</TargetFrameworks>
+    <TargetFramework>net8</TargetFramework>
     <AssemblyName>Tests</AssemblyName>
     <RootNamespace>DbUp.Postgresql.Tests</RootNamespace>
-    <!--    <ImplicitUsings>enable</ImplicitUsings> Can't use implict usings with net46 -->
+    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\dbup-postgresql\dbup-postgresql.csproj"/>
-    <PackageReference Include="DbUp.Tests.Common" Version="5.0.52-Split.8"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-    <PackageReference Include="xunit" Version="2.6.6"/>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="DbUp.Tests.Common" Version="6.0.0-beta.146"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
+    <PackageReference Include="xunit" Version="2.9.0"/>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/dbup-postgresql.sln.DotSettings b/src/dbup-postgresql.sln.DotSettings
@@ -5,5 +5,8 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQ/@EntryIndexedValue">SQ</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>
diff --git a/src/dbup-postgresql/PostgresqlConnectionManager.cs b/src/dbup-postgresql/PostgresqlConnectionManager.cs
@@ -39,6 +39,15 @@ public PostgresqlConnectionManager(string connectionString, X509Certificate2 cer
         {
         }
 
+        /// <summary>
+        /// Creates a new PostgreSQL database connection with a NpgsqlDatasource
+        /// </summary>
+        /// <param name="datasource">The PostgreSQL NpgsqlDataSource.</param>
+        public PostgresqlConnectionManager(NpgsqlDataSource datasource)
+            : base(new DelegateConnectionFactory(l => datasource.CreateConnection()))
+        {
+        }
+
         /// <summary>
         /// Splits the statements in the script using the ";" character.
         /// </summary>
diff --git a/src/dbup-postgresql/PostgresqlExtensions.cs b/src/dbup-postgresql/PostgresqlExtensions.cs
@@ -153,7 +153,7 @@ private static void PostgresqlDatabase(this SupportedDatabasesForEnsureDatabase
             logMasterConnectionStringBuilder.Password = "******";
         }
 
-        logger.WriteInformation("Master ConnectionString => {0}", logMasterConnectionStringBuilder.ConnectionString);
+        logger.LogInformation("Master ConnectionString => {0}", logMasterConnectionStringBuilder.ConnectionString);
 
         using (var connection = new NpgsqlConnection(masterConnectionStringBuilder.ConnectionString))
         {
@@ -164,11 +164,8 @@ private static void PostgresqlDatabase(this SupportedDatabasesForEnsureDatabase
             }
             connection.Open();
 
-            var sqlCommandText = string.Format
-                (
-                    @"SELECT case WHEN oid IS NOT NULL THEN 1 ELSE 0 end FROM pg_database WHERE datname = '{0}' limit 1;",
-                    databaseName
-                );
+            var sqlCommandText =
+                $@"SELECT case WHEN oid IS NOT NULL THEN 1 ELSE 0 end FROM pg_database WHERE datname = '{databaseName}' limit 1;";
 
             // check to see if the database already exists..
             using (var command = new NpgsqlCommand(sqlCommandText, connection)
@@ -185,11 +182,7 @@ private static void PostgresqlDatabase(this SupportedDatabasesForEnsureDatabase
                 }
             }
 
-            sqlCommandText = string.Format
-                (
-                    "create database \"{0}\";",
-                    databaseName
-                );
+            sqlCommandText = $"create database \"{databaseName}\";";
 
             // Create the database...
             using (var command = new NpgsqlCommand(sqlCommandText, connection)
@@ -200,7 +193,7 @@ private static void PostgresqlDatabase(this SupportedDatabasesForEnsureDatabase
                 command.ExecuteNonQuery();
             }
 
-            logger.WriteInformation(@"Created database {0}", databaseName);
+            logger.LogInformation(@"Created database {0}", databaseName);
         }
     }
 
diff --git a/src/dbup-postgresql/PostgresqlScriptExecutor.cs b/src/dbup-postgresql/PostgresqlScriptExecutor.cs
@@ -42,9 +42,9 @@ protected override void ExecuteCommandsWithinExceptionHandler(int index, SqlScri
             catch (PostgresException exception)
 #endif
             {
-                Log().WriteInformation("Npgsql exception has occurred in script: '{0}'", script.Name);
-                Log().WriteError("Script block number: {0}; Block line {1}; Position: {2}; Message: {3}", index, exception.Line, exception.Position, exception.Message);
-                Log().WriteError(exception.ToString());
+                Log().LogInformation("Npgsql exception has occurred in script: '{0}'", script.Name);
+                Log().LogError("Script block number: {0}; Block line {1}; Position: {2}; Message: {3}", index, exception.Line, exception.Position, exception.Message);
+                Log().LogError(exception.ToString());
                 throw;
             }
         }
diff --git a/src/dbup-postgresql/Properties/AssemblyInfo.cs b/src/dbup-postgresql/Properties/AssemblyInfo.cs
@@ -2,7 +2,13 @@
 using System.Runtime.InteropServices;
 
 [assembly: ComVisible(false)]
+
+#if (NETSTANDARD2_0_OR_GREATER  || NET462_OR_GREATER)
+// Npgsql is not CLS compliant and PostgresqlConnectionManager exposes types like NpgsqlDataSource
+[assembly: CLSCompliant(false)]
+#else
 [assembly: CLSCompliant(true)]
+#endif
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("5ddc04cc-0bd3-421e-9ae4-9fd0e4f4ef04")]
diff --git a/src/dbup-postgresql/dbup-postgresql.csproj b/src/dbup-postgresql/dbup-postgresql.csproj
@@ -6,7 +6,7 @@
     <Company>DbUp Contributors</Company>
     <Product>DbUp</Product>
     <Copyright>Copyright © DbUp Contributors 2015</Copyright>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;net462</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>dbup-postgresql</AssemblyName>
     <RootNamespace>DbUp.Postgresql</RootNamespace>
     <PackageId>dbup-postgresql</PackageId>
@@ -16,10 +16,15 @@
     <PackageIcon>dbup-icon.png</PackageIcon>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(CI)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> <!-- Perform a deterministic build, so our binaries aren't impacted by build server environmental factors (e.g. file paths). -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources> <!-- Embed source files that are not tracked by the source control manager in the PDB -->
+    <DebugType>embedded</DebugType> <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="dbup-core" Version="5.0.37"/>
-<!--    <PackageReference Include="System.Net.Security" Version="4.3.2"/>-->
-    <PackageReference Include="Npgsql" Version="3.2.7"/>
+    <PackageReference Include="dbup-core" Version="6.0.0-beta.146"/>
+    <PackageReference Include="Npgsql" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>
