Skip to content

Commit

Permalink
Merge pull request #293 from FastReports/sync_branch_637569278257920978
Browse files Browse the repository at this point in the history
FastReport OpenSource 2021.3.0
  • Loading branch information
KirillKornienko authored May 18, 2021
2 parents 572a836 + 0fb5923 commit 418cb97
Show file tree
Hide file tree
Showing 136 changed files with 7,184 additions and 2,217 deletions.
2 changes: 1 addition & 1 deletion Demos/Reports/Dialog Events.frx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace FastReport
<DialogPage Name="Form1" Width="298" Height="190" AcceptButton="btnOk" CancelButton="btnCancel" Font="Tahoma, 8pt" LoadEvent="Form1_Load">
<ButtonControl Name="btnCancel" Left="205" Top="127" Anchor="Bottom, Right" Width="75" Height="23" Font="Tahoma, 8pt" TabIndex="0" Text="Cancel" DialogResult="Cancel"/>
<ButtonControl Name="btnOk" Left="122" Top="127" Anchor="Bottom, Right" Width="75" Height="23" Font="Tahoma, 8pt" TabIndex="1" Text="OK" DialogResult="OK"/>
<CheckBoxControl Name="CheckBox1" Left="12" Top="72" Width="262" Height="17" Font="Tahoma, 8pt" TabIndex="2" Text="Click this checkbox to enable/disable the TextBox" ClickEvent="" Checked="true" CheckState="Checked" CheckedChangedEvent="CheckBox1_CheckedChanged"/>
<CheckBoxControl Name="CheckBox1" Left="12" Top="72" Width="262" Height="17" Font="Tahoma, 8pt" TabIndex="2" Text="Click this checkbox to enable/disable the TextBox" ClickEvent="" AutoFilter="false" DetailControl="TextBox1" Checked="true" CheckState="Checked" CheckedChangedEvent="CheckBox1_CheckedChanged"/>
<TextBoxControl Name="TextBox1" Left="12" Top="92" Width="220" Height="20" Font="Tahoma, 8pt" TabIndex="3" Text="TextBox1"/>
<LabelControl Name="Label1" Left="8" Top="12" Width="272" Height="55" Font="Tahoma, 8pt" TabIndex="4" Text="Label" AutoSize="false"/>
</DialogPage>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ private void GetDBObjectNames(string name, List<string> list)
try
{
OpenConnection(connection);
schema = connection.GetSchema(name, new string[] { connection.Database });
if(name == "Tables")
schema = DescribeTables(connection, connection.Database);
else
schema = connection.GetSchema(name, new string[] { connection.Database });
}
finally
{
Expand All @@ -35,6 +38,22 @@ private void GetDBObjectNames(string name, List<string> list)
list.Add(row["name"].ToString());
}
}

private static DataTable DescribeTables(DbConnection connection, string database)
{
var command = connection.CreateCommand();
var query = new StringBuilder("show tables in ");
query.Append(database);
command.CommandText = query.ToString();
DataTable result = new DataTable();
using (var adapter = new ClickHouseDataAdapter())
{
adapter.SelectCommand = command;
adapter.Fill(result);
}
return result;
}

