Merge pull request #291 from DbUp/revert-276-bug-tableExistsCheck271

Revert "Removed exception handlers from the `DoesTableExist` method"
DbUp · Nov 2, 2017 · 761b1df · 761b1df
2 parents 4fdb1cf + 61378f5
commit 761b1df
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 14 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 => 0L);
+            command.ExecuteScalar().Returns(x => { throw new SQLiteException("table not found"); });
             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,12 +70,8 @@ public object ExecuteScalar()
         {
             add(DatabaseAction.ExecuteScalarCommand(CommandText));
 
-            if (CommandText == "error")
+            if (CommandText == "error" || (CommandText.ToLower().Contains("count") && CommandText.ToLower().Contains("schemaversion") && !schemaTableExists))
                 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,9 +161,17 @@ private bool DoesTableExist()
         {
             return connectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
             {
-                using (var command = dbCommandFactory())
+                try
+                {
+                    using (var command = dbCommandFactory())
+                    {
+                        return VerifyTableExistsCommand(command);
+                    }
+                }
+                // can't catch FbException here because this project does not depend upon Firebird
+                catch (DbException)
                 {
-                    return VerifyTableExistsCommand(command);
+                    return false;
                 }
             });
         }

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

diff --git a/src/DbUp/Support/Postgresql/PostgresqlTableJournal.cs b/src/DbUp/Support/Postgresql/PostgresqlTableJournal.cs
@@ -151,9 +151,17 @@ private bool DoesTableExist()
         {
             return connectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
             {
-                using (var command = 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)
                 {
-                    return VerifyTableExistsCommand(command, table, schema);
+                    return false;
                 }
             });
         }

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