diff --git a/ClickHouse.Driver/PublicAPI/PublicAPI.Shipped.txt b/ClickHouse.Driver/PublicAPI/PublicAPI.Shipped.txt index 5522f35..25a0c2d 100644 --- a/ClickHouse.Driver/PublicAPI/PublicAPI.Shipped.txt +++ b/ClickHouse.Driver/PublicAPI/PublicAPI.Shipped.txt @@ -185,11 +185,8 @@ ClickHouse.Driver.Utility.CompressedContent ClickHouse.Driver.Utility.CompressedContent.CompressedContent(System.Net.Http.HttpContent content, System.Net.DecompressionMethods compressionMethod) -> void ClickHouse.Driver.Utility.ConnectionExtensions ClickHouse.Driver.Utility.DataReaderExtensions -ClickHouse.Driver.Utility.DictionaryExtensions -ClickHouse.Driver.Utility.EnumerableExtensions ClickHouse.Driver.Utility.MathUtils ClickHouse.Driver.Utility.NameValueCollectionExtensions -ClickHouse.Driver.Utility.StringExtensions override ClickHouse.Driver.ADO.ClickHouseCommand.Cancel() -> void override ClickHouse.Driver.ADO.ClickHouseCommand.CommandText.get -> string override ClickHouse.Driver.ADO.ClickHouseCommand.CommandText.set -> void @@ -324,8 +321,6 @@ static ClickHouse.Driver.Numerics.ClickHouseDecimal.operator <=(ClickHouse.Drive static ClickHouse.Driver.Numerics.ClickHouseDecimal.operator ==(ClickHouse.Driver.Numerics.ClickHouseDecimal left, ClickHouse.Driver.Numerics.ClickHouseDecimal right) -> bool static ClickHouse.Driver.Numerics.ClickHouseDecimal.operator >(ClickHouse.Driver.Numerics.ClickHouseDecimal left, ClickHouse.Driver.Numerics.ClickHouseDecimal right) -> bool static ClickHouse.Driver.Numerics.ClickHouseDecimal.operator >=(ClickHouse.Driver.Numerics.ClickHouseDecimal left, ClickHouse.Driver.Numerics.ClickHouseDecimal right) -> bool -static ClickHouse.Driver.Types.DateTimeConversions.FromUnixTimeDays(int days) -> System.DateTime -static ClickHouse.Driver.Types.DateTimeConversions.ToUnixTimeDays(this System.DateTimeOffset dto) -> int static ClickHouse.Driver.Types.Grammar.Parser.Parse(string input) -> ClickHouse.Driver.Types.Grammar.SyntaxTreeNode static ClickHouse.Driver.Types.Grammar.Tokenizer.GetTokens(string input) -> System.Collections.Generic.IEnumerable static ClickHouse.Driver.Utility.CommandExtensions.AddParameter(this ClickHouse.Driver.ADO.ClickHouseCommand command, string parameterName, object parameterValue) -> ClickHouse.Driver.ADO.Parameters.ClickHouseDbParameter @@ -335,24 +330,12 @@ static ClickHouse.Driver.Utility.ConnectionExtensions.ExecuteReaderAsync(this Sy static ClickHouse.Driver.Utility.ConnectionExtensions.ExecuteScalarAsync(this System.Data.Common.DbConnection connection, string sql) -> System.Threading.Tasks.Task static ClickHouse.Driver.Utility.ConnectionExtensions.ExecuteStatementAsync(this System.Data.Common.DbConnection connection, string sql) -> System.Threading.Tasks.Task static ClickHouse.Driver.Utility.DataReaderExtensions.GetColumnNames(this System.Data.IDataReader reader) -> string[] -static ClickHouse.Driver.Utility.DictionaryExtensions.Set(this System.Collections.Generic.IDictionary dictionary, TKey key, TValue value) -> void -static ClickHouse.Driver.Utility.DictionaryExtensions.TryAdd(this System.Collections.Generic.IDictionary dictionary, TKey key, TValue value) -> bool -static ClickHouse.Driver.Utility.EnumerableExtensions.BatchRented(this System.Collections.Generic.IEnumerable enumerable, int batchSize) -> System.Collections.Generic.IEnumerable<(T[], int)> -static ClickHouse.Driver.Utility.EnumerableExtensions.Deconstruct(this System.Collections.Generic.IList list, out T first, out T second) -> void -static ClickHouse.Driver.Utility.EnumerableExtensions.Deconstruct(this System.Collections.Generic.IList list, out T first, out T second, out T third) -> void static ClickHouse.Driver.Utility.MathUtils.ShiftDecimalPlaces(long value, int places) -> long static ClickHouse.Driver.Utility.MathUtils.ToPower(int value, int power) -> long -static ClickHouse.Driver.Utility.StringExtensions.EncloseColumnName(this string str) -> string -static ClickHouse.Driver.Utility.StringExtensions.Escape(this string str) -> string -static ClickHouse.Driver.Utility.StringExtensions.QuoteDouble(this string str) -> string -static ClickHouse.Driver.Utility.StringExtensions.QuoteSingle(this string str) -> string -static ClickHouse.Driver.Utility.StringExtensions.ReplaceMultipleWords(this string input, System.Collections.Generic.Dictionary replacements) -> string -static ClickHouse.Driver.Utility.StringExtensions.ToSnakeCase(this string str) -> string static readonly ClickHouse.Driver.Constraints.DBDefault.Value -> ClickHouse.Driver.Constraints.DBDefault -static readonly ClickHouse.Driver.Types.DateTimeConversions.DateTimeEpochStart -> System.DateTime virtual ClickHouse.Driver.ADO.ClickHouseConnection.SupportedFeatures.get -> ClickHouse.Driver.ADO.Feature virtual ClickHouse.Driver.ADO.Readers.ClickHouseDataReader.GetDateTimeOffset(int ordinal) -> System.DateTimeOffset -ClickHouse.Driver.ADO.Adapters.ClickHouseDataAdapter +ClickHouse.Driver.ADO.Adapters.ClickHouseDataAdapter ClickHouse.Driver.Copy.ClickHouseBulkCopy.BatchSent -> System.EventHandler ClickHouse.Driver.Copy.ClickHouseBulkCopy.BatchSentEventArgs ClickHouse.Driver.Copy.ClickHouseBulkCopy.BatchSentEventArgs.BatchSentEventArgs(long rowsWritten) -> void diff --git a/ClickHouse.Driver/PublicAPI/PublicAPI.Unshipped.txt b/ClickHouse.Driver/PublicAPI/PublicAPI.Unshipped.txt index 9d1ac01..1fe7756 100644 --- a/ClickHouse.Driver/PublicAPI/PublicAPI.Unshipped.txt +++ b/ClickHouse.Driver/PublicAPI/PublicAPI.Unshipped.txt @@ -1,9 +1,3 @@ -<<<<<<< Updated upstream -static ClickHouse.Driver.Utility.DictionaryExtensions.SetOrRemove(this System.Collections.Generic.IDictionary dictionary, string key, string value) -> void -ClickHouse.Driver.ADO.Feature.Json = 65536 -> ClickHouse.Driver.ADO.Feature -======= -ClickHouse.Driver.ADO.Feature.Json = 65536 -> ClickHouse.Driver.ADO.Feature ->>>>>>> Stashed changes static Microsoft.Extensions.DependencyInjection.ClickHouseServiceCollectionExtensions.AddClickHouseDataSource(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string connectionString, System.Net.Http.IHttpClientFactory httpClientFactory, string httpClientName = "", Microsoft.Extensions.DependencyInjection.ServiceLifetime connectionLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Transient, Microsoft.Extensions.DependencyInjection.ServiceLifetime dataSourceLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Singleton, object serviceKey = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection static Microsoft.Extensions.DependencyInjection.ClickHouseServiceCollectionExtensions.AddClickHouseDataSource(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string connectionString, System.Net.Http.HttpClient httpClient = null, Microsoft.Extensions.DependencyInjection.ServiceLifetime connectionLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Transient, Microsoft.Extensions.DependencyInjection.ServiceLifetime dataSourceLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Singleton, object serviceKey = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection static Microsoft.Extensions.DependencyInjection.ClickHouseServiceCollectionExtensions.AddClickHouseDataSource(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Func dataSourceFactory, Microsoft.Extensions.DependencyInjection.ServiceLifetime connectionLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Transient, Microsoft.Extensions.DependencyInjection.ServiceLifetime dataSourceLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Singleton, object serviceKey = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection @@ -16,6 +10,5 @@ ClickHouse.Driver.Types.Grammar.SyntaxTreeNode.SingleChild.get -> ClickHouse.Dri ClickHouse.Driver.Types.Grammar.SyntaxTreeNode.ChildNodes.get -> System.Collections.Generic.IList ClickHouse.Driver.Types.Grammar.SyntaxTreeNode ClickHouse.Driver.Types.Grammar.Parser -ClickHouse.Driver.Types.DateTimeConversions ClickHouse.Driver.ADO.ClickHouseConnection.PostStreamAsync(string sql, System.IO.Stream data, bool isCompressed, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task ClickHouse.Driver.ADO.ClickHouseConnection.PostStreamAsync(string sql, System.Func callback, bool isCompressed, System.Threading.CancellationToken token) -> System.Threading.Tasks.Task diff --git a/ClickHouse.Driver/PublicAPI/net8.0/PublicAPI.Shipped.txt b/ClickHouse.Driver/PublicAPI/net8.0/PublicAPI.Shipped.txt index 9462e1e..a36e88a 100644 --- a/ClickHouse.Driver/PublicAPI/net8.0/PublicAPI.Shipped.txt +++ b/ClickHouse.Driver/PublicAPI/net8.0/PublicAPI.Shipped.txt @@ -14,7 +14,6 @@ ClickHouse.Driver.IClickHouseDataSource.OpenConnection() -> ClickHouse.Driver.IC ClickHouse.Driver.IClickHouseDataSource.OpenConnectionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task override ClickHouse.Driver.ADO.ClickHouseConnectionFactory.CreateDataSource(string connectionString) -> System.Data.Common.DbDataSource override ClickHouse.Driver.ADO.ClickHouseDataSource.ConnectionString.get -> string -static readonly ClickHouse.Driver.Types.DateTimeConversions.DateOnlyEpochStart -> System.DateOnly static Microsoft.Extensions.DependencyInjection.ClickHouseServiceCollectionExtensions.AddClickHouseDataSource(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string connectionString, System.Net.Http.IHttpClientFactory httpClientFactory, string httpClientName = "", Microsoft.Extensions.DependencyInjection.ServiceLifetime connectionLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Transient, Microsoft.Extensions.DependencyInjection.ServiceLifetime dataSourceLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Singleton, object serviceKey = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection static Microsoft.Extensions.DependencyInjection.ClickHouseServiceCollectionExtensions.AddClickHouseDataSource(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, string connectionString, System.Net.Http.HttpClient httpClient = null, Microsoft.Extensions.DependencyInjection.ServiceLifetime connectionLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Transient, Microsoft.Extensions.DependencyInjection.ServiceLifetime dataSourceLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Singleton, object serviceKey = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection static Microsoft.Extensions.DependencyInjection.ClickHouseServiceCollectionExtensions.AddClickHouseDataSource(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Func dataSourceFactory, Microsoft.Extensions.DependencyInjection.ServiceLifetime connectionLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Transient, Microsoft.Extensions.DependencyInjection.ServiceLifetime dataSourceLifetime = Microsoft.Extensions.DependencyInjection.ServiceLifetime.Singleton, object serviceKey = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection diff --git a/ClickHouse.Driver/Types/AbstractDateTimeType.cs b/ClickHouse.Driver/Types/AbstractDateTimeType.cs index a219f85..d73dda4 100644 --- a/ClickHouse.Driver/Types/AbstractDateTimeType.cs +++ b/ClickHouse.Driver/Types/AbstractDateTimeType.cs @@ -3,7 +3,7 @@ namespace ClickHouse.Driver.Types; -public static class DateTimeConversions +internal static class DateTimeConversions { public static readonly DateTime DateTimeEpochStart = DateTimeOffset.FromUnixTimeSeconds(0).UtcDateTime; diff --git a/ClickHouse.Driver/Utility/DictionaryExtensions.cs b/ClickHouse.Driver/Utility/DictionaryExtensions.cs index 49c68c9..8e31db3 100644 --- a/ClickHouse.Driver/Utility/DictionaryExtensions.cs +++ b/ClickHouse.Driver/Utility/DictionaryExtensions.cs @@ -3,7 +3,7 @@ namespace ClickHouse.Driver.Utility; -public static class DictionaryExtensions +internal static class DictionaryExtensions { public static bool TryAdd(this IDictionary dictionary, TKey key, TValue value) { diff --git a/ClickHouse.Driver/Utility/EnumerableExtensions.cs b/ClickHouse.Driver/Utility/EnumerableExtensions.cs index 1136acd..f3ba0b2 100644 --- a/ClickHouse.Driver/Utility/EnumerableExtensions.cs +++ b/ClickHouse.Driver/Utility/EnumerableExtensions.cs @@ -4,7 +4,7 @@ namespace ClickHouse.Driver.Utility; -public static class EnumerableExtensions +internal static class EnumerableExtensions { public static void Deconstruct(this IList list, out T first, out T second) { diff --git a/ClickHouse.Driver/Utility/StringExtensions.cs b/ClickHouse.Driver/Utility/StringExtensions.cs index 173f8a5..3c60bcd 100644 --- a/ClickHouse.Driver/Utility/StringExtensions.cs +++ b/ClickHouse.Driver/Utility/StringExtensions.cs @@ -6,7 +6,7 @@ namespace ClickHouse.Driver.Utility; -public static class StringExtensions +internal static class StringExtensions { public static string Escape(this string str) => str.Replace("\\", "\\\\").Replace("\'", "\\\'").Replace("\n", "\\n").Replace("\t", "\\t");