timeout settings

Author: avraampiperidis

Firedump/Firedump/App.config

@@ -56,6 +56,15 @@
       <setting name="option_sqlite_foreign_keys" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="option_mysql_conreadtimeout" serializeAs="String">
+        <value>30</value>
+      </setting>
+      <setting name="option_mysql_contimeout" serializeAs="String">
+        <value>60</value>
+      </setting>
+      <setting name="option_mysql_keepalive" serializeAs="String">
+        <value>600</value>
+      </setting>
     </Firedump.Properties.Settings>
   </userSettings>
   <runtime>

Firedump/Firedump/Properties/Settings.Designer.cs

@@ -37,5 +37,14 @@
     <Setting Name="option_sqlite_foreign_keys" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="option_mysql_conreadtimeout" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">30</Value>
+    </Setting>
+    <Setting Name="option_mysql_contimeout" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">60</Value>
+    </Setting>
+    <Setting Name="option_mysql_keepalive" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">600</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

Firedump/Firedump/Properties/Settings.settings

@@ -29,7 +29,9 @@ public override sealed DbCommand Create()
             DbType dbType = Firedump.core.sql.Utils.GetDbTypeEnum(Connection);
             if (dbType == DbType.MYSQL || dbType == DbType.MARIADB)
             {
-                return new MySqlCommand(Sql, (MySqlConnection)Connection);
+                var com =  new MySqlCommand(Sql, (MySqlConnection)Connection);
+                com.CommandTimeout = Properties.Settings.Default.option_mysql_conreadtimeout;
+                return com;
             }
             else if (dbType == DbType.ORACLE)
             {

Firedump/Firedump/core/db/DbCommandFactory.cs

@@ -9,14 +9,14 @@ namespace Firedump.core.sql
     sealed class MySqlConnectionStringBuilder
     {
         internal static string connectionStringBuilder(sqlservers server, string database = null) =>
-            connectionStringBuilder(server.host, server.username, server.password, database, server.port);
+            connectionStringBuilder(server.host, server.username, server.password, database, server.port,Properties.Settings.Default.option_mysql_contimeout);
 
         // string params order matters!
         private static string connectionStringBuilder(string host, string username, string password, string database, long port = 3306, int timeout = 120, string SslMode = "none")
             =>
-            "Server=" + host + ";" + (string.IsNullOrEmpty(database) ? "" : "database=" + database
-                + ";Convert Zero Datetime=true;default command timeout=" + timeout + "") + ";UID=" + username
-                + ";" + (!string.IsNullOrEmpty(password) ? "password=" + password : "") + ";port=" + port + ";SslMode=" + SslMode;
+            "Server=" + host + "; " + (string.IsNullOrEmpty(database) ? "" : "database=" + database
+                + "; Convert Zero Datetime=true; Connection Timeout=" + timeout + "") + "; UID=" + username
+                + ";" + (!string.IsNullOrEmpty(password) ? " password=" + password : "") + "; port=" + port + "; Keepalive="+ Properties.Settings.Default.option_mysql_keepalive+ "; SslMode=" + SslMode;
 
     }
 }

Firedump/Firedump/core/sql/MySqlConnectionStringFactory.cs

@@ -38,7 +38,7 @@ public string getDatabasePrimaryKeys()
 
         public string getDatabases()
         {
-            return "main";
+            return "";
         }
 
         public string getDatabaseUniques()

Firedump/Firedump/core/sql/SqliteSqlBuilder.cs

@@ -27,7 +27,7 @@ public static bool IsShowDataTypeOfCommand(string sql)
                 return false;
             }
             string q = sql.Trim().ToLower();
-            return q.Contains("select ") || q.Contains("show ") || q.Contains("describe ") || q.Contains("explain ") || q.Contains("pragma ");
+            return q.Contains("select ") || q.Contains("show ") || q.Contains("describe ") || q.Contains("explain ");
         }
 
         public static sqlbox.commons.DbType _convert(int db_type)