Merge remote-tracking branch 'upstream/master' into register-services-correctly

This commit is contained in:
Mark Monteiro
2020-04-05 10:07:17 -04:00
26 changed files with 542 additions and 271 deletions

View File

@@ -5010,6 +5010,11 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
commandText += " order by ListOrder";
if (query.Limit > 0)
{
commandText += " LIMIT " + query.Limit;
}
using (var connection = GetConnection(true))
{
var list = new List<string>();
@@ -5048,6 +5053,11 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
commandText += " order by ListOrder";
if (query.Limit > 0)
{
commandText += " LIMIT " + query.Limit;
}
using (var connection = GetConnection(true))
{
var list = new List<PersonInfo>();