updating column names validation for other DBMS

nvarscar · nvarscar · commit 27ccc05a8269 · 2022-01-29T16:30:41.000-08:00
diff --git a/tests/mysql/Update-DBOSchemaTable.Tests.ps1 b/tests/mysql/Update-DBOSchemaTable.Tests.ps1
@@ -61,7 +61,7 @@ Describe "Update-DBOSchemaTable MySQL integration tests" -Tag $commandName, Inte
 
             #Verifying SchemaVersions table
             $testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f 'SchemaVersions')
-            $testResults.column_name | Should -Be @('schemaversionid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')
+            $testResults.column_name | Should -BeIn @('schemaversionid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')
         }
         It "upgrade custom schema table" {
             $null = Invoke-DBOQuery @connParams -Database $newDbName -Query ($schemaTableQuery -f $logTable)
@@ -70,7 +70,7 @@ Describe "Update-DBOSchemaTable MySQL integration tests" -Tag $commandName, Inte
             $result | Should -BeNullOrEmpty
 
             $testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)
-            $testResults.column_name | Should -Be @('schemaversionid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')
+            $testResults.column_name | Should -BeIn @('schemaversionid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')
         }
     }
     Context  "$commandName whatif tests" {
@@ -81,7 +81,7 @@ Describe "Update-DBOSchemaTable MySQL integration tests" -Tag $commandName, Inte
             $result | Should -BeNullOrEmpty
 
             $testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)
-            $testResults.column_name | Should -Be @('schemaversionid', 'scriptname', 'applied')
+            $testResults.column_name | Should -BeIn @('schemaversionid', 'scriptname', 'applied')
         }
     }
 }
diff --git a/tests/oracle/Update-DBOSchemaTable.Tests.ps1 b/tests/oracle/Update-DBOSchemaTable.Tests.ps1
@@ -91,7 +91,7 @@ Describe "Update-DBOSchemaTable Oracle integration tests" -Tag $commandName, Int
 
             #Verifying SchemaVersions table
             $testResults = Invoke-DBOQuery @connParams -Query ($verificationQuery -f 'SCHEMAVERSIONS')
-            $testResults.COLUMN_NAME | Should -Be @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED', 'CHECKSUM', 'APPLIEDBY', 'EXECUTIONTIME')
+            $testResults.COLUMN_NAME | Should -BeIn @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED', 'CHECKSUM', 'APPLIEDBY', 'EXECUTIONTIME')
         }
         It "upgrade custom schema table" {
             $null = Invoke-DBOQuery @connParams -Query ($schemaTableQuery -f $logTable)
@@ -100,7 +100,7 @@ Describe "Update-DBOSchemaTable Oracle integration tests" -Tag $commandName, Int
             $result | Should -BeNullOrEmpty
 
             $testResults = Invoke-DBOQuery @connParams -Query ($verificationQuery -f $logTable)
-            $testResults.COLUMN_NAME | Should -Be @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED', 'CHECKSUM', 'APPLIEDBY', 'EXECUTIONTIME')
+            $testResults.COLUMN_NAME | Should -BeIn @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED', 'CHECKSUM', 'APPLIEDBY', 'EXECUTIONTIME')
         }
     }
     Context  "$commandName whatif tests" {
@@ -111,7 +111,7 @@ Describe "Update-DBOSchemaTable Oracle integration tests" -Tag $commandName, Int
             $result | Should -BeNullOrEmpty
 
             $testResults = Invoke-DBOQuery @connParams -Query ($verificationQuery -f $logTable)
-            $testResults.COLUMN_NAME | Should -Be @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED')
+            $testResults.COLUMN_NAME | Should -BeIn @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED')
         }
     }
 }
diff --git a/tests/postgresql/Update-DBOSchemaTable.Tests.ps1 b/tests/postgresql/Update-DBOSchemaTable.Tests.ps1
@@ -65,7 +65,7 @@ Describe "Update-DBOSchemaTable Postgresql integration tests" -Tag $commandName,
 
             #Verifying SchemaVersions table
             $testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f 'SchemaVersions')
-            $testResults.column_name | Should -Be @('schemaversionsid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')
+            $testResults.column_name | Should -BeIn @('schemaversionsid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')
         }
         It "upgrade custom schema table" {
             $null = Invoke-DBOQuery @connParams -Database $newDbName -Query ($schemaTableQuery -f $logTable)
@@ -74,7 +74,7 @@ Describe "Update-DBOSchemaTable Postgresql integration tests" -Tag $commandName,
             $result | Should -BeNullOrEmpty
 
             $testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)
-            $testResults.column_name | Should -Be @('schemaversionsid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')
+            $testResults.column_name | Should -BeIn @('schemaversionsid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')
         }
     }
     Context  "$commandName whatif tests" {
@@ -85,7 +85,7 @@ Describe "Update-DBOSchemaTable Postgresql integration tests" -Tag $commandName,
             $result | Should -BeNullOrEmpty
 
             $testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)
-            $testResults.column_name | Should -Be @('schemaversionsid', 'scriptname', 'applied')
+            $testResults.column_name | Should -BeIn @('schemaversionsid', 'scriptname', 'applied')
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ Describe "Update-DBOSchemaTable MySQL integration tests" -Tag $commandName, Inte`
`61`	`61`
`62`	`62`	`#Verifying SchemaVersions table`
`63`	`63`	`$testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f 'SchemaVersions')`
`64`		`- $testResults.column_name \| Should -Be @('schemaversionid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')`
	`64`	`+ $testResults.column_name \| Should -BeIn @('schemaversionid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')`
