Merge pull request #2288 from MediaBrowser/dev

Dev

2 files changed, 18 insertions, 5 deletions

diff --git a/Emby.Server.Core/Data/DataExtensions.cs b/Emby.Server.Core/Data/DataExtensions.cs
index b633d92178..631c1c5005 100644
--- a/Emby.Server.Core/Data/DataExtensions.cs
+++ b/Emby.Server.Core/Data/DataExtensions.cs
@@ -40,7 +40,7 @@ namespace Emby.Server.Core.Data
         public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name)
         {
             var param = cmd.CreateParameter();
-
+            
             param.ParameterName = name;
 
             paramCollection.Add(param);
@@ -173,7 +173,7 @@ namespace Emby.Server.Core.Data
             var builder = new StringBuilder();
 
             builder.AppendLine("alter table " + table);
-            builder.AppendLine("add column " + columnName + " " + type);
+            builder.AppendLine("add column " + columnName + " " + type + " NULL");
 
             connection.RunQueries(new[] { builder.ToString() }, logger);
         }
diff --git a/Emby.Server.Core/Data/SqliteItemRepository.cs b/Emby.Server.Core/Data/SqliteItemRepository.cs
index 2ca86c8318..6ed409aa13 100644
--- a/Emby.Server.Core/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Core/Data/SqliteItemRepository.cs
@@ -157,7 +157,7 @@ namespace Emby.Server.Core.Data
 
             string[] queries = {
 
-                                "create table if not exists TypedBaseItems (guid GUID primary key, type TEXT, data BLOB, ParentId GUID, Path TEXT)",
+                                "create table if not exists TypedBaseItems (guid GUID primary key NOT NULL, type TEXT NOT NULL, data BLOB NULL, ParentId GUID NULL, Path TEXT NULL)",
 
                                 "create table if not exists AncestorIds (ItemId GUID, AncestorId GUID, AncestorIdText TEXT, PRIMARY KEY (ItemId, AncestorId))",
                                 "create index if not exists idx_AncestorIds1 on AncestorIds(AncestorId)",
@@ -286,6 +286,7 @@ namespace Emby.Server.Core.Data
             _connection.AddColumn(Logger, "TypedBaseItems", "ExtraType", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "Artists", "Text");
             _connection.AddColumn(Logger, "TypedBaseItems", "AlbumArtists", "Text");
+            _connection.AddColumn(Logger, "TypedBaseItems", "ExternalId", "Text");
 
             _connection.AddColumn(Logger, "ItemValues", "CleanValue", "Text");
 
@@ -440,7 +441,8 @@ namespace Emby.Server.Core.Data
             "TotalBitrate",
             "ExtraType",
             "Artists",
-            "AlbumArtists"
+            "AlbumArtists",
+            "ExternalId"
         };
 
         private readonly string[] _mediaStreamSaveColumns =
@@ -575,7 +577,8 @@ namespace Emby.Server.Core.Data
                 "TotalBitrate",
                 "ExtraType",
                 "Artists",
-                "AlbumArtists"
+                "AlbumArtists",
+                "ExternalId"
             };
             _saveItemCommand = _connection.CreateCommand();
             _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values (";
@@ -1084,6 +1087,10 @@ namespace Emby.Server.Core.Data
                         }
                     }
 
+                    _saveItemCommand.GetParameter(index++).Value = item.ExternalId;
+
+                    //Logger.Debug(_saveItemCommand.CommandText);
+
                     _saveItemCommand.Transaction = transaction;
 
                     _saveItemCommand.ExecuteNonQuery();
@@ -1967,6 +1974,12 @@ namespace Emby.Server.Core.Data
             }
             index++;
 
+            if (!reader.IsDBNull(index))
+            {
+                item.ExternalId = reader.GetString(index);
+            }
+            index++;
+
             if (string.IsNullOrWhiteSpace(item.Tagline))
             {
                 var movie = item as Movie;