Merge pull request #86 from LinqToDB4iSeries/V6.3.0

Upgraded to linq2db v6.3.0

Author: nsarris

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<Version>6.2.1</Version>
+		<Version>6.3.0</Version>
 
 		<Description>LINQ to DB is a data access technology that provides a run-time infrastructure for managing relational data as objects.  This package is a provider for DB2 on the IBM iSeries.</Description>
 		<Authors>Roy Chase, Nikos Sarris</Authors>

Directory.Packages.props

@@ -337,6 +337,7 @@ public override void SetParameter(DataConnection dataConnection, DbParameter par
 
 				case DataType.DateTime2:
 				case DataType.DateTime:
+				case DataType.DateTimeOffset:
 
 					//Sanitize DataType based on provided DbType
 					dataType = dataType.WithDataType(dataType.DbType?.ToUpper() switch

Source/ISeriesProvider/DB2iSeriesDataProvider.cs

@@ -12,7 +12,7 @@ internal class DB2iSeriesMultipleRowsHelper<T> : MultipleRowsHelper<T>
 		private readonly DB2iSeriesSqlProviderFlags db2ISeriesSqlProviderFlags;
 
 		public DB2iSeriesMultipleRowsHelper(ITable<T> table, DataOptions options, DB2iSeriesSqlProviderFlags db2ISeriesSqlProviderFlags)
-			: base(table, options)
+			: base(table, options, null)
 		{
 			this.db2ISeriesSqlProviderFlags = db2ISeriesSqlProviderFlags;
 		}

Source/ISeriesProvider/DB2iSeriesMultipleRowsHelper.cs

@@ -21,6 +21,7 @@ internal partial class DB2iSeriesSqlBuilder : BasicSqlBuilder<DB2iSeriesOptions>
 		public DB2iSeriesSqlProviderFlags DB2iSeriesSqlProviderFlags { get; }
 
 		public override bool CteFirst => false;
+		protected override ConcatBuildStyle ConcatStyle => ConcatBuildStyle.Pipes;
 
 		public DB2iSeriesSqlBuilder(
 			DB2iSeriesDataProvider provider,

Source/ISeriesProvider/DB2iSeriesSqlBuilder.cs

@@ -14,6 +14,7 @@ public DB2iSeriesSqlExpressionConvertVisitor(bool allowModify) : base(allowModif
 		}
 
 		protected override bool SupportsNullInColumn => false;
+		protected override bool ConcatRequiresExplicitStringCast => false;
 
 		public override string[] LikeCharactersToEscape => DB2LikeCharactersToEscape;
 
@@ -37,7 +38,6 @@ public override IQueryElement ConvertSqlBinaryExpression(SqlBinaryExpression ele
 				case "&": return new SqlFunction(element.Type, "BitAnd", element.Expr1, element.Expr2);
 				case "|": return new SqlFunction(element.Type, "BitOr", element.Expr1, element.Expr2);
 				case "^": return new SqlFunction(element.Type, "BitXor", element.Expr1, element.Expr2);
-				case "+": return element.SystemType == typeof(string) ? new SqlBinaryExpression(element.SystemType, element.Expr1, "||", element.Expr2, element.Precedence) : element;
 			}
 
 			return base.ConvertSqlBinaryExpression(element);

Source/ISeriesProvider/DB2iSeriesSqlExpressionConvertVisitor.cs

@@ -2,26 +2,20 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
-using NUnit.Framework;
-
 namespace Shouldly
 {
 	public static class ShouldlyMissingExtensions
 	{
 		[MethodImpl(MethodImplOptions.NoInlining)]
 		public static void ShouldContain(this string actual, string expected, ITimesConstraint times)
 		{
-			if (times.Type == TimesType.Exactly)
-			{
-				Assert.That(CountInString(actual, expected), Is.EqualTo(times.Times));
-			}
-			else if (times.Type == TimesType.AtLeast)
-			{
-				Assert.That(CountInString(actual, expected), Is.GreaterThanOrEqualTo(times.Times));
-			}
-			else
+			var count = CountInString(actual, expected);
+
+			switch (times.Type)
 			{
-				Assert.Fail($"Unknown times constraint: {times.Type}");
+				case TimesType.Exactly: count.ShouldBe(times.Times);                   break;
+				case TimesType.AtLeast: count.ShouldBeGreaterThanOrEqualTo(times.Times); break;
+				default: throw new ShouldAssertException($"Unknown times constraint: {times.Type}");
 			}
 
 			static int CountInString(string str, string fragment)
@@ -41,7 +35,7 @@ static int CountInString(string str, string fragment)
 		public static void ShouldNotContainAny(this string actual, params string[] notFound)
 		{
 			foreach (var str in notFound)
-				Assert.That(actual, Does.Not.Contain(str));
+				actual.ShouldNotContain(str);
 		}
 
 		public static void ShouldAllSatisfy<T>(this IEnumerable<T> collection, Action<T> asserts)

Tests/Base/Asserts/ShouldlyMissingExtensions.cs

@@ -13,6 +13,7 @@ public sealed class AllJoinsSourceAttribute : IncludeDataSourcesAttribute
 				TestProvName.AllFirebird,
 				TestProvName.AllPostgreSQL,
 				TestProvName.AllClickHouse,
+				TestProvName.AllDuckDB,
 			}.SelectMany(_ => _.Split(',')).ToArray();
 
 		public AllJoinsSourceAttribute(params string[] excludedProviders)

Tests/Base/Attributes/FeatureSources/AllJoinsSourceAttribute.cs

@@ -21,6 +21,7 @@ public class CteContextSourceAttribute : IncludeDataSourcesAttribute
 				TestProvName.AllMySqlWithCTE,
 				TestProvName.AllInformix,
 				TestProvName.AllSapHana,
+				TestProvName.AllDuckDB,
 			}.SelectMany(_ => _.Split(',')).ToArray();
 
 		public CteContextSourceAttribute() : this(true)

Tests/Base/Attributes/FeatureSources/CteContextSourceAttribute.cs

@@ -11,6 +11,7 @@ public sealed class IdentityInsertMergeDataContextSourceAttribute : IncludeDataS
 				TestProvName.AllSybase,
 				TestProvName.AllSqlServer2008Plus,
 				TestProvName.AllPostgreSQL15Plus,
+				TestProvName.AllDuckDB,
 			}.SelectMany(_ => _.Split(',')).ToArray();
 
 		public IdentityInsertMergeDataContextSourceAttribute(params string[] except)