Merge pull request #762 from FastReports/sync_branch_2025.2.7

FastReport.OpenSource 2025.2.7

Author: 0legK

Demos/OpenSource/SPA/FastReport.Core.React/ClientApp/package.json

@@ -4,7 +4,7 @@
  "private": true,
  "dependencies": {
  "bootstrap": "^5.1.0",
- "http-proxy-middleware": "^0.19.1",
+ "http-proxy-middleware": "^2.0.7",
  "jquery": "^3.5.1",
  "merge": "^2.1.1",
  "oidc-client": "^1.11.5",

Extras/Core/FastReport.Data/FastReport.Data.Cassandra/CassandraDataConnection.cs

@@ -5,8 +5,8 @@
 using System.Linq;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using Cassandra;
-using Cassandra.Mapping;
 
 namespace FastReport.Data.Cassandra
 {
@@ -22,6 +22,11 @@ public override string[] GetTableNames()
  return (string[])cluster.Metadata.GetTables(keyspace);
  }
 
+ public override Task<string[]> GetTableNamesAsync(CancellationToken cancellationToken = default)
+ {
+ return Task.FromResult(GetTableNames());
+ }
+
  /// <inheritdoc/>
  public override string QuoteIdentifier(string value, DbConnection connection)
  {
@@ -36,6 +41,13 @@ public override void CreateAllTables(bool initSchema)
  base.CreateAllTables(initSchema);
  }
 
+ public override async Task CreateAllTablesAsync(bool initSchema, CancellationToken cancellationToken = default)
+ {
+ if (session == null)
+ await InitConnectionAsync();
+ await base.CreateAllTablesAsync(initSchema, cancellationToken);
+ }
+
  /// <inheritdoc/>
  public override void CreateTable(TableDataSource source)
  {
@@ -45,6 +57,14 @@ public override void CreateTable(TableDataSource source)
  base.CreateTable(source);
  }
 
+ public override async Task CreateTableAsync(TableDataSource source, CancellationToken cancellationToken = default)
+ {
+ if (session == null)
+ await InitConnectionAsync();
+
+ await base.CreateTableAsync(source, cancellationToken);
+ }
+
  /// <inheritdoc/>
  public override void FillTableSchema(DataTable table, string selectCommand, CommandParameterCollection parameters)
  {
@@ -54,6 +74,12 @@ public override void FillTableSchema(DataTable table, string selectCommand, Comm
  }
  }
 
+ public override Task FillTableSchemaAsync(DataTable table, string selectCommand, CommandParameterCollection parameters, CancellationToken cancellationToken)
+ {
+ FillTableSchema(table, selectCommand, parameters);
+ return Task.CompletedTask;
+ }
+
  /// <inheritdoc/>
  public override void FillTableData(DataTable table, string selectCommand, CommandParameterCollection parameters)
  {
@@ -65,17 +91,35 @@ public override void FillTableData(DataTable table, string selectCommand, Comman
  }
  }
 
+ public override Task FillTableDataAsync(DataTable table, string selectCommand, CommandParameterCollection parameters, CancellationToken cancellationToken = default)
+ {
+ FillTableData(table, selectCommand, parameters);
+ return Task.CompletedTask;
+ }
+
  public CassandraDataConnection()
  {
  IsSqlBased = false;
  }
 
  private void InitConnection()
+ {
+ InitConnectionShared();
+ session = cluster.Connect(keyspace);
+ }
+
+ private async Task InitConnectionAsync()
+ {
+ InitConnectionShared();
+ session = await cluster.ConnectAsync(keyspace);
+ }
+
+ private void InitConnectionShared()
  {
  CassandraConnectionStringBuilder connStrBuilder = new CassandraConnectionStringBuilder(ConnectionString);
  Builder clusterBuilder = Cluster.Builder();
 
- if (connStrBuilder.Username != null && connStrBuilder.Username != "" 
+ if (connStrBuilder.Username != null && connStrBuilder.Username != ""
  && connStrBuilder.Password != "" && connStrBuilder.Password != null)
  clusterBuilder.WithCredentials(connStrBuilder.Username, connStrBuilder.Password);
 
@@ -86,7 +130,6 @@ private void InitConnection()
 
  keyspace = connStrBuilder.DefaultKeyspace;
  cluster = clusterBuilder.Build();
- session = cluster.Connect(keyspace);
  }
  }
 }

