lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1869 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-06-22 16:18:34 -04:00 committed by GitHub
commit 025b982f61
1 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -123,7 +123,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
protected override async Task<IDbConnection> CreateConnection(bool isReadOnly = false)
{
var connection = await DbConnector.Connect(DbFilePath, false, false, 5000).ConfigureAwait(false);
var connection = await DbConnector.Connect(DbFilePath, false, false, 10000).ConfigureAwait(false);
connection.RunQueries(new[]
{
@ -1780,13 +1780,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
if (query.Limit.HasValue || query.StartIndex.HasValue)
{
var limit = query.Limit ?? int.MaxValue;
var offset = query.StartIndex ?? 0;
cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
if (query.StartIndex.HasValue)
if (query.Limit.HasValue || offset > 0)
{
cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
}
if (offset > 0)
{
cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
}
}
@ -1883,13 +1886,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
if (query.Limit.HasValue || query.StartIndex.HasValue)
{
var limit = query.Limit ?? int.MaxValue;
var offset = query.StartIndex ?? 0;
cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
if (query.StartIndex.HasValue)
if (query.Limit.HasValue || offset > 0)
{
cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
}
if (offset > 0)
{
cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
}
}
@ -2096,13 +2102,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
if (query.Limit.HasValue || query.StartIndex.HasValue)
{
var limit = query.Limit ?? int.MaxValue;
var offset = query.StartIndex ?? 0;
cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
if (query.StartIndex.HasValue)
if (query.Limit.HasValue || offset > 0)
{
cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
}
if (offset > 0)
{
cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
}
}
@ -2153,13 +2162,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
if (query.Limit.HasValue || query.StartIndex.HasValue)
{
var limit = query.Limit ?? int.MaxValue;
var offset = query.StartIndex ?? 0;
cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
if (query.StartIndex.HasValue)
if (query.Limit.HasValue || offset > 0)
{
cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
}
if (offset > 0)
{
cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
}
}
@ -2243,13 +2255,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
if (query.Limit.HasValue || query.StartIndex.HasValue)
{
var limit = query.Limit ?? int.MaxValue;
var offset = query.StartIndex ?? 0;
cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
if (query.StartIndex.HasValue)
if (query.Limit.HasValue || offset > 0)
{
cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
}
if (offset > 0)
{
cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
}
}
@ -3700,13 +3715,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
if (query.Limit.HasValue || query.StartIndex.HasValue)
{
var limit = query.Limit ?? int.MaxValue;
var offset = query.StartIndex ?? 0;
cmd.CommandText += " LIMIT " + limit.ToString(CultureInfo.InvariantCulture);
if (query.StartIndex.HasValue)
if (query.Limit.HasValue || offset > 0)
{
cmd.CommandText += " OFFSET " + query.StartIndex.Value.ToString(CultureInfo.InvariantCulture);
cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture);
}
if (offset > 0)
{
cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture);
}
}