Skip to content

Commit 237b3fb

Browse files
adriancs2adriancs2
committed
v2.3.6
[New] ExportInfo.InsertLineBreakBetweenInserts = false [Fix Bug] MySql Data type, while "default value" = current_timestamp, is skipped and not exported into dump.
1 parent d44b596 commit 237b3fb

32 files changed

+171
-71
lines changed

‎source code/MySqlBackup(Devart-Express)/InfoObjects/ExportInformations.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,11 @@ public Dictionary<string, string> TablesToBeExportedDic
262262
/// </summary>
263263
public bool EnableComment = true;
264264

265+
/// <summary>
266+
/// Gets or Sets a value indicates whether line breaks should be added in between multiple INSERTs.
267+
/// </summary>
268+
public bool InsertLineBreakBetweenInserts = false;
269+
265270
public ExportInformations()
266271
{
267272

‎source code/MySqlBackup(Devart-Express)/MySqlBackup(Devart-Express).csproj‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;NET48;NET472;NET471;NET47;NET462;NET461;NET452</TargetFrameworks>
4+
<TargetFrameworks>NET48;NET472;NET461;NET452;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;net5.0</TargetFrameworks>
55
<RootNamespace>Devart.Data.MySql</RootNamespace>
66
<AssemblyName>MySqlBackupNet.DevartExpress</AssemblyName>
77
<ApplicationIcon>logo.ico</ApplicationIcon>
88
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
99
<PackageId>MySqlBackup.Net.DevartExpress</PackageId>
10-
<Version>2.3.5</Version>
10+
<Version>2.3.6</Version>
1111
<Authors>adriancs</Authors>
1212
<Company>MySqlBackup.NET</Company>
1313
<Product>MySqlBackup.NET.DevartExpress</Product>
@@ -17,9 +17,10 @@
1717
<PackageIcon>logo128.png</PackageIcon>
1818
<RepositoryUrl>https://github.com/MySqlBackupNET/MySqlBackup.Net.git</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
20-
<PackageTags>mysqlbackup;devart</PackageTags>
21-
<FileVersion>2.3.5</FileVersion>
22-
<AssemblyVersion>2.3.5</AssemblyVersion>
20+
<PackageTags>mysqlbackup;devart;mysql</PackageTags>
21+
<FileVersion>2.3.6</FileVersion>
22+
<AssemblyVersion>2.3.6</AssemblyVersion>
23+
<PackageReadmeFile>README.md</PackageReadmeFile>
2324
</PropertyGroup>
2425

2526
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
@@ -95,10 +96,14 @@
9596
<Pack>True</Pack>
9697
<PackagePath></PackagePath>
9798
</None>
99+
<None Include="bin\Release\README.md">
100+
<Pack>True</Pack>
101+
<PackagePath></PackagePath>
102+
</None>
98103
</ItemGroup>
99104

100105
<ItemGroup>
101-
<PackageReference Include="dotConnect.Express.for.MySQL" Version="8.19.1944" />
106+
<PackageReference Include="dotConnect.Express.for.MySQL" Version="8.19.1985" />
102107
</ItemGroup>
103108

104109
<ItemGroup>

‎source code/MySqlBackup(Devart-Express)/MySqlBackup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public enum ProcessEndType
2727
Error
2828
}
2929

30-
public const string Version = "2.3.5";
30+
public const string Version = "2.3.6";
3131

3232
MySqlDatabase _database = new MySqlDatabase();
3333
MySqlServer _server = new MySqlServer();

‎source code/MySqlBackup(Devart-Express)/MySqlObjects/MySqlColumn.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public MySqlColumn(string name, Type type, string mySqlDataType,
8080
}
8181
}
8282

83-
if (_extra.ToLower().Contains("generated"))
83+
if (_extra.ToUpper() == "VIRTUAL GENERATED" || _extra.ToUpper()== "STORED GENERATED")
8484
{
8585
_isGeneratedColumn = true;
8686
}

‎source code/MySqlBackup(MySql.Data)/InfoObjects/ExportInformations.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,11 @@ public Dictionary<string, string> TablesToBeExportedDic
262262
/// </summary>
263263
public bool EnableComment = true;
264264

