From 145e664d895e5129b633008cddfbccd3ea62632c Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 31 May 2021 15:15:37 +0000
Subject: [PATCH]

---
 .vscode/launch.json           |  4 ++--
 server/AyaNova/util/DbUtil.cs | 24 +++++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 76728d20..ebaa1145 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -48,12 +48,12 @@
         "AYANOVA_DEFAULT_TRANSLATION": "en",
         //TRANSLATION MUST BE en for Integration TESTING
         //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
-        "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=60;",
+        "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=90;",
         "AYANOVA_USE_URLS": "http://*:7575;",
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs
index 400e197f..32dfacca 100644
--- a/server/AyaNova/util/DbUtil.cs
+++ b/server/AyaNova/util/DbUtil.cs
@@ -432,12 +432,12 @@ namespace AyaNova.Util
 
                 //after cleanup
                 using (var cmd = new Npgsql.NpgsqlCommand())
-                { 
+                {
                     cmd.Connection = conn;
                     cmd.CommandText = "delete from  \"auseroptions\" where UserId <> 1;";
                     await cmd.ExecuteNonQueryAsync();
                     cmd.CommandText = "ALTER SEQUENCE auseroptions_id_seq RESTART WITH 2;";
-                    await cmd.ExecuteNonQueryAsync();                  
+                    await cmd.ExecuteNonQueryAsync();
                     cmd.CommandText = "delete from  \"auser\" where id <> 1;";
                     await cmd.ExecuteNonQueryAsync();
                     cmd.CommandText = "ALTER SEQUENCE auser_id_seq RESTART WITH 2;";
@@ -477,7 +477,7 @@ namespace AyaNova.Util
         ///////////////////////////////////////////
         // Erase all data from the table specified
         //
-        private static async Task EraseTableAsync(string sTable, Npgsql.NpgsqlConnection conn, bool tableHasNoSequence = false)
+        private static async Task EraseTableAsync(string sTable, Npgsql.NpgsqlConnection conn, bool tableHasNoIdentity = false)
         {
             using (var cmd = new Npgsql.NpgsqlCommand())
             {
@@ -486,18 +486,24 @@ namespace AyaNova.Util
                 //but then cascade causes things to delete in any referenced table 
                 // cmd.CommandText = "TRUNCATE \"" + sTable + "\" RESTART IDENTITY;";
 
-                cmd.CommandText = $"delete from  {sTable};";
+                // cmd.CommandText = $"delete from  {sTable};";
+                if (tableHasNoIdentity)
+                    cmd.CommandText = $"TRUNCATE {sTable};";
+                else
+                    cmd.CommandText = $"TRUNCATE {sTable} RESTART IDENTITY;";
                 await cmd.ExecuteNonQueryAsync();
-                if (!tableHasNoSequence)
-                {
-                    cmd.CommandText = $"ALTER SEQUENCE {sTable}_id_seq RESTART WITH 1;";
-                    await cmd.ExecuteNonQueryAsync();
+                // if (!tableHasNoSequence)
+                // {
+                //     cmd.CommandText = $"ALTER SEQUENCE {sTable}_id_seq RESTART WITH 1;";
+                //     await cmd.ExecuteNonQueryAsync();
 
-                }
+                // }
             }
         }
 
 
+
+
         ///////////////////////////////////////////
         // Check if DB is empty 
         // CALLED BY LICENSE CONTROLLER AND LICENSE.CS FOR TRIAL Request check