Merge pull request #24 from drwatson1/net6

drwatson1 · web-flow · commit 29b2a7542693 · 2022-05-10T21:49:23.000+03:00
Support of .Net 6
diff --git a/README.md b/README.md
@@ -59,6 +59,7 @@ The tool has almost all the features the DbUp has, but without a single line of
 
 |Date|Version|Description|
 |-|-|-|
+|2022-05-10|1.6.6|Add support of .Net 6
 |2022-02-14|1.6.5|Support of DisableVars
 |2022-02-06|1.6.4|Support of drop and ensure for Azure SQL
 |2022-02-02|1.6.3|Support of AzureSQL integrated sequrity
diff --git a/src/dbup-cli.integration-tests/PostgreSqlTests.cs b/src/dbup-cli.integration-tests/PostgreSqlTests.cs
@@ -23,15 +23,15 @@ public PostgreSqlTests()
             Env = new CliEnvironment();
             Logger = new CaptureLogsLogger();
 
-            Environment.SetEnvironmentVariable("CONNSTR", "Host=127.0.0.1;Database=dbup;Username=postgres;Password=PostgresPwd2019;Port=5432");
+            Environment.SetEnvironmentVariable("CONNSTR", "Host=127.0.0.1;Database=dbup;Username=postgres;Password=PostgresPwd2019;Port=5432;Timeout=60;CommandTimeout=60");
         }
 
         string GetBasePath(string subPath = "EmptyScript") =>
             Path.Combine(Assembly.GetExecutingAssembly().Location, $@"..\Scripts\PostgreSql\{subPath}");
 
         string GetConfigPath(string name = "dbup.yml", string subPath = "EmptyScript") => new DirectoryInfo(Path.Combine(GetBasePath(subPath), name)).FullName;
 
-        Func<DbConnection> CreateConnection = () => new NpgsqlConnection("Host=127.0.0.1;Database=postgres;Username=postgres;Password=PostgresPwd2019;Port=5432");
+        Func<DbConnection> CreateConnection = () => new NpgsqlConnection("Host=127.0.0.1;Database=postgres;Username=postgres;Password=PostgresPwd2019;Port=5432;Timeout=60;CommandTimeout=60");
 
         [TestInitialize]
         public Task TestInitialize()
@@ -115,7 +115,6 @@ public void UpgradeCommand_ShouldUseConnectionTimeoutForLongrunningQueries()
             r.Should().Be(1);
         }
 
