mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed paging ID10T issue

This commit is contained in:
Mark McDowall 2013-05-30 17:30:32 -07:00
parent 680f366c94
commit 4a39faeb39
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Marr.Data/QGen/SqlitePagingQueryDecorator.cs
View File

@ -66,14 +66,15 @@ namespace Marr.Data.QGen
sql.Append(" FROM ("); sql.Append(" FROM (");
BuildSimpleInnerSelect(sql); BuildSimpleInnerSelect(sql);
_innerQuery.BuildFromClause(sql); _innerQuery.BuildFromClause(sql);
_innerQuery.BuildJoinClauses(sql);
_innerQuery.BuildWhereClause(sql); _innerQuery.BuildWhereClause(sql);
sql.AppendLine(String.Format("LIMIT {0},{1}", _skip, _take)); BuildGroupBy(sql);
BuildOrderBy(sql);
sql.AppendFormat(" LIMIT {0},{1}", _skip, _take);
sql.AppendFormat(") AS {0} ", _innerQuery.Dialect.CreateToken(baseTable.Alias)); sql.AppendFormat(") AS {0} ", _innerQuery.Dialect.CreateToken(baseTable.Alias));
_innerQuery.BuildJoinClauses(sql); _innerQuery.BuildJoinClauses(sql);
_innerQuery.BuildOrderClause(sql);
return sql.ToString(); return sql.ToString();
} }
@ -137,10 +138,24 @@ namespace Marr.Data.QGen
if (sql.Length > startIndex) if (sql.Length > startIndex)
sql.Append(","); sql.Append(",");
string token = c.ColumnInfo.Name; string token = string.Concat(join.Alias, ".", c.ColumnInfo.Name);
sql.Append(_innerQuery.Dialect.CreateToken(token)); sql.Append(_innerQuery.Dialect.CreateToken(token));
} }
} }
private void BuildOrderBy(StringBuilder sql)
{
sql.Append(_innerQuery.OrderBy.BuildQuery(false));
}
private void BuildGroupBy(StringBuilder sql)
{
var baseTable = _innerQuery.Tables.First();
var primaryKeyColumn = baseTable.Columns.Single(c => c.ColumnInfo.IsPrimaryKey);
string token = _innerQuery.Dialect.CreateToken(string.Concat(baseTable.Alias, ".", _innerQuery.NameOrAltName(primaryKeyColumn.ColumnInfo)));
sql.AppendFormat(" GROUP BY {0}", token);
}
} }
} }