Oracle Provider Implementation DONE

.gitignore

@@ -258,4 +258,7 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
+
+# SQL
+*.sql

Projects/Dotmim.Sync.Core/Batch/BatchInfo.cs

@@ -6,11 +6,12 @@
 using System.Linq;
 using System.Text;
 
-namespace Dotmim.Sync.Core.Batch
+namespace Dotmim.Sync.Batch
 {
     /// <summary>
     /// Represents a Batch, containing a full or serialized change set
     /// </summary>
+    [Serializable]
     public class BatchInfo
     {
 
@@ -74,6 +75,7 @@ public IEnumerable<DmTable> GetTable(string tableName)
                     if (batchPartinInfo.Set.Tables.Contains(tableName))
                     {
                         yield return batchPartinInfo.Set.Tables[tableName];
+
                         if (isSerialized)
                         {
                             batchPartinInfo.Set.Clear();
@@ -98,8 +100,9 @@ internal BatchPartInfo GenerateBatchInfo(int batchIndex, DmSet changesSet, strin
             else
                 hasData = changesSet.Tables.Any(t => t.Rows.Count > 0);
 
-            if (!hasData)
-                return null;
+            // Sometimes we can have a last BPI without any data, but we need to generate it to be able to have the IsLast batch property
+            //if (!hasData)
+            //    return null;
 
             BatchPartInfo bpi = null;
             // Create a batch part
@@ -123,12 +126,17 @@ internal BatchPartInfo GenerateBatchInfo(int batchIndex, DmSet changesSet, strin
         }
 
 
-        internal static string GenerateNewDirectoryName()
+        public static string GenerateNewDirectoryName()
         {
             return String.Concat(DateTime.UtcNow.ToString("yyyy_MM_dd_ss"), Path.GetRandomFileName().Replace(".", ""));
         }
 
-        internal static string GenerateNewFileName(string batchIndex)
+        /// <summary>
+        /// generate a batch file name
+        /// </summary>
+        /// <param name="batchIndex"></param>
+        /// <returns></returns>
+        public static string GenerateNewFileName(string batchIndex)
         {
             if (batchIndex.Length == 1)
                 batchIndex = $"00{batchIndex}";
@@ -142,5 +150,16 @@ internal static string GenerateNewFileName(string batchIndex)
             return $"{batchIndex}_{Path.GetRandomFileName().Replace(".", "_")}.batch";
         }
 
+
+        public void Clear()
+        {
+            foreach (var bpi in this.BatchPartsInfo)
+            {
+                bpi.Clear();
+            }
+
+            this.BatchPartsInfo.Clear();
+
+        }
     }
 }

Projects/Dotmim.Sync.Core/Batch/BatchPart.cs

@@ -1,17 +1,16 @@
-using DmBinaryFormatter;
-using Dotmim.Sync.Data;
-using Dotmim.Sync.Data.Surrogate;
+using Dotmim.Sync.Data.Surrogate;
+using Dotmim.Sync.Serialization;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Text;
+using System.Runtime.Serialization.Formatters.Binary;
 
-namespace Dotmim.Sync.Core.Batch
+namespace Dotmim.Sync.Batch
 {
     /// <summary>
     /// Batch Part
     /// FullName like : [Guid].batch
     /// </summary>
+    [Serializable]
     public class BatchPart
     {
         /// <summary>
@@ -22,18 +21,17 @@ public class BatchPart
         public static BatchPart Deserialize(string fileName)
         {
             if (String.IsNullOrEmpty(fileName))
-                throw new ArgumentException("Cant get a Batch part if fileName doesn't exist");
+                throw new ArgumentNullException("Cant get a Batch part if fileName doesn't exist");
 
             if (!File.Exists(fileName))
-                throw new ArgumentException($"file {fileName} doesn't exist");
+                throw new ArgumentNullException($"file {fileName} doesn't exist");
 
             BatchPart bp = new BatchPart();
 
-            //TODO : Should we use the serializer from the user ?
             using (FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read))
             {
-                DmSerializer serializer = new DmSerializer();
-                bp.DmSetSurrogate = serializer.Deserialize<DmSetSurrogate>(fs);
+                BinaryFormatter serializer = new BinaryFormatter();
+                bp.DmSetSurrogate = serializer.Deserialize(fs) as DmSetSurrogate;
             }
 
             return bp;
@@ -42,7 +40,6 @@ public static BatchPart Deserialize(string fileName)
 
         public static void Serialize(DmSetSurrogate set, string fileName)
         {
-            DmSerializer serializer = new DmSerializer();
 
             FileInfo fi = new FileInfo(fileName);
 
@@ -52,7 +49,8 @@ public static void Serialize(DmSetSurrogate set, string fileName)
             // Serialize on disk.
             using (var f = new FileStream(fileName, FileMode.CreateNew, FileAccess.ReadWrite))
             {
-                serializer.Serialize(set, f);
+                BinaryFormatter serializer = new BinaryFormatter();
+                serializer.Serialize(f, set);
             }
         }
 

Projects/Dotmim.Sync.Core/Batch/BatchPartInfo.cs

@@ -5,12 +5,13 @@
 using System.Linq;
 using System.Text;
 
-namespace Dotmim.Sync.Core.Batch
+namespace Dotmim.Sync.Batch
 {
     /// <summary>
     /// Info about a BatchPart
     /// Will be serialized in the BatchInfo file
     /// </summary>
+    [Serializable]
     public class BatchPartInfo
     {
         private BatchPart batch;
@@ -24,7 +25,7 @@ public BatchPart GetBatch()
                 return batch;
 
             if (String.IsNullOrEmpty(this.FileName))
-                throw new ArgumentException("Cant get a batchpart if filename is null");
+                throw new ArgumentNullException("Cant get a batchpart if filename is null");
 
             // Get a Batch part, and deserialise the file into a DmSetSurrogate
             batch = BatchPart.Deserialize(this.FileName);
@@ -63,10 +64,23 @@ public void Clear()
         /// <summary>
         /// Gets or Sets the DmSet from the batch associated once the DmSetSurrogate is deserialized
         /// </summary>
-        public DmSet Set { get; set; }
+
+        [NonSerialized]
+        private DmSet set;
+        public DmSet Set
+        {
+            get
+            {
+                return set;
+            }
+            set
+            {
+                set = value;
+            }
+        }
 
 
-        internal BatchPartInfo()
+        public BatchPartInfo()
         {
         }
 
@@ -83,10 +97,12 @@ public static BatchPartInfo DeserializeFromDmSet(DmSet set)
 
             var dmRow = set.Tables["DotmimSync__BatchPartsInfo"].Rows[0];
 
-            var bpi = new BatchPartInfo();
-            bpi.Index = (int)dmRow["Index"];
-            bpi.FileName = dmRow["FileName"] as string;
-            bpi.IsLastBatch = (Boolean)dmRow["IsLastBatch"];
+            var bpi = new BatchPartInfo
+            {
+                Index = (int)dmRow["Index"],
+                FileName = dmRow["FileName"] as string,
+                IsLastBatch = (Boolean)dmRow["IsLastBatch"]
+            };
 
             if (dmRow["Tables"] != null)
             {
@@ -98,44 +114,7 @@ public static BatchPartInfo DeserializeFromDmSet(DmSet set)
             return bpi;
         }
 
-        /// <summary>
-        /// Serialize the BatchPartInfo WITHOUT the DmSet
-        /// </summary>
-        internal static void SerializeInDmSet(DmSet set, BatchPartInfo bpi)
-        {
-            if (set == null)
-                return;
-
-            DmTable dmTableBatchPartsInfo = null;
-
-            if (!set.Tables.Contains("DotmimSync__BatchPartsInfo"))
-            {
-                dmTableBatchPartsInfo = new DmTable("DotmimSync__BatchPartsInfo");
-                set.Tables.Add(dmTableBatchPartsInfo);
-            }
-
-            dmTableBatchPartsInfo = set.Tables["DotmimSync__BatchPartsInfo"];
-
-            dmTableBatchPartsInfo.Columns.Add<String>("FileName");
-            dmTableBatchPartsInfo.Columns.Add<int>("Index");
-            dmTableBatchPartsInfo.Columns.Add<Boolean>("IsLastBatch");
-            dmTableBatchPartsInfo.Columns.Add<String>("Tables");
-
-            var dmRow = dmTableBatchPartsInfo.NewRow();
-            dmRow["FileName"] = bpi.FileName;
-            dmRow["Index"] = bpi.Index;
-            dmRow["IsLastBatch"] = bpi.IsLastBatch;
-
-            if (bpi.Tables != null && bpi.Tables.Length > 0)
-            {
-                var tablesString = String.Join("|", bpi.Tables);
-                dmRow["Tables"] = tablesString;
-            }
-
-            dmTableBatchPartsInfo.Rows.Add(dmRow);
-
-        }
-
+
         /// <summary>
         /// Create a new BPI, and serialize the changeset if not in memory
         /// </summary>

Projects/Dotmim.Sync.Core/Batch/BatchType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Dotmim.Sync.Batch
+{
+    public enum BatchType
+    {
+        InMemory,
+        Files,
+        Archive
+
+    }
+}