-
         [TestMethod]
         public void UpgradeCommand_ShouldUseASpecifiedJournal()
         {
@@ -125,7 +124,7 @@ public void UpgradeCommand_ShouldUseASpecifiedJournal()
             result.Should().Be(0);
 
             using (var connection = new NpgsqlConnection(Environment.GetEnvironmentVariable("CONNSTR")))
-            using (var command = new NpgsqlCommand("select count(*) from public.\"testTable\" where scriptname = '001.sql'", connection))
+            using (var command = new NpgsqlCommand("select count(*) from public.journal where scriptname = '001.sql'", connection))
             {
                 connection.Open();
                 var count = command.ExecuteScalar();
diff --git a/src/dbup-cli.integration-tests/Scripts/PostgreSql/JournalTableScript/dbup.yml b/src/dbup-cli.integration-tests/Scripts/PostgreSql/JournalTableScript/dbup.yml
@@ -2,6 +2,7 @@ dbUp:
   version: 1                    # should be 1
   provider: postgresql          # DB provider: sqlserver
   connectionString: $CONNSTR$   # Connection string to DB. For example, "Data Source=(localdb)\dbup;Initial Catalog=MyDb;Integrated Security=True" for sqlserver
+  connectionTimeoutSec: 60
   journalTo:
-    schema: "public"
-    table: "testTable"
+    schema: public
+    table: journal
diff --git a/src/dbup-cli.integration-tests/Scripts/PostgreSql/Timeout/001.sql b/src/dbup-cli.integration-tests/Scripts/PostgreSql/Timeout/001.sql
@@ -1 +1 @@
-﻿SELECT pg_sleep(60);
+﻿SELECT pg_sleep(60);
diff --git a/src/dbup-cli.integration-tests/Scripts/PostgreSql/Timeout/dbup.yml b/src/dbup-cli.integration-tests/Scripts/PostgreSql/Timeout/dbup.yml
@@ -2,4 +2,4 @@ dbUp:
   version: 1                    # should be 1
   provider: postgresql          # DB provider: sqlserver
   connectionString: $CONNSTR$   # Connection string to DB. For example, "Data Source=(localdb)\dbup;Initial Catalog=MyDb;Integrated Security=True" for sqlserver
-  connectionTimeoutSec: 10      # Connection timeout in seconds
+  connectionTimeoutSec: 10      # Connection timeout in seconds
diff --git a/src/dbup-cli.integration-tests/dbup-cli.integration-tests.csproj b/src/dbup-cli.integration-tests/dbup-cli.integration-tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RootNamespace>DbUp.Cli.IntegrationTests</RootNamespace>
+	  <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+	  <RootNamespace>DbUp.Cli.IntegrationTests</RootNamespace>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/dbup-cli.tests.core/dbup-cli.tests.core.csproj b/src/dbup-cli.tests.core/dbup-cli.tests.core.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RootNamespace>DbUp.Cli.Tests</RootNamespace>
+	  <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+	  <RootNamespace>DbUp.Cli.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/dbup-cli.tests/dbup-cli.tests.csproj b/src/dbup-cli.tests/dbup-cli.tests.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RootNamespace>DbUp.Cli.Tests</RootNamespace>
+	  <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+	  <RootNamespace>DbUp.Cli.Tests</RootNamespace>
 
     <IsPackable>false</IsPackable>
 
diff --git a/src/dbup-cli/ConfigurationHelper.cs b/src/dbup-cli/ConfigurationHelper.cs
@@ -77,7 +77,7 @@ public static Option<bool, Error> EnsureDb(IUpgradeLog logger, Provider provider
             }
             catch (Exception ex)
             {
-                return Option.None<bool, Error>(Error.Create(ex.Message));
+                return Option.None<bool, Error>(Error.Create("EnsureDb failed: {0}", ex.Message));
             }
 
             return Option.None<bool, Error>(Error.Create(Constants.ConsoleMessages.UnsupportedProvider, provider.ToString()));
@@ -110,7 +110,7 @@ public static Option<bool, Error> DropDb(IUpgradeLog logger, Provider provider,
             }
             catch (Exception ex)
             {
-                return Option.None<bool, Error>(Error.Create(ex.Message));
+                return Option.None<bool, Error>(Error.Create("DropDb failed: {0}", ex.Message));
             }
 
             return Option.None<bool, Error>(Error.Create(Constants.ConsoleMessages.UnsupportedProvider, provider.ToString()));
diff --git a/src/dbup-cli/ResultBuilder.cs b/src/dbup-cli/ResultBuilder.cs
@@ -0,0 +1,41 @@
+﻿using Optional;
+using System;
+
+namespace DbUp.Cli
+{
+    internal class ResultBuilder
+    {
+        public Option<int, Error> FromUpgradeResult(Engine.DatabaseUpgradeResult result)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (result.Successful)
+            {
+                return Option.Some<int, Error>(0);
+            }
+
+            var msg = "Failed to perform upgrade: ";
+            if (result.Error == null)
+            {
+                msg += "Undefined error";
+            }
+            else
+            {
+                msg += result.Error.Message;
+                if (result.Error.InnerException != null)
+                {
+                    msg += $"{Environment.NewLine}    Details: {result.Error.InnerException.Message}";
+                }
+            }
+            if (result.ErrorScript != null)
+            {
+                msg += $"{Environment.NewLine}    Script: {result.ErrorScript.Name}";
+            }
+
+            return Option.None<int, Error>(Error.Create(msg));
+        }
+    }
+}
diff --git a/src/dbup-cli/ToolEngine.cs b/src/dbup-cli/ToolEngine.cs
@@ -180,19 +180,9 @@ private Option<int, Error> RunUpgradeCommand(UpgradeOptions opts) =>
                                             }
                                         }
 
