fix import bug, patch db schema name into dataset before StartSeeding

nstohler · Aug 27, 2019 · a78fbda · a78fbda
1 parent 873110a
commit a78fbda
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/Korzh.DbUtils.Import/DbImporter.cs b/src/Korzh.DbUtils.Import/DbImporter.cs
@@ -44,6 +44,9 @@ public void Import()
                             if (datasetStream != null) {
                                 _logger?.LogInformation($"Importing {table.Name}...");
                                 var dataset = _datasetImporter.StartImport(datasetStream);
+
+                                dataset.PatchDbSchema(table.Schema);
+
                                 _dbWriter.StartSeeding(dataset);
 
                                 while (_datasetImporter.HasRecords()) {

diff --git a/src/Korzh.DbUtils/Abstractions/DatasetInfo.cs b/src/Korzh.DbUtils/Abstractions/DatasetInfo.cs
@@ -67,6 +67,11 @@ public class DatasetInfo
         /// <value>The schema name.</value>
         public string Schema { get; private set; }
 
+        public void PatchDbSchema(string schema)
+        {
+            Schema = schema;
+        }
+
         /// <summary>
         /// Gets the directioary which contains all table columns. 
         /// The key of each entry is the name of the column.

diff --git a/src/Korzh.DbUtils/DbBridge/BaseDbBridge.cs b/src/Korzh.DbUtils/DbBridge/BaseDbBridge.cs
@@ -340,6 +340,11 @@ public void StartSeeding(DatasetInfo table)
         /// </summary>
         public void FinishSeeding()
         {
+            if(CurrentSeedingTable == null)
+            {
+                return;
+            }
+
             TurnOnConstraints();
             TurnOnAutoIncrement();
             Logger?.LogDebug("Finish seeding: " + GetTableFullName(CurrentSeedingTable));