public override string QuoteIdentifier(string value, DbConnection connection)
{
return "\"" + value + "\"";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@

<ItemGroup>
<PackageReference Include="ClickHouse.Client" Version="2.3.0.326" />
<!--<ProjectReference Include="..\ClickHouse.Client\ClickHouse.Client.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>-->
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\..\FastReport.Core\FastReport.Core.csproj"/>
<ProjectReference Include="..\..\..\..\FastReport.Core\FastReport.Core.csproj"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net472'">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.ClickHouse</Product>
<Description>Represents a connection to ClickHouse database for FastReport .NET</Description>
<PackageId>FastReport.CoreWin.Data.ClickHouse</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, ClickHouse, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.ClickHouse</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClickHouse.Client" Version="3.0.0.357" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core3\FastReport\FastReport.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@

<ItemGroup>
<PackageReference Include="ClickHouse.Client" Version="2.3.0.326" />
<!--<ProjectReference Include="..\ClickHouse.Client\ClickHouse.Client.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>-->
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\..\FastReport\FastReport.csproj">
<ProjectReference Include="..\..\..\..\FastReport\FastReport.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.ClickHouse</Product>
<Description>Represents a connection to ClickHouse database for FastReport .NET</Description>
<PackageId>FastReport.Core.Data.ClickHouse</PackageId>
<PackageId>FastReport.OpenSource.Data.ClickHouse</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, ClickHouse, connection, reports</PackageTags>
<Version>1.0.0</Version>
Expand All @@ -21,13 +21,10 @@

<ItemGroup>
<PackageReference Include="ClickHouse.Client" Version="2.3.0.326" />
<!--<ProjectReference Include="..\ClickHouse.Client\ClickHouse.Client.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>-->
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
<ProjectReference Include="..\..\..\..\FastReport.OpenSource\FastReport.OpenSource.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net472'">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Couchbase</Product>
<Description>Represents a connection to Couchbase server for FastReport.Net.</Description>
<PackageId>FastReport.CoreWin.Data.Couchbase</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, Couchbase, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Couchbase</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes></PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core3\FastReport\FastReport.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
<ProjectReference Include="..\FastReport.Data.Json\FastReport.CoreWin.Data.Json.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="2.7.15" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Firebird</Product>
<Description>Represents a connection to Firebird data for FastReport.Net.</Description>
<PackageId>FastReport.CoreWin.Data.Firebird</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, Firebird, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Firebird</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes>Initial release</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup >
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core3\FastReport\FastReport.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.6.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net4;net45;net47</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net4;net45</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.Json</Product>
<Description>Represents a connection to Json data for FastReport.Net.</Description>
<PackageId>FastReport.CoreWin.Data.Json</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, Json, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.Json</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="[11.0.2,)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core3\FastReport\FastReport.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net4;net45;net47</TargetFrameworks>
<TargetFrameworks>net4;net45</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.MongoDB</Product>
<Description>Represents a connection to MongoDB database for FastReport.Net.</Description>
<PackageId>FastReport.CoreWin.Data.MongoDB</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, MongoDB, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.MongoDB</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MongoDB.Bson" Version="[2.11.0,)" />
<PackageReference Include="MongoDB.Driver" Version="[2.11.0,)" />
<PackageReference Include="MongoDB.Driver.Core" Version="[2.11.0,)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core3\FastReport\FastReport.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net4.5;net4.5.2</TargetFrameworks>
<TargetFrameworks>net45;net452</TargetFrameworks>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down Expand Up @@ -45,12 +45,12 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net4.5'">
<ItemGroup Condition="'$(TargetFramework)'=='net45'">
<PackageReference Include="MongoDB.Bson" Version="2.7.3" />
<PackageReference Include="MongoDB.Driver" Version="2.7.3" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.7.3" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net4.5.2'">
<ItemGroup Condition="'$(TargetFramework)'=='net452'">
<PackageReference Include="MongoDB.Bson" Version="[2.11.0,)" />
<PackageReference Include="MongoDB.Driver" Version="[2.11.0,)" />
<PackageReference Include="MongoDB.Driver.Core" Version="[2.11.0,)" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.MySql</Product>
<Description>Represents a connection to My SQL database for FastReport.Net.</Description>
<PackageId>FastReport.CoreWin.Data.MySql</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, mysql, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.MySql</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes></PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MySql.Data" Version="[8.0.12,)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core3\FastReport\FastReport.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../../FastReport.Plugins.snk</AssemblyOriginatorKeyFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Copyright>Fast Reports Inc.</Copyright>
<Company>Fast Reports Inc.</Company>
<PackageLicenseUrl>https://www.fast-report.com/en/product/fast-report-net/license</PackageLicenseUrl>
<PackageProjectUrl>https://www.fast-report.com/en/product/fast-report-net</PackageProjectUrl>
<Authors>Fast Reports Inc.</Authors>
<Product>FastReport.Data.OracleODPCore</Product>
<Description>Represents a connection to Oracle database for FastReport.Net.</Description>
<PackageId>FastReport.CoreWin.Data.OracleODPCore</PackageId>
<PackageIconUrl>https://www.fast-report.com/download/images/frlogo-big.png</PackageIconUrl>
<PackageTags>reporting, oracle, core, connection, reports</PackageTags>
<Version>1.0.0</Version>
<Configurations>Debug;Release;</Configurations>
<AssemblyName>FastReport.Data.OracleODPCore</AssemblyName>
<RootNamespace>FastReport.Data</RootNamespace>
<PackageReleaseNotes></PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>FRCORE;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FastReport.Core3\FastReport\FastReport.csproj">
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
</ItemGroup>
</Project>
Loading

0 comments on commit 418cb97

Please sign in to comment.