Using inherited class instead of workarounds - journals

Author: nvarscar

functions/Invoke-DBODeployment.ps1

@@ -159,11 +159,6 @@
         $connString = $csBuilder.ToString()
         $dbUpConnection = Get-ConnectionManager -ConnectionString $connString -Type $Type
 
-        # MySQL workaround: define schema if not specified, bc schema = database
-        if ($Type -eq 'MySQL' -and -not $config.Schema) {
-            $config.SetValue('Schema', $csBuilder.Database)
-        }
-
         # Create DbUpBuilder based on the connection
         $dbUp = Get-DbUpBuilder -Connection $dbUpConnection -Type $Type
 

internal/classes/DBOpsMySqlTableJournal.class.ps1

@@ -0,0 +1,13 @@
+class DBOpsMySqlTableJournal : DbUp.MySql.MySqlTableJournal {
+    # Constructors
+    DBOpsMySqlTableJournal([Func[DbUp.Engine.Transactions.IConnectionManager]] $connectionManager, [Func[DbUp.Engine.Output.IUpgradeLog]] $logger, [string] $schema, [string] $table) :base($connectionManager, $logger, $schema, $table) {}
+    # Overriding DoesTalbeExist method to get the proper schema table when schemaversiontable name is not specified
+    [string] DoesTableExistSql() {
+        if ($this.SchemaTableSchema) {
+            return "select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = '{0}' and TABLE_SCHEMA = '{1}'" -f $this.UnquotedSchemaTableName, $this.SchemaTableSchema
+        }
+        else {
+            return "select 1 from INFORMATION_SCHEMA.TABLES where TABLE_NAME = '{0}' and TABLE_SCHEMA = DATABASE()" -f $this.UnquotedSchemaTableName
+        }
+    }
+}

internal/functions/Get-DbUpJournal.ps1

@@ -37,7 +37,7 @@ function Get-DbUpJournal {
             $dbUpJournalType = [DbUp.Oracle.OracleTableJournal]
         }
         elseif ($Type -eq [DBOps.ConnectionType]::MySQL) {
-            $dbUpJournalType = [DbUp.MySql.MySqlTableJournal]
+            $dbUpJournalType = [DBOpsMySqlTableJournal]
         }
         elseif ($Type -eq [DBOps.ConnectionType]::PostgreSQL) {
             $dbUpJournalType = [DbUp.Postgresql.PostgresqlTableJournal]

internal/json/dbops.json

@@ -60,7 +60,8 @@
         "internal\\classes\\DBOps.class.ps1",
         "internal\\classes\\DBOpsDeploymentStatus.class.ps1",
         "internal\\classes\\DBOpsLog.class.ps1",
-        "internal\\classes\\DBOpsScriptComparer.class.ps1"
+        "internal\\classes\\DBOpsScriptComparer.class.ps1",
+        "internal\\classes\\DBOpsMySqlTableJournal.class.ps1"
     ],
     "Core": [
         "internal\\json\\dbops.json",

tests/mysql/Install-DBOPackage.Tests.ps1

@@ -201,7 +201,7 @@ Describe "Install-DBOSqlScript MySQL integration tests" -Tag $commandName, Integ
             'd' | Should BeIn $testResults.name
             #Verifying order
             $r1 = Invoke-DBOQuery -Type MySQL -SqlInstance $script:mysqlInstance -Silent -Credential $script:mysqlCredential -Database $newDbName -Query "SELECT scriptname FROM $logtable ORDER BY schemaversionid"
-            $r1.ScriptName | Should Be (Get-Item $v2scripts, $v1scripts).FullName
+            $r1.scriptname | Should Be (Get-Item $v2scripts, $v1scripts).FullName
         }
     }
     Context "testing timeouts" {

tests/mysql/Install-DBOSqlScript.Tests.ps1

@@ -75,8 +75,8 @@ Describe "Register-DBOPackage MySQL integration tests" -Tag $commandName, Integr
             'd' | Should Not BeIn $testResults.name
 
             #Verifying SchemaVersions table
-            $testResults = Invoke-DBOQuery -Type MySQL -SqlInstance $script:mysqlInstance -Silent -Credential $script:mysqlCredential -Database $newDbName -Query "SELECT * FROM $logTable"
-            $testResults.ScriptName | Should Be (@($v1Journal) + @($v2Journal))
+            $testResults = Invoke-DBOQuery -Type MySQL -SqlInstance $script:mysqlInstance -Silent -Credential $script:mysqlCredential -Database $newDbName -Query "SELECT * FROM $logTable ORDER BY schemaversionid"
+            $testResults.scriptname | Should Be (@($v1Journal) + @($v2Journal))
         }
     }
     Context "testing registration of scripts" {
@@ -114,8 +114,8 @@ Describe "Register-DBOPackage MySQL integration tests" -Tag $commandName, Integr
             ($testResults | Measure-Object).Count | Should Be ($rowsBefore + 1)
 
             #Verifying SchemaVersions table
-            $testResults = Invoke-DBOQuery -Type MySQL -SqlInstance $script:mysqlInstance -Silent -Credential $script:mysqlCredential -Database $newDbName -Query "SELECT * FROM $logTable"
-            $testResults.ScriptName | Should Be $v1Journal
+            $testResults = Invoke-DBOQuery -Type MySQL -SqlInstance $script:mysqlInstance -Silent -Credential $script:mysqlCredential -Database $newDbName -Query "SELECT * FROM $logTable ORDER BY schemaversionid"
+            $testResults.scriptname | Should Be $v1Journal
         }
         It "should register version 1.0 + 2.0 without creating any objects" {
             $before = Invoke-DBOQuery -Type MySQL -SqlInstance $script:mysqlInstance -Silent -Credential $script:mysqlCredential -Database $newDbName -InputFile $verificationScript
@@ -145,8 +145,8 @@ Describe "Register-DBOPackage MySQL integration tests" -Tag $commandName, Integr
             ($testResults | Measure-Object).Count | Should Be $rowsBefore
 
             #Verifying SchemaVersions table
-            $testResults = Invoke-DBOQuery -Type MySQL -SqlInstance $script:mysqlInstance -Silent -Credential $script:mysqlCredential -Database $newDbName -Query "SELECT * FROM $logTable"
-            $testResults.ScriptName | Should Be (@($v1Journal) + @($v2Journal))
+            $testResults = Invoke-DBOQuery -Type MySQL -SqlInstance $script:mysqlInstance -Silent -Credential $script:mysqlCredential -Database $newDbName -Query "SELECT * FROM $logTable ORDER BY schemaversionid"
+            $testResults.scriptname | Should Be (@($v1Journal) + @($v2Journal))
         }
     }
     Context  "$commandName whatif tests" {