`65`	`65`	`}`
`66`	`66`	`It "upgrade custom schema table" {`
`67`	`67`	`$null = Invoke-DBOQuery @connParams -Database $newDbName -Query ($schemaTableQuery -f $logTable)`
`@@ -70,7 +70,7 @@ Describe "Update-DBOSchemaTable MySQL integration tests" -Tag $commandName, Inte`
`70`	`70`	`$result \| Should -BeNullOrEmpty`
`71`	`71`
`72`	`72`	`$testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)`
`73`		`- $testResults.column_name \| Should -Be @('schemaversionid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')`
	`73`	`+ $testResults.column_name \| Should -BeIn @('schemaversionid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`Context "$commandName whatif tests" {`
`@@ -81,7 +81,7 @@ Describe "Update-DBOSchemaTable MySQL integration tests" -Tag $commandName, Inte`
`81`	`81`	`$result \| Should -BeNullOrEmpty`
`82`	`82`
`83`	`83`	`$testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)`
`84`		`- $testResults.column_name \| Should -Be @('schemaversionid', 'scriptname', 'applied')`
	`84`	`+ $testResults.column_name \| Should -BeIn @('schemaversionid', 'scriptname', 'applied')`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ Describe "Update-DBOSchemaTable Oracle integration tests" -Tag $commandName, Int`
`91`	`91`
`92`	`92`	`#Verifying SchemaVersions table`
`93`	`93`	`$testResults = Invoke-DBOQuery @connParams -Query ($verificationQuery -f 'SCHEMAVERSIONS')`
`94`		`- $testResults.COLUMN_NAME \| Should -Be @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED', 'CHECKSUM', 'APPLIEDBY', 'EXECUTIONTIME')`
	`94`	`+ $testResults.COLUMN_NAME \| Should -BeIn @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED', 'CHECKSUM', 'APPLIEDBY', 'EXECUTIONTIME')`
`95`	`95`	`}`
`96`	`96`	`It "upgrade custom schema table" {`
`97`	`97`	`$null = Invoke-DBOQuery @connParams -Query ($schemaTableQuery -f $logTable)`
`@@ -100,7 +100,7 @@ Describe "Update-DBOSchemaTable Oracle integration tests" -Tag $commandName, Int`
`100`	`100`	`$result \| Should -BeNullOrEmpty`
`101`	`101`
`102`	`102`	`$testResults = Invoke-DBOQuery @connParams -Query ($verificationQuery -f $logTable)`
`103`		`- $testResults.COLUMN_NAME \| Should -Be @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED', 'CHECKSUM', 'APPLIEDBY', 'EXECUTIONTIME')`
	`103`	`+ $testResults.COLUMN_NAME \| Should -BeIn @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED', 'CHECKSUM', 'APPLIEDBY', 'EXECUTIONTIME')`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`Context "$commandName whatif tests" {`
`@@ -111,7 +111,7 @@ Describe "Update-DBOSchemaTable Oracle integration tests" -Tag $commandName, Int`
`111`	`111`	`$result \| Should -BeNullOrEmpty`
`112`	`112`
`113`	`113`	`$testResults = Invoke-DBOQuery @connParams -Query ($verificationQuery -f $logTable)`
`114`		`- $testResults.COLUMN_NAME \| Should -Be @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED')`
	`114`	`+ $testResults.COLUMN_NAME \| Should -BeIn @('SCHEMAVERSIONID', 'SCRIPTNAME', 'APPLIED')`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ Describe "Update-DBOSchemaTable Postgresql integration tests" -Tag $commandName,`
`65`	`65`
`66`	`66`	`#Verifying SchemaVersions table`
`67`	`67`	`$testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f 'SchemaVersions')`
`68`		`- $testResults.column_name \| Should -Be @('schemaversionsid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')`
	`68`	`+ $testResults.column_name \| Should -BeIn @('schemaversionsid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')`
`69`	`69`	`}`
`70`	`70`	`It "upgrade custom schema table" {`
`71`	`71`	`$null = Invoke-DBOQuery @connParams -Database $newDbName -Query ($schemaTableQuery -f $logTable)`
`@@ -74,7 +74,7 @@ Describe "Update-DBOSchemaTable Postgresql integration tests" -Tag $commandName,`
`74`	`74`	`$result \| Should -BeNullOrEmpty`
`75`	`75`
`76`	`76`	`$testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)`
`77`		`- $testResults.column_name \| Should -Be @('schemaversionsid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')`
	`77`	`+ $testResults.column_name \| Should -BeIn @('schemaversionsid', 'scriptname', 'applied', 'checksum', 'appliedby', 'executiontime')`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`Context "$commandName whatif tests" {`
`@@ -85,7 +85,7 @@ Describe "Update-DBOSchemaTable Postgresql integration tests" -Tag $commandName,`
`85`	`85`	`$result \| Should -BeNullOrEmpty`
`86`	`86`
`87`	`87`	`$testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)`
`88`		`- $testResults.column_name \| Should -Be @('schemaversionsid', 'scriptname', 'applied')`
	`88`	`+ $testResults.column_name \| Should -BeIn @('schemaversionsid', 'scriptname', 'applied')`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`