admin/sockeye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2022-12-26 18:18:00 +00:00
parent bfe62da911
commit b75dcb7576
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/DataList/EventDataList.cs
View File

@@ -31,7 +31,7 @@ namespace Sockeye.DataList
FieldKey = "event",
UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = Sockeye.Util.StringUtil.TrimTypeName(typeof(SockEvent).ToString()),
SqlValueColumnName = "aevent.ayevent"
SqlValueColumnName = "aevent.sockevent"
});
FieldDefinitions.Add(new DataListFieldDefinition
@@ -48,8 +48,8 @@ namespace Sockeye.DataList
TKey = "Object",
FieldKey = "object",
UiFieldDataType = (int)UiFieldDataType.Text,
SqlIdColumnName = "aevent.ayid",
SqlValueColumnName = $"AYGETNAME(aevent.ayid, aevent.socktype,{translationId})",
SqlIdColumnName = "aevent.sockid",
SqlValueColumnName = $"AYGETNAME(aevent.sockid, aevent.socktype,{translationId})",
SqlATypeColumnName = "aevent.socktype"
});

4
server/biz/Search.cs
View File

@@ -120,7 +120,7 @@ namespace Sockeye.Biz
var qTypeOnly=string.Empty;
if(searchParameters.TypeOnly!=SockType.NoType){
//INNER JOIN ASEARCHKEY ON ASEARCHDICTIONARY.ID = ASEARCHKEY.WORDID and asearchkey.sockType=20
qTypeOnly=$"AND ASEARCHKEY.ATYPE={(int)searchParameters.TypeOnly}";
qTypeOnly=$"AND ASEARCHKEY.SOCKTYPE={(int)searchParameters.TypeOnly}";
}
q.Append($" FROM asearchdictionary INNER JOIN asearchkey ON asearchdictionary.id = asearchkey.wordid {qTypeOnly} GROUP BY asearchkey.objectid, asearchkey.sockType) SELECT sockType, objectid FROM qr WHERE ");
@@ -634,7 +634,7 @@ namespace Sockeye.Biz
{
//Be careful in future, if you put ToString at the end of each object in the string interpolation
//npgsql driver will assume it's a string and put quotes around it triggering an error that a string can't be compared to an int
await ct.Database.ExecuteSqlInterpolatedAsync($"delete from asearchkey where objectid={objectID} and aType={(int)aType}");
await ct.Database.ExecuteSqlInterpolatedAsync($"delete from asearchkey where objectid={objectID} and socktype={(int)aType}");
//nothing to save here, it's a direct command already executed
}