Merge pull request #39 from ChaosEngine/dev

bump dependencies

Author: ChaosEngine

.travis.yml

@@ -1,6 +1,6 @@
 language: csharp
 mono: none
-dotnet: 5.0.100
+dotnet: 7.0.100
 dist: bionic
 addons:
   apt:

appveyor.yml

@@ -13,4 +13,4 @@ build_script:
 clone_depth: 1
 test: off
 deploy: off
-os: Visual Studio 2019
+os: Visual Studio 2022

src/Pomelo.Extensions.Caching.MySql/Pomelo.Extensions.Caching.MySql.csproj

@@ -22,9 +22,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
-    <PackageReference Include="MySqlConnector" Version="1.3.10" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
+    <PackageReference Include="MySqlConnector" Version="2.2.5" />
   </ItemGroup>
 
 </Project>

src/Pomelo.Extensions.Caching.MySqlConfig.Tools/Pomelo.Extensions.Caching.MySqlConfig.Tools.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Command line tool to create tables and indexes in a MySql Server database for distributed caching.</Description>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -25,6 +25,8 @@
     <IsPackable>true</IsPackable>
     <ToolCommandName>dotnet-mysql-cache</ToolCommandName>
     <PackAsTool>true</PackAsTool>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Pomelo.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -35,7 +37,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
-	  <PackageReference Include="MySqlConnector" Version="1.3.10" />
+	  <PackageReference Include="MySqlConnector" Version="2.2.5" />
   </ItemGroup>
 
 </Project>

src/Pomelo.Extensions.Caching.MySqlConfig.Tools/Pomelo.snk

@@ -5,28 +5,34 @@
 using MySqlConnector;
 using System;
 using System.Data;
