diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index f6161b3a..700c73c2 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -598,8 +598,9 @@ namespace AyaNova.Biz //NOTIFY SUBSCRIPTIONS //Note: will cascade delete notifyevent, and notification automatically await ct.Database.ExecuteSqlInterpolatedAsync($"delete from anotifysubscription where userid = {dbObject.Id}"); - //personal datalistview - await ct.Database.ExecuteSqlInterpolatedAsync($"delete from adatalistsavedfilter where public = {false} and userid = {dbObject.Id}"); + //personal datalist options + await ct.Database.ExecuteSqlInterpolatedAsync($"delete from adatalistsavedfilter where public = {false} and userid = {dbObject.Id}"); + await ct.Database.ExecuteSqlInterpolatedAsync($"delete from adatalistsavedcolumnview where userid = {dbObject.Id}"); //Dashboard view await ct.Database.ExecuteSqlInterpolatedAsync($"delete from adashboardview where userid = {dbObject.Id}"); diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs index c506e092..0daccbe0 100644 --- a/server/AyaNova/util/DbUtil.cs +++ b/server/AyaNova/util/DbUtil.cs @@ -318,6 +318,7 @@ namespace AyaNova.Util await EraseTableAsync("awidget", conn); await EraseTableAsync("aevent", conn); await EraseTableAsync("adatalistsavedfilter", conn); + await EraseTableAsync("adatalistsavedcolumnview", conn); await EraseTableAsync("apicklisttemplate", conn, true); await EraseTableAsync("aformcustom", conn); await EraseTableAsync("asearchkey", conn); @@ -380,7 +381,7 @@ namespace AyaNova.Util await EraseTableAsync("aservicebank", conn); - //after cleanup + //after cleanup using (var cmd = new Npgsql.NpgsqlCommand()) { //Delete from user options table first cmd.Connection = conn; @@ -389,9 +390,9 @@ namespace AyaNova.Util cmd.CommandText = "ALTER SEQUENCE auseroptions_id_seq RESTART WITH 2;"; await cmd.ExecuteNonQueryAsync(); - - //Delete users - + + //Delete users + cmd.CommandText = "delete from \"auser\" where id <> 1;"; await cmd.ExecuteNonQueryAsync(); @@ -400,7 +401,7 @@ namespace AyaNova.Util cmd.CommandText = "delete from \"adashboardview\" where userid <> 1;"; await cmd.ExecuteNonQueryAsync(); - + cmd.CommandText = "delete from \"apartwarehouse\" where id <> 1;"; await cmd.ExecuteNonQueryAsync(); }