Changed GetExecutedScripts so that it does not created the table if i…

…t doesn't exist. This means the table is only created when the first journal record is actually written. This is the behaviour in 3.x. Fixes #316
DbUp · Feb 26, 2018 · 1fd851e · 1fd851e
1 parent 0f183a4
commit 1fd851e
Show file tree

Hide file tree

Showing 26 changed files with 174 additions and 176 deletions.
diff --git a/src/dbup-core/Support/TableJournal.cs b/src/dbup-core/Support/TableJournal.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Common;
 using DbUp.Engine;
 using DbUp.Engine.Output;
 using DbUp.Engine.Transactions;
@@ -56,29 +57,32 @@ public abstract class TableJournal : IJournal
 
         protected Func<IUpgradeLog> Log { get; private set; }
 
-        /// <summary>
-        /// Recalls the version number of the database.
-        /// </summary>
-        /// <returns>All executed scripts.</returns>
         public string[] GetExecutedScripts()
         {
-            EnsureTableIsLatestVersion();
-            Log().WriteInformation("Fetching list of already executed scripts.");
-
-            var scripts = new List<string>();
-            ConnectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
+            if (journalExists || DoesTableExist())
             {
-                using (var command = GetJournalEntriesCommand(dbCommandFactory))
+                Log().WriteInformation("Fetching list of already executed scripts.");
+
+                var scripts = new List<string>();
+                ConnectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
                 {
-                    using (var reader = command.ExecuteReader())
+                    using (var command = GetJournalEntriesCommand(dbCommandFactory))
                     {
-                        while (reader.Read())
-                            scripts.Add((string)reader[0]);
+                        using (var reader = command.ExecuteReader())
+                        {
+                            while (reader.Read())
+                                scripts.Add((string) reader[0]);
+                        }
                     }
-                }
-            });
+                });
 
-            return scripts.ToArray();
+                return scripts.ToArray();
+            }
+            else
+            {
+                Log().WriteInformation("Journal table does not exist");
+                return new string[0];
+            }
         }
 
         /// <summary>