265+
/// <summary>
266+
/// Gets or Sets a value indicates whether line breaks should be added in between multiple INSERTs.
267+
/// </summary>
268+
public bool InsertLineBreakBetweenInserts = false;
269+
265270
public ExportInformations()
266271
{
267272

‎source code/MySqlBackup(MySql.Data)/MySqlBackup(MySql.Data).csproj‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;NET48;NET472;NET471;NET47;NET462;NET461;NET452</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;NET48;NET472;NET461;NET452</TargetFrameworks>
55
<RootNamespace>MySql.Data.Client</RootNamespace>
66
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
77
<Nullable>disable</Nullable>
88
<PackageId>MySqlBackup.NET</PackageId>
9-
<Version>2.3.5.2</Version>
9+
<Version>2.3.6</Version>
1010
<Authors>adriancs</Authors>
1111
<Company>MySqlBackup.NET</Company>
1212
<Product>MySqlBackup.NET</Product>
@@ -16,11 +16,12 @@
1616
<PackageIcon>logo128.png</PackageIcon>
1717
<RepositoryType>git</RepositoryType>
1818
<RepositoryUrl>https://github.com/MySqlBackupNET/MySqlBackup.Net</RepositoryUrl>
19-
<AssemblyVersion>2.3.5.2</AssemblyVersion>
20-
<FileVersion>2.3.5.2</FileVersion>
19+
<AssemblyVersion>2.3.6</AssemblyVersion>
20+
<FileVersion>2.3.6</FileVersion>
2121
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
2222
<AssemblyName>MySqlBackup</AssemblyName>
2323
<ApplicationIcon>logo.ico</ApplicationIcon>
24+
<PackageReadmeFile>README.md</PackageReadmeFile>
2425
</PropertyGroup>
2526

2627
<ItemGroup>
@@ -32,6 +33,10 @@
3233
<Pack>True</Pack>
3334
<PackagePath></PackagePath>
3435
</None>
36+
<None Include="bin\Release\README.md">
37+
<Pack>True</Pack>
38+
<PackagePath></PackagePath>
39+
</None>
3540
</ItemGroup>
3641

3742
<ItemGroup>

‎source code/MySqlBackup(MySql.Data)/MySqlBackup.NET_debug_81_v1.zip‎

31.4 KB
Binary file not shown.

‎source code/MySqlBackup(MySql.Data)/MySqlBackup.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public enum ProcessEndType
2828
Error
2929
}
3030

31-
public const string Version = "2.3.5";
31+
public const string Version = "2.3.6";
3232

3333
MySqlDatabase _database = new MySqlDatabase();
3434
MySqlServer _server = new MySqlServer();
@@ -615,12 +615,18 @@ void Export_RowsData_Insert_Ignore_Replace(string tableName, string selectSQL)
615615

616616
if (sb.Length == 0)
617617
{
618-
sb.AppendLine(insertStatementHeader);
618+
if (ExportInfo.InsertLineBreakBetweenInserts)
619+
sb.AppendLine(insertStatementHeader);
620+
else
621+
sb.Append(insertStatementHeader);
619622
sb.Append(sqlDataRow);
620623
}
621624
else if ((long)sb.Length + (long)sqlDataRow.Length < ExportInfo.MaxSqlLength)
622625
{
623-
sb.AppendLine(",");
626+
if (ExportInfo.InsertLineBreakBetweenInserts)
627+
sb.AppendLine(",");
628+
else
629+
sb.Append(",");
624630
sb.Append(sqlDataRow);
625631
}
626632
else

‎source code/MySqlBackup(MySql.Data)/MySqlObjects/MySqlColumn.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public MySqlColumn(string name, Type type, string mySqlDataType,
8080
}
8181
}
8282

83-
if (_extra.ToLower().Contains("generated"))
83+
if (_extra.ToUpper() == "VIRTUAL GENERATED" || _extra.ToUpper()== "STORED GENERATED")
8484
{
8585
_isGeneratedColumn = true;
8686
}

‎source code/MySqlBackup(MySqlConnector)/InfoObjects/ExportInformations.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,11 @@ public Dictionary<string, string> TablesToBeExportedDic
262262
/// </summary>
263263
public bool EnableComment = true;
264264

265+
/// <summary>
266+
/// Gets or Sets a value indicates whether line breaks should be added in between multiple INSERTs.
267+
/// </summary>
268+
public bool InsertLineBreakBetweenInserts = false;
269+
265270
public ExportInformations()
266271
{
267272

0 commit comments

Comments
 (0)