Merge pull request #51 from ashleynexus/patch-1

Fix SQLite error
tmenier · Jul 13, 2018 · 079123c · 079123c
2 parents 808628f + 0a70b05
commit 079123c
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/AsyncPoco/Core/DatabaseType.cs b/AsyncPoco/Core/DatabaseType.cs
@@ -136,38 +136,38 @@ public virtual Task<object> ExecuteInsertAsync(Database db, DbCommand cmd, strin
 		public static DatabaseType Resolve(string TypeName, string ProviderName)
 		{
 			// Try using type name first (more reliable)
-			if (!string.IsNullOrEmpty(TypeName)) {
-				if (TypeName.StartsWith("MySql"))
+			switch (TypeName)
+			{
+				case string t when t.StartsWith("mysql", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<MySqlDatabaseType>.Instance;
-				if (TypeName.StartsWith("SqlCe"))
+				case string t when t.StartsWith("sqlce", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<SqlServerCEDatabaseType>.Instance;
-				if (TypeName.StartsWith("Npgsql") || TypeName.StartsWith("PgSql"))
+				case string t when t.StartsWith("npgsql", StringComparison.CurrentCultureIgnoreCase) || t.StartsWith("pgsql", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<PostgreSQLDatabaseType>.Instance;
-				if (TypeName.StartsWith("Oracle"))
+				case string t when t.StartsWith("oracle", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<OracleDatabaseType>.Instance;
-				if (TypeName.StartsWith("SQLite"))
+				case string t when t.StartsWith("sqlite", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<SQLiteDatabaseType>.Instance;
-				if (TypeName.StartsWith("System.Data.SqlClient."))
+				case string t when t.StartsWith("system.data.sqlclient.", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<SqlServerDatabaseType>.Instance;
 			}
-
 			// Try again with provider name
-			if (!string.IsNullOrEmpty(ProviderName)) {
-				if (ProviderName.IndexOf("MySql", StringComparison.OrdinalIgnoreCase) >= 0)
+			switch (ProviderName)
+			{
+				case string t when t.StartsWith("mysql", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<MySqlDatabaseType>.Instance;
-				if (ProviderName.IndexOf("SqlServerCe", StringComparison.OrdinalIgnoreCase) >= 0)
+				case string t when t.StartsWith("sqlserverce", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<SqlServerCEDatabaseType>.Instance;
-				if (ProviderName.IndexOf("pgsql", StringComparison.OrdinalIgnoreCase) >= 0)
+				case string t when t.StartsWith("pgsql", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<PostgreSQLDatabaseType>.Instance;
-				if (ProviderName.IndexOf("Oracle", StringComparison.OrdinalIgnoreCase) >= 0)
+				case string t when t.StartsWith("oracle", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<OracleDatabaseType>.Instance;
-				if (ProviderName.IndexOf("SQLite", StringComparison.OrdinalIgnoreCase) >= 0)
+				case string t when t.StartsWith("sqlite", StringComparison.CurrentCultureIgnoreCase):
 					return Singleton<SQLiteDatabaseType>.Instance;
+				// Assume SQL Server
+				default:
+					return Singleton<SqlServerDatabaseType>.Instance;
 			}
-
-			// Assume SQL Server
-			return Singleton<SqlServerDatabaseType>.Instance;
 		}
-
 	}
 }