diff --git a/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.Firebird.approved.txt b/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.Firebird.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
+DB Operation: Dispose command
 Info:         Creating the "schemaversions" table
 DB Operation: Execute non query command: CREATE TABLE "schemaversions"
 (
@@ -21,12 +28,6 @@ DB Operation: Execute non query command: CREATE TRIGGER BI_schemaversionsID FOR
 END;
 DB Operation: Dispose command
 Info:         The BI_schemaversionsID trigger has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select ScriptName from "schemaversions" order by ScriptName
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.MySql.approved.txt b/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.MySql.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'schemaversions'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'schemaversions'
+DB Operation: Dispose command
 Info:         Creating the `schemaversions` table
 DB Operation: Execute non query command: CREATE TABLE `schemaversions` 
 (
@@ -13,12 +20,6 @@ DB Operation: Execute non query command: CREATE TABLE `schemaversions`
 );
 DB Operation: Dispose command
 Info:         The `schemaversions` table has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select scriptname from `schemaversions` order by scriptname
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.PostgreSQL.approved.txt b/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.PostgreSQL.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'schemaversions'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'schemaversions'
+DB Operation: Dispose command
 Info:         Creating the "schemaversions" table
 DB Operation: Execute non query command: CREATE TABLE "schemaversions"
 (
@@ -13,12 +20,6 @@ DB Operation: Execute non query command: CREATE TABLE "schemaversions"
 )
 DB Operation: Dispose command
 Info:         The "schemaversions" table has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select ScriptName from "schemaversions" order by ScriptName
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.SQLite.approved.txt b/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.SQLite.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: SELECT count(name) FROM sqlite_master WHERE type = 'table' AND name = 'SchemaVersions'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: SELECT count(name) FROM sqlite_master WHERE type = 'table' AND name = 'SchemaVersions'
+DB Operation: Dispose command
 Info:         Creating the [SchemaVersions] table
 DB Operation: Execute non query command: CREATE TABLE [SchemaVersions] (
     SchemaVersionID INTEGER CONSTRAINT [PK_SchemaVersions_Id] PRIMARY KEY AUTOINCREMENT NOT NULL,
@@ -11,12 +18,6 @@ DB Operation: Execute non query command: CREATE TABLE [SchemaVersions] (
 )
 DB Operation: Dispose command
 Info:         The [SchemaVersions] table has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select [ScriptName] from [SchemaVersions] order by [ScriptName]
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.SqlCe.approved.txt b/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.SqlCe.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: SELECT count(*) FROM information_schema.tables WHERE table_name='SchemaVersions'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: SELECT count(*) FROM information_schema.tables WHERE table_name='SchemaVersions'
+DB Operation: Dispose command
 Info:         Creating the [SchemaVersions] table
 DB Operation: Execute non query command: create table [SchemaVersions] (
     [Id] int identity(1,1) not null constraint [PK_SchemaVersions_Id] primary key,
@@ -11,12 +18,6 @@ DB Operation: Execute non query command: create table [SchemaVersions] (
 )
 DB Operation: Dispose command
 Info:         The [SchemaVersions] table has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select [ScriptName] from [SchemaVersions] order by [ScriptName]
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.SqlServer.approved.txt b/src/dbup-tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.SqlServer.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'SchemaVersions'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'SchemaVersions'
+DB Operation: Dispose command
 Info:         Creating the [SchemaVersions] table
 DB Operation: Execute non query command: create table [SchemaVersions] (
     [Id] int identity(1,1) not null constraint [PK_SchemaVersions_Id] primary key,
@@ -11,12 +18,6 @@ DB Operation: Execute non query command: create table [SchemaVersions] (
 )
 DB Operation: Dispose command
 Info:         The [SchemaVersions] table has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select [ScriptName] from [SchemaVersions] order by [ScriptName]
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/...provalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.Firebird.approved.txt b/...provalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.Firebird.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'TestSchemaVersions'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'TestSchemaVersions'
+DB Operation: Dispose command
 Info:         Creating the "TestSchemaVersions" table
 DB Operation: Execute non query command: CREATE TABLE "TestSchemaVersions"
 (
@@ -21,12 +28,6 @@ DB Operation: Execute non query command: CREATE TRIGGER BI_TestSchemaVersionsID
 END;
 DB Operation: Dispose command
 Info:         The BI_TestSchemaVersionsID trigger has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select ScriptName from "TestSchemaVersions" order by ScriptName
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/.../ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.MySql.approved.txt b/.../ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.MySql.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'TestSchemaVersions' and TABLE_SCHEMA = 'test'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'TestSchemaVersions' and TABLE_SCHEMA = 'test'
+DB Operation: Dispose command
 Info:         Creating the `test`.`TestSchemaVersions` table
 DB Operation: Execute non query command: CREATE TABLE `test`.`TestSchemaVersions` 
 (
@@ -13,12 +20,6 @@ DB Operation: Execute non query command: CREATE TABLE `test`.`TestSchemaVersions
 );
 DB Operation: Dispose command
 Info:         The `test`.`TestSchemaVersions` table has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select scriptname from `test`.`TestSchemaVersions` order by scriptname
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/...ovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.PostgreSQL.approved.txt b/...ovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.PostgreSQL.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'TestSchemaVersions' and TABLE_SCHEMA = 'test'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'TestSchemaVersions' and TABLE_SCHEMA = 'test'
+DB Operation: Dispose command
 Info:         Creating the "test"."TestSchemaVersions" table
 DB Operation: Execute non query command: CREATE TABLE "test"."TestSchemaVersions"
 (
@@ -13,12 +20,6 @@ DB Operation: Execute non query command: CREATE TABLE "test"."TestSchemaVersions
 )
 DB Operation: Dispose command
 Info:         The "test"."TestSchemaVersions" table has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select ScriptName from "test"."TestSchemaVersions" order by ScriptName
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/...ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.SQLite.approved.txt b/...ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.SQLite.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: SELECT count(name) FROM sqlite_master WHERE type = 'table' AND name = 'TestSchemaVersions'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: SELECT count(name) FROM sqlite_master WHERE type = 'table' AND name = 'TestSchemaVersions'
+DB Operation: Dispose command
 Info:         Creating the [TestSchemaVersions] table
 DB Operation: Execute non query command: CREATE TABLE [TestSchemaVersions] (
     SchemaVersionID INTEGER CONSTRAINT [PK_TestSchemaVersions_Id] PRIMARY KEY AUTOINCREMENT NOT NULL,
@@ -11,12 +18,6 @@ DB Operation: Execute non query command: CREATE TABLE [TestSchemaVersions] (
 )
 DB Operation: Dispose command
 Info:         The [TestSchemaVersions] table has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select [ScriptName] from [TestSchemaVersions] order by [ScriptName]
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter

diff --git a/.../ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.SqlCe.approved.txt b/.../ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.SqlCe.approved.txt
@@ -3,6 +3,13 @@ Info:         Beginning database upgrade
 Info:         Checking whether journal table exists..
 DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'TestSchemaVersions' and TABLE_SCHEMA = 'test'
 DB Operation: Dispose command
+Info:         Journal table does not exist
+Info:         Executing Database Server script 'Script0001.sql'
+DB Operation: Execute non query command: script1contents
+DB Operation: Dispose command
+Info:         Checking whether journal table exists..
+DB Operation: Execute scalar command: select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'TestSchemaVersions' and TABLE_SCHEMA = 'test'
+DB Operation: Dispose command
 Info:         Creating the [test].[TestSchemaVersions] table
 DB Operation: Execute non query command: create table [test].[TestSchemaVersions] (
     [Id] int identity(1,1) not null constraint [PK_TestSchemaVersions_Id] primary key,
@@ -11,12 +18,6 @@ DB Operation: Execute non query command: create table [test].[TestSchemaVersions
 )
 DB Operation: Dispose command
 Info:         The [test].[TestSchemaVersions] table has been created
-Info:         Fetching list of already executed scripts.
-DB Operation: Execute reader command: select [ScriptName] from [test].[TestSchemaVersions] order by [ScriptName]
-DB Operation: Dispose command
-Info:         Executing Database Server script 'Script0001.sql'
-DB Operation: Execute non query command: script1contents
-DB Operation: Dispose command
 DB Operation: Create parameter
 Info:         DB Operation: Add parameter to command: scriptName=Script0001.sql
 DB Operation: Create parameter