+using System.IO;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace Pomelo.Extensions.Caching.MySqlConfig.Tools
 {
-	public class Program : IDisposable
+	/// <summary>
+	/// Based (if not entirely) of off https://github.com/dotnet/aspnetcore/blob/main/src/Tools/dotnet-sql-cache/src/Program.cs
+	/// </summary>
+	public class Program
 	{
 		private string _connectionString = null;
 		private string _databaseName = null;
 		private string _tableName = null;
 
+		internal TextWriter Error { get; set; } = Console.Error;
+		internal TextWriter Out { get; set; } = Console.Out;
+
 		public Program()
 		{
 		}
 
 		public static int Main(string[] args)
 		{
-			using (var p = new Program())
-			{
-				return p.Run(args);
-			}
+			var p = new Program();
+
+			return p.Run(args);
 		}
 
 		public int Run(string[] args)
@@ -36,11 +42,14 @@ public int Run(string[] args)
 				var description = "Creates table and indexes in MySQL Server database " +
 					"to be used for distributed caching";
 
-				var app = new CommandLineApplication();
-				app.FullName = "MySQL Server Cache Command Line Tool";
-				app.Name = "dotnet-mysql-cache";
-				app.Description = description;
-				app.ShortVersionGetter = () =>
+				var cliApp = new CommandLineApplication();
+				cliApp.Error = Error;
+				cliApp.Out = Out;
+
+				cliApp.FullName = "MySQL Server Cache Command Line Tool";
+				cliApp.Name = "dotnet-mysql-cache";
+				cliApp.Description = description;
+				cliApp.ShortVersionGetter = () =>
 				{
 					var assembly = typeof(Program).GetTypeInfo().Assembly;
 					var infoVersion = assembly
@@ -50,10 +59,13 @@ public int Run(string[] args)
 						? assembly?.GetName().Version.ToString()
 						: infoVersion;
 				};
-				app.HelpOption("-?|-h|--help");
+				cliApp.HelpOption("-?|-h|--help");
 
-				app.Command("create", command =>
+				cliApp.Command("create", command =>
 				{
+					command.Error = Error;//internal command Out/Erro are not yet changed, possible shortcomming
+					command.Out = Out;
+
 					command.Description = description;
 					var connectionStringArg = command.Argument(
 						"[connectionString]",
@@ -65,11 +77,11 @@ public int Run(string[] args)
 					command.OnExecute(async () =>
 					{
 						if (string.IsNullOrEmpty(connectionStringArg.Value)
-						|| string.IsNullOrEmpty(databaseNameArg.Value)
-						|| string.IsNullOrEmpty(tableNameArg.Value))
+							|| string.IsNullOrEmpty(databaseNameArg.Value)
+							|| string.IsNullOrEmpty(tableNameArg.Value))
 						{
-							await Console.Error.WriteLineAsync("Invalid input");
-							app.ShowHelp();
+							await Error.WriteLineAsync("Invalid input");
+							cliApp.ShowHelp(command.Name);
 							return 2;
 						}
 
@@ -81,18 +93,45 @@ public int Run(string[] args)
 					});
 				});
 
+				cliApp.Command("script", command =>
+				{
+					command.Error = Error;//internal command Out/Erro are not yet changed, possible shortcomming
+					command.Out = Out;
+
+					command.Description = "Generate creation script";
+					var databaseNameArg = command.Argument("[databaseName]", "Name of the database.");
+					var tableNameArg = command.Argument("[tableName]", "Name of the table to be created.");
+					command.HelpOption("-?|-h|--help");
+
+					command.OnExecute(async () =>
+					{
+						if (string.IsNullOrEmpty(databaseNameArg.Value)
+							|| string.IsNullOrEmpty(tableNameArg.Value))
+						{
+							await Error.WriteLineAsync("Invalid input");
+							cliApp.ShowHelp(command.Name);
+							return 2;
+						}
+
+						_databaseName = databaseNameArg.Value;
+						_tableName = tableNameArg.Value;
+
+						return await GenerateScript();
+					});
+				});
+
 				// Show help information if no subcommand/option was specified.
-				app.OnExecute(() =>
+				cliApp.OnExecute(() =>
 				{
-					app.ShowHelp();
+					cliApp.ShowHelp();
 					return 2;
 				});
 
-				return app.Execute(args);
+				return cliApp.Execute(args);
 			}
-			catch (Exception exception)
+			catch (Exception ex)
 			{
-				Console.Error.WriteLine($"An error occurred. {exception.Message}");
+				Error.WriteLine($"An error occurred. {ex.Message}");
 				return 1;
 			}
 		}
@@ -112,7 +151,7 @@ public int Run(string[] args)
 					{
 						if (await reader.ReadAsync(token))
 						{
-							Console.Error.WriteLine(
+							Error.WriteLine(
 								$"Table '{_tableName}' from database '{_databaseName}' already exists. " +
 								"Provide a different table name and try again.");
 							return 1;
@@ -138,11 +177,11 @@ public int Run(string[] args)
 
 						transaction.Commit();
 
-						await Console.Out.WriteLineAsync("Table and index were created successfully.");
+						await Out.WriteLineAsync("Table and index were created successfully.");
 					}
 					catch (Exception ex)
 					{
-						await Console.Error.WriteLineAsync(
+						await Error.WriteLineAsync(
 							$"An error occurred while trying to create the table and index. {ex.Message}");
 						transaction.Rollback();
 
@@ -154,52 +193,36 @@ await Console.Error.WriteLineAsync(
 			return 0;
 		}
 
-		private void ValidateConnectionString()
+		private async Task<int> GenerateScript(CancellationToken token = default(CancellationToken))
 		{
 			try
 			{
-				new MySqlConnectionStringBuilder(_connectionString);
+				var sqlQueries = new MySqlQueries(_databaseName, _tableName);
+				string cmd = sqlQueries.CreateTable;
+
+				await Out.WriteLineAsync($"{Environment.NewLine}{cmd}{Environment.NewLine}");
 			}
 			catch (Exception ex)
 			{
-				throw new ArgumentException(
-					$"Invalid MySql server connection string '{_connectionString}'. {ex.Message}", ex);
+				await Error.WriteLineAsync($"An error occurred while trying to create the table and index. {ex.Message}");
+
+				return 1;
 			}
-		}
 
-		#region IDisposable Support
-		private bool disposedValue = false; // To detect redundant calls
+			return 0;
+		}
 
-		protected virtual void Dispose(bool disposing)
+		private void ValidateConnectionString()
 		{
-			if (!disposedValue)
+			try
 			{
-				if (disposing)
-				{
-					// TODO: dispose managed state (managed objects).
-				}
-
-				// TODO: free unmanaged resources (unmanaged objects) and override a finalizer below.
-				// TODO: set large fields to null.
-
-				disposedValue = true;
+				new MySqlConnectionStringBuilder(_connectionString);
+			}
+			catch (Exception ex)
+			{
+				throw new ArgumentException(
+					$"Invalid MySql server connection string '{_connectionString}'. {ex.Message}", ex);
 			}
 		}
-
-		// TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources.
-		// ~Program() {
-		//   // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
-		//   Dispose(false);
-		// }
-
-		// This code added to correctly implement the disposable pattern.
-		public void Dispose()
-		{
-			// Do not change this code. Put cleanup code in Dispose(bool disposing) above.
-			Dispose(true);
-			// TODO: uncomment the following line if the finalizer is overridden above.
-			// GC.SuppressFinalize(this);
-		}
-		#endregion
 	}
 }

src/Pomelo.Extensions.Caching.MySqlConfig.Tools/Program.cs

@@ -10,4 +10,4 @@
 [assembly: AssemblyCompany("Pomelo Foundation")]
 [assembly: AssemblyCopyright("© Pomelo Foundation. All rights reserved.")]
 [assembly: AssemblyProduct("Pomelo MySql Caching")]
-[assembly: InternalsVisibleTo("Pomelo.Extensions.Caching.MySql.Tests")]
+[assembly: InternalsVisibleTo("Pomelo.Extensions.Caching.MySql.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001002d40e2372e6f611238ace2bf7c80546c03a568c471495b6c91b89de694de5413b25ac77a005a371c46f15ab87f13d49ec7aa9bbd9fa99d8f51deb1d87c42d81047aa118519d9813bd5973e8cc8d17d8e5e5e865bce62518aa46e2348dac3db3638b00b9a8df69e1158e4ea82913b6a14c19c07fe473e7511ce91c1b7f41155cf")]

src/Pomelo.Extensions.Caching.MySqlConfig.Tools/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ internal class MySqlQueries
 			// That is why we are using 'CHARACTER SET ascii COLLATE ascii_bin' column and index
 			// https://dev.mysql.com/doc/refman/5.7/en/innodb-restrictions.html
 			// - Add collation to the key column to make it case-sensitive
-			"CREATE TABLE IF NOT EXISTS `{0}` (" +
+			"CREATE TABLE IF NOT EXISTS {0} (" +
 				"`Id` varchar(449) CHARACTER SET ascii COLLATE ascii_bin NOT NULL," +
 				"`AbsoluteExpiration` datetime(6) DEFAULT NULL," +
 				"`ExpiresAtTime` datetime(6) NOT NULL," +
@@ -22,8 +22,8 @@ internal class MySqlQueries
 				"KEY `Index_ExpiresAtTime` (`ExpiresAtTime`)" +
 			")";
 
-		private const string CreateNonClusteredIndexOnExpirationTimeFormat
-			= "CREATE NONCLUSTERED INDEX Index_ExpiresAtTime ON {0}(ExpiresAtTime)";
+		//private const string CreateNonClusteredIndexOnExpirationTimeFormat
+		//	= "CREATE NONCLUSTERED INDEX Index_ExpiresAtTime ON {0}(ExpiresAtTime)";
 
 		private const string TableInfoFormat =
 			 "SELECT TABLE_CATALOG, TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE " +
@@ -43,24 +43,24 @@ public MySqlQueries(string databaseName, string tableName)
 			}
 
 			var tableNameWithDatabase = string.Format(
-				"{1}", DelimitIdentifier(databaseName), DelimitIdentifier(tableName));
+				"{0}.{1}", DelimitIdentifier(databaseName), DelimitIdentifier(tableName));
 			CreateTable = string.Format(CreateTableFormat, tableNameWithDatabase);
-			CreateNonClusteredIndexOnExpirationTime = string.Format(
-				CreateNonClusteredIndexOnExpirationTimeFormat,
-				tableNameWithDatabase);
+			//CreateNonClusteredIndexOnExpirationTime = string.Format(
+			//	CreateNonClusteredIndexOnExpirationTimeFormat,
+			//	tableNameWithDatabase);
 			TableInfo = string.Format(TableInfoFormat, EscapeLiteral(databaseName), EscapeLiteral(tableName));
 		}
 
 		public string CreateTable { get; }
 
-		public string CreateNonClusteredIndexOnExpirationTime { get; }
+		//public string CreateNonClusteredIndexOnExpirationTime { get; }
 
 		public string TableInfo { get; }
 
 		// From EF's SqlServerQuerySqlGenerator
 		private string DelimitIdentifier(string identifier)
 		{
-			return identifier;
+			return $"`{identifier}`";
 		}
 
 		private string EscapeLiteral(string literal)