bugfix: Fix ImportCompleteArgs parameteres and ExportCompleteArgs TimeUsed

- Change version to 2.3.6.2

Author: hmoraes

source code/MySqlBackup(Devart-Express)/EventArgs/ExportCompleteArgs.cs

@@ -38,7 +38,7 @@ public ExportCompleteArgs(DateTime timeStart, DateTime timeEnd, MySqlBackup.Proc
             _completionType = endType;
             _timeStart = timeStart;
             _timeEnd = timeEnd;
-            _timeUsed = timeStart - timeEnd;
+            _timeUsed = timeEnd - timeStart;
             _exception = exception;
         }
     }

source code/MySqlBackup(Devart-Express)/EventArgs/ImportCompleteArgs.cs

@@ -21,6 +21,7 @@ public class ImportCompleteArgs
         /// </summary>
         public enum CompleteType
         {
+            UnknownStatus,
             Completed,
             Cancelled,
             Error
@@ -44,15 +45,6 @@ public enum CompleteType
         /// <summary>
         /// Total time used in current import process.
         /// </summary>
-        public TimeSpan TimeUsed
-        {
-            get
-            {
-                TimeSpan ts = new TimeSpan();
-                ts = TimeEnd - TimeStart;
-                return ts;
-            }
-        }
-
+        public TimeSpan TimeUsed => TimeEnd - TimeStart;
     }
 }

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

@@ -7,7 +7,6 @@
     <ApplicationIcon>logo.ico</ApplicationIcon>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>MySqlBackup.Net.DevartExpress</PackageId>
-    <Version>2.3.6</Version>
     <Authors>adriancs</Authors>
     <Company>MySqlBackup.NET</Company>
     <Product>MySqlBackup.NET.DevartExpress</Product>
@@ -18,8 +17,9 @@
     <RepositoryUrl>https://github.com/MySqlBackupNET/MySqlBackup.Net.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>mysqlbackup;devart;mysql</PackageTags>
-    <FileVersion>2.3.6</FileVersion>
-    <AssemblyVersion>2.3.6</AssemblyVersion>
+    <Version>2.3.6.2</Version>
+    <AssemblyVersion>2.3.6.2</AssemblyVersion>
+    <FileVersion>2.3.6.2</FileVersion>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 

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

@@ -27,7 +27,7 @@ public enum ProcessEndType
             Error
         }
 
-        public const string Version = "2.3.6";
+        public const string Version = "2.3.6.2";
 
         MySqlDatabase _database = new MySqlDatabase();
         MySqlServer _server = new MySqlServer();
@@ -614,12 +614,18 @@ void Export_RowsData_Insert_Ignore_Replace(string tableName, string selectSQL)
 
                 if (sb.Length == 0)
                 {
-                    sb.AppendLine(insertStatementHeader);
+                    if (ExportInfo.InsertLineBreakBetweenInserts)
+                        sb.AppendLine(insertStatementHeader);
+                    else
+                        sb.Append(insertStatementHeader);
                     sb.Append(sqlDataRow);
                 }
                 else if ((long)sb.Length + (long)sqlDataRow.Length < ExportInfo.MaxSqlLength)
                 {
-                    sb.AppendLine(",");
+                    if (ExportInfo.InsertLineBreakBetweenInserts)
+                        sb.AppendLine(",");
+                    else
+                        sb.Append(",");
                     sb.Append(sqlDataRow);
                 }
                 else
@@ -1388,7 +1394,30 @@ void ReportEndProcess()
                 ReportProgress();
                 if (ImportCompleted != null)
                 {
-                    ImportCompleteArgs arg = new ImportCompleteArgs();
+                    ImportCompleteArgs.CompleteType completedType;
+                    switch(processCompletionType)
+                    {
+                        case ProcessEndType.Complete:
+                            completedType = ImportCompleteArgs.CompleteType.Completed;
+                            break;
+                        case ProcessEndType.Error:
+                            completedType = ImportCompleteArgs.CompleteType.Error;
+                            break;
+                        case ProcessEndType.Cancelled:
+                            completedType = ImportCompleteArgs.CompleteType.Cancelled;
+                            break;
+                        default:
+                            completedType = ImportCompleteArgs.CompleteType.UnknownStatus;
+                            break;
+                    }
+
+                    ImportCompleteArgs arg = new ImportCompleteArgs()
+                    {
+                        LastError = _lastError,
+                        CompletedType = completedType,
+                        TimeStart = timeStart,
+                        TimeEnd = timeEnd,
+                    };
                     ImportCompleted(this, arg);
                 }
             }
@@ -1446,4 +1475,4 @@ public void Dispose()
             catch { }
         }
     }
-}
+}

source code/MySqlBackup(MySql.Data)/EventArgs/ExportCompleteArgs.cs

