Merge pull request #276 from DbUp/bug-tableExistsCheck271

Removed exception handlers from the `DoesTableExist` method
DbUp · Nov 2, 2017 · 4fdb1cf · 4fdb1cf
2 parents 50642d9 + 718a70e
commit 4fdb1cf
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 44 deletions.
diff --git a/src/DbUp.Tests/Support/SQLite/SQLiteTableJournalTests.cs b/src/DbUp.Tests/Support/SQLite/SQLiteTableJournalTests.cs
@@ -45,7 +45,7 @@ public void creates_a_new_journal_table_when_not_exist()
             var param2 = Substitute.For<IDbDataParameter>();
             dbConnection.CreateCommand().Returns(command);
             command.CreateParameter().Returns(param1, param2);
-            command.ExecuteScalar().Returns(x => { throw new SQLiteException("table not found"); });
+            command.ExecuteScalar().Returns(x => 0L);
             var consoleUpgradeLog = new ConsoleUpgradeLog();
             var journal = new SQLiteTableJournal(() => connectionManager, () => consoleUpgradeLog, "SchemaVersions");
 

diff --git a/src/DbUp.Tests/TestInfrastructure/RecordingDbCommand.cs b/src/DbUp.Tests/TestInfrastructure/RecordingDbCommand.cs
@@ -70,8 +70,12 @@ public object ExecuteScalar()
         {
             add(DatabaseAction.ExecuteScalarCommand(CommandText));
 
-            if (CommandText == "error" || (CommandText.ToLower().Contains("count") && CommandText.ToLower().Contains("schemaversion") && !schemaTableExists))
+            if (CommandText == "error")
                 ThrowError();
+
+            if (CommandText.ToLower().Contains("count") && CommandText.ToLower().Contains("schemaversion") && !schemaTableExists)
+                return CommandText.Contains("sqlite") ? 0L : (object) null;
+
             return null;
         }
 

diff --git a/src/DbUp/Support/Firebird/FirebirdTableJournal.cs b/src/DbUp/Support/Firebird/FirebirdTableJournal.cs
@@ -161,17 +161,9 @@ private bool DoesTableExist()
         {
             return connectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
             {
-                try
-                {
-                    using (var command = dbCommandFactory())
-                    {
-                        return VerifyTableExistsCommand(command);
-                    }
-                }
-                // can't catch FbException here because this project does not depend upon Firebird
-                catch (DbException)
+                using (var command = dbCommandFactory())
                 {
-                    return false;
+                    return VerifyTableExistsCommand(command);
                 }
             });
         }

diff --git a/src/DbUp/Support/MySql/MySqlITableJournal.cs b/src/DbUp/Support/MySql/MySqlITableJournal.cs
@@ -139,16 +139,9 @@ private bool DoesTableExist()
         {
             return connectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
             {
-                try
-                {
-                    using (var command = dbCommandFactory())
-                    {
-                        return VerifyTableExistsCommand(command, table, schema);
-                    }
-                }
-                catch (DbException)
+                using (var command = dbCommandFactory())
                 {
-                    return false;
+                    return VerifyTableExistsCommand(command, table, schema);
                 }
             });
         }

diff --git a/src/DbUp/Support/Postgresql/PostgresqlTableJournal.cs b/src/DbUp/Support/Postgresql/PostgresqlTableJournal.cs
@@ -151,17 +151,9 @@ private bool DoesTableExist()
         {
             return connectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
             {
-                try
-                {
-                    using (var command = dbCommandFactory())
-                    {
-                        return VerifyTableExistsCommand(command, table, schema);
-                    }
-                }
-                // can't catch NpgsqlException here because this project does not depend upon npgsql
-                catch (DbException)
+                using (var command = dbCommandFactory())
                 {
-                    return false;
+                    return VerifyTableExistsCommand(command, table, schema);
                 }
             });
         }

diff --git a/src/DbUp/Support/SqlServer/SqlTableJournal.cs b/src/DbUp/Support/SqlServer/SqlTableJournal.cs
@@ -167,20 +167,9 @@ private bool DoesTableExist()
         {
             return connectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
             {
-                try
-                {
-                    using (var command = dbCommandFactory())
-                    {
-                        return VerifyTableExistsCommand(command, table, schema);
-                    }
-                }
-                catch (SqlException)
-                {
-                    return false;
-                }
-                catch (DbException)
+                using (var command = dbCommandFactory())
                 {
-                    return false;
+                    return VerifyTableExistsCommand(command, table, schema);
                 }
             });
         }