-                                        if (!engine.TryConnect(out var message))
-                                        {
-                                            return Option.None<int, Error>(Error.Create(message));
-                                        }
-
                                         var result = engine.PerformUpgrade();
 
-                                        if (result.Successful)
-                                        {
-                                            return Option.Some<int, Error>(0);
-                                        }
-
-                                        return Option.None<int, Error>(Error.Create(result.Error.Message));
+                                        return new ResultBuilder().FromUpgradeResult(result);
                                     },
                                     none: error => Option.None<int, Error>(error)),
                             none: error => Option.None<int, Error>(error)),
diff --git a/src/dbup-cli/dbup-cli.csproj b/src/dbup-cli/dbup-cli.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup Condition="'$(GlobalTool)' != false">
-		<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 		<PackAsTool>true</PackAsTool>
 	</PropertyGroup>
 
@@ -18,7 +18,7 @@
 		<LangVersion>latest</LangVersion>
 		<Product>DbUp Command Line Interface</Product>
 		<Authors>Sergey Tregub</Authors>
-		<Version>1.6.5</Version>
+		<Version>1.6.6</Version>
 		<RepositoryUrl>https://github.com/drwatson1/dbup-cli</RepositoryUrl>
 		<Company />
 		<Copyright>Copyright (c) 2022 Sergey Tregub</Copyright>
@@ -28,11 +28,12 @@
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>dbup</ToolCommandName>
 		<PackageOutputPath>./nupkg</PackageOutputPath>
-		<PackageReleaseNotes>Support of DisableVars</PackageReleaseNotes>
+		<PackageReleaseNotes>Add support of .Net 6</PackageReleaseNotes>
 		<Title>DbUp Command Line Interface</Title>
 		<Description>Command line tool, that can be installed as a .Net global tool, that helps you to deploy changes to databases. It tracks which SQL scripts have been run already, and runs the change scripts that are needed to get your database up to date.</Description>
 		<PackageLicenseUrl></PackageLicenseUrl>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -45,6 +46,10 @@
 			<Pack>True</Pack>
 			<PackagePath></PackagePath>
 		</None>
+		<None Include="..\..\README.md">
+		  <Pack>True</Pack>
+		  <PackagePath>\</PackagePath>
+		</None>
 	</ItemGroup>
 
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-SELECT pg_sleep(60);`
	`1`	`+SELECT pg_sleep(60);`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public static Option<bool, Error> EnsureDb(IUpgradeLog logger, Provider provider`
`77`	`77`	`}`
`78`	`78`	`catch (Exception ex)`
`79`	`79`	`{`
`80`		`- return Option.None<bool, Error>(Error.Create(ex.Message));`
	`80`	`+ return Option.None<bool, Error>(Error.Create("EnsureDb failed: {0}", ex.Message));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`return Option.None<bool, Error>(Error.Create(Constants.ConsoleMessages.UnsupportedProvider, provider.ToString()));`
`@@ -110,7 +110,7 @@ public static Option<bool, Error> DropDb(IUpgradeLog logger, Provider provider,`
`110`	`110`	`}`
`111`	`111`	`catch (Exception ex)`
`112`	`112`	`{`
`113`		`- return Option.None<bool, Error>(Error.Create(ex.Message));`
	`113`	`+ return Option.None<bool, Error>(Error.Create("DropDb failed: {0}", ex.Message));`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`return Option.None<bool, Error>(Error.Create(Constants.ConsoleMessages.UnsupportedProvider, provider.ToString()));`