From 034c0b95b2f9cc6440bac8b5844abfdc97db8990 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 17 Oct 2015 11:05:12 -0400
Subject: 3.0.5768.1

---
 .../Persistence/SqliteItemRepository.cs                    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Persistence')

diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index cede9350e..49b1f1821 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -225,19 +225,18 @@ namespace MediaBrowser.Server.Implementations.Persistence
             var columns = string.Join(",", _mediaStreamSaveColumns);
 
             string[] queries = {
-                                "INSERT INTO mediastreams("+columns+") SELECT "+columns+" FROM MediaInfoOld.mediastreams;"
+                                "REPLACE INTO mediastreams("+columns+") SELECT "+columns+" FROM MediaInfoOld.mediastreams;"
                                };
 
             try
             {
                 _connection.RunQueries(queries, _logger);
+                File.Delete(file);
             }
             catch (Exception ex)
             {
-                throw ex;
+                _logger.ErrorException("Error migrating media info database", ex);
             }
-
-            File.Delete(file);
         }
 
         private void MigrateChapters(string file)
@@ -247,19 +246,18 @@ namespace MediaBrowser.Server.Implementations.Persistence
             SqliteExtensions.Attach(_connection, backupFile, "ChaptersOld");
 
             string[] queries = {
-                                "INSERT INTO "+ChaptersTableName+"(ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) SELECT ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath FROM ChaptersOld.Chapters;"
+                                "REPLACE INTO "+ChaptersTableName+"(ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) SELECT ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath FROM ChaptersOld.Chapters;"
                                };
 
             try
             {
                 _connection.RunQueries(queries, _logger);
+                File.Delete(file);
             }
             catch (Exception ex)
             {
-                throw ex;
+                _logger.ErrorException("Error migrating chapter database", ex);
             }
-
-            File.Delete(file);
         }
 
         /// <summary>
-- 
cgit v1.2.3