@@ -38,7 +38,7 @@ public ExportCompleteArgs(DateTime timeStart, DateTime timeEnd, MySqlBackup.Proc
             _completionType = endType;
             _timeStart = timeStart;
             _timeEnd = timeEnd;
-            _timeUsed = timeStart - timeEnd;
+            _timeUsed = timeEnd - timeStart;
             _exception = exception;
         }
     }

source code/MySqlBackup(MySql.Data)/EventArgs/ImportCompleteArgs.cs

@@ -21,6 +21,7 @@ public class ImportCompleteArgs
         /// </summary>
         public enum CompleteType
         {
+            UnknownStatus,
             Completed,
             Cancelled,
             Error
@@ -44,15 +45,6 @@ public enum CompleteType
         /// <summary>
         /// Total time used in current import process.
         /// </summary>
-        public TimeSpan TimeUsed
-        {
-            get
-            {
-                TimeSpan ts = new TimeSpan();
-                ts = TimeEnd - TimeStart;
-                return ts;
-            }
-        }
-
+        public TimeSpan TimeUsed => TimeEnd - TimeStart;
     }
 }

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

@@ -6,7 +6,6 @@
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
     <Nullable>disable</Nullable>
     <PackageId>MySqlBackup.NET</PackageId>
-    <Version>2.3.6</Version>
     <Authors>adriancs</Authors>
     <Company>MySqlBackup.NET</Company>
     <Product>MySqlBackup.NET</Product>
@@ -16,8 +15,9 @@
     <PackageIcon>logo128.png</PackageIcon>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/MySqlBackupNET/MySqlBackup.Net</RepositoryUrl>
-    <AssemblyVersion>2.3.6</AssemblyVersion>
-    <FileVersion>2.3.6</FileVersion>
+    <Version>2.3.6.2</Version>
+    <AssemblyVersion>2.3.6.2</AssemblyVersion>
+    <FileVersion>2.3.6.2</FileVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <AssemblyName>MySqlBackup</AssemblyName>
     <ApplicationIcon>logo.ico</ApplicationIcon>

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

@@ -28,7 +28,7 @@ public enum ProcessEndType
             Error
         }
 
-        public const string Version = "2.3.6";
+        public const string Version = "2.3.6.2";
 
         MySqlDatabase _database = new MySqlDatabase();
         MySqlServer _server = new MySqlServer();
@@ -1395,7 +1395,30 @@ void ReportEndProcess()
                 ReportProgress();
                 if (ImportCompleted != null)
                 {
-                    ImportCompleteArgs arg = new ImportCompleteArgs();
+                    ImportCompleteArgs.CompleteType completedType;
+                    switch(processCompletionType)
+                    {
+                        case ProcessEndType.Complete:
+                            completedType = ImportCompleteArgs.CompleteType.Completed;
+                            break;
+                        case ProcessEndType.Error:
+                            completedType = ImportCompleteArgs.CompleteType.Error;
+                            break;
+                        case ProcessEndType.Cancelled:
+                            completedType = ImportCompleteArgs.CompleteType.Cancelled;
+                            break;
+                        default:
+                            completedType = ImportCompleteArgs.CompleteType.UnknownStatus;
+                            break;
+                    }
+
+                    ImportCompleteArgs arg = new ImportCompleteArgs()
+                    {
+                        LastError = _lastError,
+                        CompletedType = completedType,
+                        TimeStart = timeStart,
+                        TimeEnd = timeEnd,
+                    };
                     ImportCompleted(this, arg);
                 }
             }

source code/MySqlBackup(MySqlConnector)/EventArgs/ExportCompleteArgs.cs

@@ -38,7 +38,7 @@ public ExportCompleteArgs(DateTime timeStart, DateTime timeEnd, MySqlBackup.Proc
             _completionType = endType;
             _timeStart = timeStart;
             _timeEnd = timeEnd;
-            _timeUsed = timeStart - timeEnd;
+            _timeUsed = timeEnd - timeStart;
             _exception = exception;
         }
     }

source code/MySqlBackup(MySqlConnector)/EventArgs/ImportCompleteArgs.cs

@@ -21,6 +21,7 @@ public class ImportCompleteArgs
         /// </summary>
         public enum CompleteType
         {
+            UnknownStatus,
             Completed,
             Cancelled,
             Error
@@ -44,15 +45,6 @@ public enum CompleteType
         /// <summary>
         /// Total time used in current import process.
         /// </summary>
-        public TimeSpan TimeUsed
-        {
-            get
-            {
-                TimeSpan ts = new TimeSpan();
-                ts = TimeEnd - TimeStart;
-                return ts;
-            }
-        }
-
+        public TimeSpan TimeUsed => TimeEnd - TimeStart;
     }
 }