Merge branch 'hotfix/5.0.2'

WildGums · Oct 16, 2024 · 3904cf2 · 3904cf2
2 parents 5823f08 + 7ce40b6
commit 3904cf2
Show file tree

Hide file tree

Showing 29 changed files with 2,317 additions and 200 deletions.
diff --git a/.gitignore b/.gitignore
@@ -159,3 +159,6 @@ data/dsl/*.java
 # Nodejs / NPM
 node_modules
 package-lock.json
+
+!tools/**
+!tools/packages.config
diff --git a/src/Orc.DataAccess.Example/Orc.DataAccess.Example.csproj b/src/Orc.DataAccess.Example/Orc.DataAccess.Example.csproj
@@ -18,13 +18,13 @@
 
   <ItemGroup>
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all">
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LoadAssembliesOnStartup.Fody" Version="4.6.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
-    <PackageReference Include="Orchestra.Core" Version="7.0.0" />
+    <PackageReference Include="Orchestra.Core" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Orc.DataAccess.Tests/Automation/Base/StyledControlTestFacts.cs b/src/Orc.DataAccess.Tests/Automation/Base/StyledControlTestFacts.cs
@@ -6,7 +6,7 @@
 using Orc.Automation.Controls;
 using Orc.Automation.Tests;
 
-public abstract class StyledControlTestFacts<TControl> : ControlUiTestFactsBase<TControl>
+public abstract class StyledControlTestFacts<TControl> : ControlUiTestsBase<TControl>
     where TControl : System.Windows.FrameworkElement
 {
     protected override bool TryLoadControl(TestHostAutomationControl testHost, out string testedControlAutomationId)

diff --git a/src/Orc.DataAccess.Tests/Helpers/KeyValueStringParserFacts.cs b/src/Orc.DataAccess.Tests/Helpers/KeyValueStringParserFacts.cs
@@ -7,10 +7,10 @@
 [TestFixture]
 public class KeyValueStringParserFacts
 {
-    [TestCase(@"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;       , Table=RelationOperations,Dialect=SQLSERVER_2008            ",
+    [TestCase($@"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;    {KeyValueStringParser.KeyValuePairsDelimiter}Table=RelationOperations{KeyValueStringParser.KeyValuePairsDelimiter}  Dialect=SQLSERVER_2008   ",
         new[] {"ConnectionString", "Table", "Dialect"},
         new[] {@"Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;", "RelationOperations", "SQLSERVER_2008"})]
-    [TestCase(@"FilePath=ElsinoreData.xlsx,  Worksheet=Operation, CellRange=A212 ",
+    [TestCase(@$"FilePath=ElsinoreData.xlsx{KeyValueStringParser.KeyValuePairsDelimiter}  Worksheet=Operation{KeyValueStringParser.KeyValuePairsDelimiter} CellRange=A212 ",
         new[] {"FilePath", "Worksheet", "CellRange"},
         new[] {@"ElsinoreData.xlsx", "Operation", "A212"})]
     public void CorrectlyParseSourceIntoKeyValueDictionary(string source, string[] expectedKeys, string[] expectedValues)
@@ -23,9 +23,9 @@ public void CorrectlyParseSourceIntoKeyValueDictionary(string source, string[] e
     }
 
     [TestCase(new[] {"ConnectionString", "Table", "Dialect"}, new[] {@"Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;", "RelationOperations", "SQLSERVER_2008"},
-        @"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;, Table=RelationOperations, Dialect=SQLSERVER_2008")]
+        $@"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;{KeyValueStringParser.KeyValuePairsDelimiter} Table=RelationOperations{KeyValueStringParser.KeyValuePairsDelimiter} Dialect=SQLSERVER_2008")]
     [TestCase(new[] {"FilePath", "Worksheet", "CellRange"}, new[] {@"ElsinoreData.xlsx", "Operation", "A212"},
-        @"FilePath=ElsinoreData.xlsx, Worksheet=Operation, CellRange=A212")]
+        $@"FilePath=ElsinoreData.xlsx{KeyValueStringParser.KeyValuePairsDelimiter} Worksheet=Operation{KeyValueStringParser.KeyValuePairsDelimiter} CellRange=A212")]
     public void CorrectlyFormatToKeyValueString(string[] keys, string[] values, string expectedResult)
     {
         var sourceKeyValues = keys.Zip(values, (key, value) => new KeyValuePair<string, string>(key, value));
@@ -35,11 +35,11 @@ public void CorrectlyFormatToKeyValueString(string[] keys, string[] values, stri
         Assert.That(expectedResult, Is.EqualTo(result));
     }
 
-    [TestCase(@"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;, Table=RelationOperations, Dialect=SQLSERVER_2008", "Catalog",
-        "SomeValue", @"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;, Table=RelationOperations, Dialect=SQLSERVER_2008, Catalog=SomeValue")]
-    [TestCase(@"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;, Table=RelationOperations, Dialect=SQLSERVER_2008", "ConnectionString",
-        "Other connection string", @"ConnectionString=Other connection string, Table=RelationOperations, Dialect=SQLSERVER_2008")]
-    [TestCase(@"FilePath =ElsinoreData.xlsx, Worksheet=Operation, CellRange=A212", "Worksheet", "Other worksheet", @"FilePath =ElsinoreData.xlsx, Worksheet=Other worksheet, CellRange=A212")]
+    [TestCase($@"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;{KeyValueStringParser.KeyValuePairsDelimiter} Table=RelationOperations{KeyValueStringParser.KeyValuePairsDelimiter} Dialect=SQLSERVER_2008", "Catalog",
+        "SomeValue", $@"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;{KeyValueStringParser.KeyValuePairsDelimiter} Table=RelationOperations{KeyValueStringParser.KeyValuePairsDelimiter} Dialect=SQLSERVER_2008{KeyValueStringParser.KeyValuePairsDelimiter} Catalog=SomeValue")]
+    [TestCase($@"ConnectionString=Data Source=myServer\sqlexpress;Initial Catalog=TestProject;Integrated Security=True;{KeyValueStringParser.KeyValuePairsDelimiter} Table=RelationOperations{KeyValueStringParser.KeyValuePairsDelimiter} Dialect=SQLSERVER_2008", "ConnectionString",
+        "Other connection string", $@"ConnectionString=Other connection string{KeyValueStringParser.KeyValuePairsDelimiter} Table=RelationOperations{KeyValueStringParser.KeyValuePairsDelimiter} Dialect=SQLSERVER_2008")]
+    [TestCase($@"FilePath =ElsinoreData.xlsx{KeyValueStringParser.KeyValuePairsDelimiter} Worksheet=Operation{KeyValueStringParser.KeyValuePairsDelimiter} CellRange=A212", "Worksheet", "Other worksheet", $@"FilePath =ElsinoreData.xlsx{KeyValueStringParser.KeyValuePairsDelimiter} Worksheet=Other worksheet{KeyValueStringParser.KeyValuePairsDelimiter} CellRange=A212")]
     public void CorrectlySetValueByKeyToKeyValueString(string source, string key, string value, string expectedSource)
     {
         var result = KeyValueStringParser.SetValue(source, key, value);

diff --git a/src/Orc.DataAccess.Tests/Orc.DataAccess.Tests.csproj b/src/Orc.DataAccess.Tests/Orc.DataAccess.Tests.csproj
@@ -15,19 +15,19 @@
 
   <ItemGroup>
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all">
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MethodBoundaryAspect.Fody" Version="2.0.149" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="NUnit" Version="4.0.1" PrivateAssets="all" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Orc.Automation.Tests" Version="5.0.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="NUnit" Version="4.2.2" PrivateAssets="all" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="Orc.Automation.Tests" Version="5.0.5" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" PrivateAssets="all" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-    <PackageReference Include="Verify.NUnit" Version="22.8.0" />
+    <PackageReference Include="Verify.NUnit" Version="27.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Orc.DataAccess.Tests/Providers/SystemSqlDbDataSourceProviderTests.cs b/src/Orc.DataAccess.Tests/Providers/SystemSqlDbDataSourceProviderTests.cs
@@ -2,19 +2,17 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Reflection;
-using NUnit.Framework;
 using Database;
 using Microsoft.Win32;
 using Moq;
-using Orc.Automation.Tests;
+using NUnit.Framework;
 
 [TestFixture]
 public class SystemSqlDbDataSourceProviderTests
 {
-    [TestCase<SystemSqlDbDataSourceProvider>("System.Data.SqlClient")]
-    [TestCase<MsSqlDbDataSourceProvider>("Microsoft.Data.SqlClient")]
+    [Orc.Automation.Tests.TestCase<SystemSqlDbDataSourceProvider>("System.Data.SqlClient")]
+    [Orc.Automation.Tests.TestCase<MsSqlDbDataSourceProvider>("Microsoft.Data.SqlClient")]
     public void GetDataSources_Returns_Correct_Local_Server_List<T>(string providerName)
         where T : MsSqlDbDataSourceProviderBase
     {
@@ -35,10 +33,7 @@ public void GetDataSources_Returns_Correct_Local_Server_List<T>(string providerN
                     {
                         if (Equals(x, "InstalledInstances"))
                         {
-                            return new List<string>
-                            {
-                                serverName
-                            };
+                            return new List<string> { serverName };
                         }
 
                         return null;
@@ -60,17 +55,17 @@ public void GetDataSources_Returns_Correct_Local_Server_List<T>(string providerN
                 {
                     return null;
                 }
-                
+
                 return registerKey.Object;
             });
 
-        var dbProvider = (T) Activator.CreateInstance(typeof(T), BindingFlags.NonPublic | BindingFlags.Instance, 
-            (Binder?) null, new object?[] {registerKeyService.Object}, (CultureInfo?)null);
+        var dbProvider = (T)Activator.CreateInstance(typeof(T), BindingFlags.NonPublic | BindingFlags.Instance,
+            null, new object?[] { registerKeyService.Object }, null);
 
         var expectedServerName = $"{Environment.MachineName}\\{serverName}";
 
         var sources = dbProvider.GetDataSources();
 
-        Assert.That(sources, Is.EquivalentTo(new []{ new DbDataSource(providerName, expectedServerName) }));
+        Assert.That(sources, Is.EquivalentTo(new[] { new DbDataSource(providerName, expectedServerName) }));
     }
 }
diff --git a/...rc.DataAccess.Tests/PublicApiFacts.Orc_DataAccess_HasNoBreakingChanges_Async.verified.txt b/...rc.DataAccess.Tests/PublicApiFacts.Orc_DataAccess_HasNoBreakingChanges_Async.verified.txt
@@ -102,7 +102,7 @@ namespace Orc.DataAccess
     public static class KeyValueStringParser
     {
         public const char KeyValueDelimiter = '=';
-        public const char KeyValuePairsDelimiter = ',';
+        public const string KeyValuePairsDelimiter = "|||";
         public static string FormatToKeyValueString(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> keyPairs) { }
         public static string? GetValue(string source, string key) { }
         public static System.Collections.Generic.Dictionary<string, string> Parse(string source) { }
@@ -257,14 +257,14 @@ namespace Orc.DataAccess.Database
     {
         public static void ConnectInstance<TBaseType>(this Orc.DataAccess.Database.DbProvider dbProvider, TBaseType instance) { }
         public static void ConnectType<TBaseType>(this Orc.DataAccess.Database.DbProvider dbProvider, System.Type type) { }
-        public static T CreateConnectedInstance<T>(this Orc.DataAccess.Database.DbProvider dbProvider, params object[] parameters)
+        public static T? CreateConnectedInstance<T>(this Orc.DataAccess.Database.DbProvider dbProvider, params object[] parameters)
             where T :  notnull { }
         public static System.Data.Common.DbConnection? CreateConnection(this Orc.DataAccess.Database.DbProvider dbProvider, Orc.DataAccess.Database.DatabaseSource databaseSource) { }
         public static System.Data.Common.DbConnection? CreateConnection(this Orc.DataAccess.Database.DbProvider dbProvider, string connectionString) { }
-        public static Orc.DataAccess.Database.DbSourceGatewayBase CreateDbSourceGateway(this Orc.DataAccess.Database.DbProvider dbProvider, Orc.DataAccess.Database.DatabaseSource databaseSource) { }
+        public static Orc.DataAccess.Database.DbSourceGatewayBase? CreateDbSourceGateway(this Orc.DataAccess.Database.DbProvider dbProvider, Orc.DataAccess.Database.DatabaseSource databaseSource) { }
         public static System.Collections.Generic.IList<System.Type> GetConnectedTypes<T>(this Orc.DataAccess.Database.DbProvider dbProvider) { }
         public static System.Collections.Generic.IList<Orc.DataAccess.Database.DbDataSource> GetDataSources(this Orc.DataAccess.Database.DbProvider dbProvider) { }
-        public static T GetOrCreateConnectedInstance<T>(this Orc.DataAccess.Database.DbProvider dbProvider)
+        public static T? GetOrCreateConnectedInstance<T>(this Orc.DataAccess.Database.DbProvider dbProvider)
             where T :  notnull { }
     }
     public class DbProviderFactoryRepository
@@ -338,24 +338,23 @@ namespace Orc.DataAccess.Database
         protected abstract string ProviderName { get; }
         public virtual System.Collections.Generic.IList<Orc.DataAccess.Database.DbDataSource> GetDataSources() { }
     }
-    [Orc.DataAccess.Database.ConnectToProvider("System.Data.SqlClient")]
-    public class MsSqlDbSourceGateway : Orc.DataAccess.Database.SqlDbSourceGatewayBase
+    [Orc.DataAccess.Database.ConnectToProvider("Microsoft.Data.SqlClient")]
+    public class MsSqlDbSourceGateway : Orc.DataAccess.Database.MsSqlDbSourceGatewayBase
     {
         public MsSqlDbSourceGateway(Orc.DataAccess.Database.DatabaseSource source) { }
+    }
+    public abstract class MsSqlDbSourceGatewayBase : Orc.DataAccess.Database.SqlDbSourceGatewayBase
+    {
+        public MsSqlDbSourceGatewayBase(Orc.DataAccess.Database.DatabaseSource source) { }
         protected override System.Collections.Generic.Dictionary<Orc.DataAccess.Database.TableType, System.Func<Orc.DataAccess.DataSourceParameters>> DataSourceParametersFactory { get; }
         protected override System.Collections.Generic.Dictionary<Orc.DataAccess.Database.TableType, System.Func<System.Data.Common.DbConnection, System.Data.Common.DbCommand>> GetObjectListCommandsFactory { get; }
         protected override System.Data.Common.DbCommand CreateGetTableRecordsCommand(System.Data.Common.DbConnection connection, Orc.DataAccess.DataSourceParameters parameters, int offset, int fetchCount, bool isPagingEnabled) { }
         protected override System.Data.Common.DbCommand CreateTableCountCommand(System.Data.Common.DbConnection connection) { }
     }
     [Orc.DataAccess.Database.ConnectToProvider("MySql.Data.MySqlClient")]
-    public class MySqlSourceGateway : Orc.DataAccess.Database.SqlDbSourceGatewayBase
+    public class MySqlSourceGateway : Orc.DataAccess.Database.MsSqlDbSourceGatewayBase
     {
         public MySqlSourceGateway(Orc.DataAccess.Database.DatabaseSource source) { }
-        protected override System.Collections.Generic.Dictionary<Orc.DataAccess.Database.TableType, System.Func<Orc.DataAccess.DataSourceParameters>> DataSourceParametersFactory { get; }
-        protected override System.Collections.Generic.Dictionary<Orc.DataAccess.Database.TableType, System.Func<System.Data.Common.DbConnection, System.Data.Common.DbCommand>> GetObjectListCommandsFactory { get; }
-        protected override System.Data.Common.DbCommand CreateGetFunctionRecordsCommand(System.Data.Common.DbConnection connection, Orc.DataAccess.DataSourceParameters parameters, int offset, int fetchCount) { }
-        protected override System.Data.Common.DbCommand CreateGetTableRecordsCommand(System.Data.Common.DbConnection connection, Orc.DataAccess.DataSourceParameters parameters, int offset, int fetchCount, bool isPagingEnabled) { }
-        protected override System.Data.Common.DbCommand CreateTableCountCommand(System.Data.Common.DbConnection connection) { }
     }
     [Orc.DataAccess.Database.ConnectToProvider("Oracle.ManagedDataAccess.Client")]
     public class OracleSourceGateway : Orc.DataAccess.Database.SqlDbSourceGatewayBase
@@ -379,7 +378,7 @@ namespace Orc.DataAccess.Database
         protected override System.Data.Common.DbCommand CreateTableCountCommand(System.Data.Common.DbConnection connection) { }
         public override Orc.DataAccess.DataSourceParameters GetQueryParameters() { }
     }
-    [Orc.DataAccess.Database.ConnectToProvider("System.Data.SQLite")]
+    [Orc.DataAccess.Database.ConnectToProvider("SQLite Data Provider")]
     public class SqLiteSourceGateway : Orc.DataAccess.Database.SqlDbSourceGatewayBase
     {
         public SqLiteSourceGateway(Orc.DataAccess.Database.DatabaseSource source) { }
@@ -443,6 +442,11 @@ namespace Orc.DataAccess.Database
         public SystemSqlDbDataSourceProvider() { }
         protected override string ProviderName { get; }
     }
+    [Orc.DataAccess.Database.ConnectToProvider("System.Data.SqlClient")]
+    public class SystemSqlDbSourceGateway : Orc.DataAccess.Database.MsSqlDbSourceGatewayBase
+    {
+        public SystemSqlDbSourceGateway(Orc.DataAccess.Database.DatabaseSource source) { }
+    }
     public enum TableType
     {
         Table = 0,

diff --git a/...ml/Controls/ConnectionStringBuilder/ViewModel/ConnectionStringAdvancedOptionsViewModel.cs b/...ml/Controls/ConnectionStringBuilder/ViewModel/ConnectionStringAdvancedOptionsViewModel.cs
@@ -21,7 +21,7 @@ public ConnectionStringAdvancedOptionsViewModel(DbConnectionString connectionStr
         ArgumentNullException.ThrowIfNull(connectionString);
 
         ConnectionString = connectionString;
-        ConnectionStringProperties = Array.Empty<DbConnectionStringProperty>();
+        ConnectionStringProperties = [];
 
         _updateFilterTimer.Interval = TimeSpan.FromMilliseconds(200);
         _updateFilterTimer.Tick += OnUpdateFilterTimerTick;

diff --git a/src/Orc.DataAccess.Xaml/Controls/ConnectionStringBuilder/Views/ConnectionStringBuilder.cs b/src/Orc.DataAccess.Xaml/Controls/ConnectionStringBuilder/Views/ConnectionStringBuilder.cs
@@ -78,11 +78,11 @@ private async void OnEditCommandExecuted(object sender, ExecutedRoutedEventArgs
             {
                 _dbProvider = connectionStringEditViewModel.DbProvider;
                 var connectionString = connectionStringEditViewModel.ConnectionString;
-
+
+                SetCurrentValue(DatabaseProviderProperty, connectionString?.DbProvider.InvariantName);
                 SetCurrentValue(ConnectionStringProperty, connectionString?.ToString());
                 _connectionStringTextBox?.SetCurrentValue(TextBox.TextProperty, connectionString?.ToDisplayString());
                 SetCurrentValue(ConnectionStateProperty, connectionStringEditViewModel.ConnectionState);
-                SetCurrentValue(DatabaseProviderProperty, connectionString?.DbProvider.InvariantName);
             }
         }
     }

diff --git a/src/Orc.DataAccess.Xaml/Orc.DataAccess.Xaml.csproj b/src/Orc.DataAccess.Xaml/Orc.DataAccess.Xaml.csproj
@@ -24,13 +24,13 @@
 
   <ItemGroup>
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all">
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MethodTimer.Fody" Version="3.2.2" PrivateAssets="all" />
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="all" />
-    <PackageReference Include="Orc.Controls" Version="5.0.1" />
+    <PackageReference Include="Orc.Controls" Version="5.0.7" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 

diff --git a/src/Orc.DataAccess/Database/Extensions/DbConnectionStringExtensions.cs b/src/Orc.DataAccess/Database/Extensions/DbConnectionStringExtensions.cs
@@ -29,7 +29,7 @@ public static class DbConnectionStringExtensions
 
         var provider = connectionString.DbProvider;
         var schemaProvider = provider.GetProvider().GetOrCreateConnectedInstance<IDataSourceSchemaProvider>();
-        return schemaProvider.GetSchema(connectionString);
+        return schemaProvider?.GetSchema(connectionString);
     }
 
     public static ConnectionState GetConnectionState(this DbConnectionString connectionString)