Extras/Core/FastReport.Data/FastReport.Data.ClickHouse/ClickHouseDataConnection.cs

@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Net;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace FastReport.ClickHouse
@@ -40,6 +41,28 @@ private void GetDBObjectNames(string name, List<string> list)
  }
  }
 
+ private async Task GetDBObjectNamesAsync(string name, List<string> list, CancellationToken cancellationToken)
+ {
+ DataTable schema = null;
+ DbConnection connection = GetConnection();
+ try
+ {
+ await OpenConnectionAsync(connection, cancellationToken);
+ if (name == "Tables")
+ schema = DescribeTables(connection, connection.Database);
+ else
+ schema = await connection.GetSchemaAsync(name, new string[] { connection.Database }, cancellationToken);
+ }
+ finally
+ {
+ await DisposeConnectionAsync(connection);
+ }
+ foreach (DataRow row in schema.Rows)
+ {
+ list.Add(row["name"].ToString());
+ }
+ }
+
  private static DataTable DescribeTables(DbConnection connection, string database)
  {
  var command = connection.CreateCommand();
@@ -70,6 +93,13 @@ public override string[] GetTableNames()
  return list.ToArray();
  }
 
+ public override async Task<string[]> GetTableNamesAsync(CancellationToken cancellationToken = default)
+ {
+ List<string> list = new List<string>();
+ await GetDBObjectNamesAsync("Tables", list, cancellationToken);
+ return list.ToArray();
+ }
+
  public override DbDataAdapter GetAdapter(string selectCommand, DbConnection connection, CommandParameterCollection parameters)
  {
  ClickHouseDataAdapter clickHouseDataAdapter = new ClickHouseDataAdapter();
@@ -94,7 +124,7 @@ private string PrepareSelectCommand(string selectCommand, string tableName, DbCo
  return selectCommand;
  }
 
- private IEnumerable<DataColumn> GetColumns(ClickHouseDataReader reader)
+ private static IEnumerable<DataColumn> GetColumns(ClickHouseDataReader reader)
  {
  for (int i = 0; i < reader.FieldCount; i++)
  {
@@ -112,29 +142,7 @@ public override void FillTableSchema(DataTable table, string selectCommand, Comm
  {
  OpenConnection(clickHouseConnection);
 
- selectCommand = PrepareSelectCommand(selectCommand, table.TableName, clickHouseConnection);
- /*To reduce size of traffic and size of answer from ClickHouse server.
- Because FillSchema doesn't work in this ADO.NET library.
- LIMIT 0 gets an empty set, but we still have list of desired columns
- Probably can be a better way.
- */
- selectCommand += " LIMIT 0"; 
- ClickHouseCommand clickHouseCommand = clickHouseConnection.CreateCommand();
-
- foreach (CommandParameter p in parameters)
- {
- selectCommand = selectCommand.Replace($"@{p.Name}", $"{{{p.Name}:{(ClickHouseTypeCode)p.DataType}}}");
- if (p.Value is Variant value)
- {
- if (value.Type == typeof(string))
- clickHouseCommand.AddParameter(p.Name, ((ClickHouseTypeCode)p.DataType).ToString(), VariantToClrType(value, (ClickHouseTypeCode)p.DataType)); 
- else
- clickHouseCommand.AddParameter(p.Name, ((ClickHouseTypeCode)p.DataType).ToString(), value.ToType(value.Type));
- }
- else
- clickHouseCommand.AddParameter(p.Name, ((ClickHouseTypeCode)p.DataType).ToString(), p.Value);
- }
- clickHouseCommand.CommandText = selectCommand;
+ var clickHouseCommand = FillTableSchemaShared(table, selectCommand, parameters, clickHouseConnection);
  using (ClickHouseDataReader reader = clickHouseCommand.ExecuteReader() as ClickHouseDataReader)
  {
  var clms = GetColumns(reader);
@@ -147,7 +155,57 @@ Probably can be a better way.
  }
  }
 
- private object VariantToClrType(Variant value, ClickHouseTypeCode type)
+ public override async Task FillTableSchemaAsync(DataTable table, string selectCommand, CommandParameterCollection parameters,
+ CancellationToken cancellationToken = default)
+ {
+ ClickHouseConnection clickHouseConnection = GetConnection() as ClickHouseConnection;
+
+ try
+ {
+ await OpenConnectionAsync(clickHouseConnection, cancellationToken);
+
+ var clickHouseCommand = FillTableSchemaShared(table, selectCommand, parameters, clickHouseConnection);
+ using (ClickHouseDataReader reader = await clickHouseCommand.ExecuteReaderAsync(cancellationToken) as ClickHouseDataReader)
+ {
+ var clms = GetColumns(reader);
+ table.Columns.AddRange(clms.ToArray());
+ }
+ }
+ finally
+ {
+ await DisposeConnectionAsync(clickHouseConnection);
+ }
+ }
+
+ private ClickHouseCommand FillTableSchemaShared(DataTable table, string selectCommand, CommandParameterCollection parameters, ClickHouseConnection clickHouseConnection)
+ {
+ selectCommand = PrepareSelectCommand(selectCommand, table.TableName, clickHouseConnection);
+ /*To reduce size of traffic and size of answer from ClickHouse server.
+ Because FillSchema doesn't work in this ADO.NET library.
+ LIMIT 0 gets an empty set, but we still have list of desired columns
+ Probably can be a better way.
+ */
+ selectCommand += " LIMIT 0";
+ ClickHouseCommand clickHouseCommand = clickHouseConnection.CreateCommand();
+
+ foreach (CommandParameter p in parameters)
+ {
+ selectCommand = selectCommand.Replace($"@{p.Name}", $"{{{p.Name}:{(ClickHouseTypeCode)p.DataType}}}");
+ if (p.Value is Variant value)
+ {
+ if (value.Type == typeof(string))
+ clickHouseCommand.AddParameter(p.Name, ((ClickHouseTypeCode)p.DataType).ToString(), VariantToClrType(value, (ClickHouseTypeCode)p.DataType));
+ else
+ clickHouseCommand.AddParameter(p.Name, ((ClickHouseTypeCode)p.DataType).ToString(), value.ToType(value.Type));
+ }
+ else
+ clickHouseCommand.AddParameter(p.Name, ((ClickHouseTypeCode)p.DataType).ToString(), p.Value);
+ }
+ clickHouseCommand.CommandText = selectCommand;
+ return clickHouseCommand;
+ }
+
+ private static object VariantToClrType(Variant value, ClickHouseTypeCode type)
  {
  if (value.ToString() == "" && type != ClickHouseTypeCode.Nothing)
  return null;
@@ -157,88 +215,74 @@ private object VariantToClrType(Variant value, ClickHouseTypeCode type)
  case ClickHouseTypeCode.Enum8:
  case ClickHouseTypeCode.Int8:
  {
- sbyte val = 0;
- sbyte.TryParse(value.ToString(), out val);
+ sbyte.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.Enum16:
  case ClickHouseTypeCode.Int16:
  {
- short val = 0;
- short.TryParse(value.ToString(), out val);
+ short.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.Int32:
  {
- int val = 0;
- int.TryParse(value.ToString(), out val);
+ int.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.Int64:
  {
- long val = 0;
- long.TryParse(value.ToString(), out val);
+ long.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.UInt8:
  {
- byte val = 0;
- byte.TryParse(value.ToString(), out val);
+ byte.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.UInt16:
  {
- ushort val = 0;
- ushort.TryParse(value.ToString(), out val);
+ ushort.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.UInt32:
  {
- uint val = 0;
- uint.TryParse(value.ToString(), out val);
+ uint.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.UInt64:
  {
- ulong val = 0;
- ulong.TryParse(value.ToString(), out val);
+ ulong.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.Date:
  {
- DateTime val = DateTime.Now;
- DateTime.TryParse(value.ToString(), out val);
+ DateTime.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.DateTime:
  case ClickHouseTypeCode.DateTime64:
  {
- DateTimeOffset val = DateTimeOffset.Now;
- DateTimeOffset.TryParse(value.ToString(), out val);
+ DateTimeOffset.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.Decimal:
  {
- decimal val = 0;
- decimal.TryParse(value.ToString(), out val);
+ decimal.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.Float32:
  {
- float val = 0;
- float.TryParse(value.ToString(), out val);
+ float.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.Float64:
  {
- double val = 0;
- double.TryParse(value.ToString(), out val);
+ double.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.UUID:
  {
- Guid val = Guid.Empty;
- Guid.TryParse(value.ToString(), out val);
+ Guid.TryParse(value.ToString(), out var val);
  return val;
  }
  case ClickHouseTypeCode.IPv6: