Merge pull request #1874 from MediaBrowser/dev

Dev

1 files changed, 14 insertions, 9 deletions

diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
index ced43a3e3..90dbd7770 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
@@ -56,17 +56,21 @@ namespace MediaBrowser.Server.Implementations.Persistence
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public async Task Initialize()
+        public async Task Initialize(IDbConnection connection)
         {
-            _connection = await CreateConnection(false).ConfigureAwait(false);
+            _connection = connection;
 
             string[] queries = {
 
-                                "create table if not exists userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)",
+                                "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)",
 
-                                "create index if not exists idx_userdata on userdata(key)",
-                                "create unique index if not exists userdataindex on userdata (key, userId)",
-                                "create index if not exists userdataindex1 on userdata (key, userId)",
+                                "drop index if exists UserDataDb.idx_userdata",
+                                "drop index if exists UserDataDb.idx_userdata1",
+                                "drop index if exists UserDataDb.idx_userdata2",
+                                "drop index if exists UserDataDb.userdataindex1",
+
+                                "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)",
+                                "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)",
 
                                 //pragmas
                                 "pragma temp_store = memory",
@@ -332,18 +336,19 @@ namespace MediaBrowser.Server.Implementations.Persistence
             using (var cmd = _connection.CreateCommand())
             {
                 var index = 0;
-                var excludeIds = new List<string>();
+                var userdataKeys = new List<string>();
                 var builder = new StringBuilder();
                 foreach (var key in keys)
                 {
                     var paramName = "@Key" + index;
-                    excludeIds.Add("Key =" + paramName);
+                    userdataKeys.Add("Key =" + paramName);
                     cmd.Parameters.Add(cmd, paramName, DbType.String).Value = key;
                     builder.Append(" WHEN Key=" + paramName + " THEN " + index);
                     index++;
+                    break;
                 }
 
-                var keyText = string.Join(" OR ", excludeIds.ToArray());
+                var keyText = string.Join(" OR ", userdataKeys.ToArray());
 
                 cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@userId AND (" + keyText + ") ";