Merge pull request #131 from dataplat/development

v0.7.1

Author: nvarscar

README.md

@@ -4,7 +4,7 @@
 
 # DBOps
 
-![dbops](https://sqlcollaborative.github.io/dbops/img/dbops.jpg)
+![dbops](docs/img/dbops.jpg)
 
 DBOps is a Powershell module that provides Continuous Integration/Continuous Deployment capabilities for SQL database deployments. In addition to easy-to-use deployment functions, it provides tracking functionality, ensuring that each script is deployed only once and in due order. It will also grant you with ability to organize scripts into builds and deploy them in a repeatable manner on top of any previously deployed version.
 
@@ -17,6 +17,7 @@ Currently supported RDBMS:
 * MySQL
 
 ## Features
+
 The most notable features of the module:
 
 * Reliably deploy your scripts in a consistent and repeatable manner
@@ -33,16 +34,20 @@ The most notable features of the module:
 * Powershell 5.0 or higher
 
 ## Installation
+
 ### Using git
+
 ```powershell
-git clone https://github.com/sqlcollaborative/dbops.git dbops
+git clone https://github.com/dataplat/dbops.git dbops
 Import-Module .\dbops
 ```
+
 Make sure to have the following modules installed as well:
 - [PSFramework](https://github.com/PowershellFrameworkCollective/psframework)
 - [ZipHelper](https://www.powershellgallery.com/packages/ziphelper) - only if you intend to run module tests
 
 ### Using PSGallery (Powershell 5+)
+
 ```powershell
 Install-Module dbops
 ```
@@ -56,6 +61,7 @@ Install-Module dbops
 * Versioned package deployment (e.g. Octopus Deployment)
 
 ## Examples
+
 ### Simple deployments and ad-hoc queries
 
 Perform plain-text script deployments using a single command:
@@ -72,9 +78,10 @@ Install-DBOScript -ScriptPath C:\temp\myscripts -SqlInstance server1 -Database M
 # Execute a list of files as an Ad-hoc query
 Get-ChildItem C:\temp\myscripts | Invoke-DBOQuery -SqlInstance server1 -Database MyDB
 ```
+
 ### Package management
 
-<img src="https://sqlcollaborative.github.io/dbops/img/dbops-package.jpg" alt="dbops packages" width="800"/>
+<img src="docs/img/dbops-package.jpg" alt="dbops packages" width="800"/>
 
 Each package consists of multiple builds and can be easily deployed to the database, ensuring that each build is deployed in proper order and only once.
 
@@ -99,6 +106,7 @@ Get-ChildItem .\myscripts | Add-DBOBuild Deploy.zip -Type New,Modified -Build 3.
 Expand-Archive Deploy.zip '.\MyTempFolder'
 .\MyTempFolder\Deploy.ps1 -SqlInstance server1 -Database MyDB
 ```
+
 ### Configurations and defaults
 
 There are multiple configuration options available, including:
@@ -140,7 +148,7 @@ Reset-DBODefaultSetting -Name SchemaVersionTable
 
 dbops CI/CD flow assumes that each package version is built only once and deployed onto every single environment. The successfull builds should make their way as artifacts into the artifact storage, from which they would be pulled again to add new builds into the package during the next iteration.
 
-<img src="https://sqlcollaborative.github.io/dbops/img/ci-cd-flow.jpg" alt="CI-CD flow" width="800"/>
+<img src="docs/img/ci-cd-flow.jpg" alt="CI-CD flow" width="800"/>
 
 CI/CD capabilities of the module enable user to integrate SQL scripts into a package file using a single command and to store packages in a versioned package repository.
 
@@ -172,5 +180,7 @@ Get-DBOPackageArtifact -Path myPackage.zip -Repository \\data\repo | Install-DBO
 * Optional rollback scripts
 
 ## Contacts
-Submitting issues - [GitHub issues](https://github.com/sqlcollaborative/dbops/issues)
-SQLCommunity Slack: https://sqlcommunity.slack.com #devops or @nvarscar
+
+Submitting issues - [GitHub issues](https://github.com/dataplat/dbops/issues)
+
+SQLCommunity Slack: https://sqlcommunity.slack.com #dbops or @nvarscar

appveyor.yml

@@ -2,6 +2,16 @@
 
 build: false
 version: 0.1.{build}
+only_commits:
+  files:
+    - bin/
+    - functions/
+    - internal/
+    - src/
+    - tests/
+    - appveyor.yml
+    - dbops.ps*
+    - build.cake
 
 #images
 

azure-main.yml

@@ -3,9 +3,12 @@ trigger:
     include:
     - main
   paths:
-    exclude:
-      - docs
-      - README.md
+    include:
+    - bin
+    - functions
+    - internal
+    - src
+    - dbops.ps*
 pr: none
 jobs:
 - job: cut_new_release_branch

azure-release.yml

@@ -21,7 +21,8 @@ jobs:
   - task: PowerShell@2
     displayName: Build libraries
     inputs:
-      filePath: .\build.ps1
+      filePath: .\build\build.ps1
+      arguments: -Script .\build.cake
   - task: PowerShell@2
     displayName: Copy libraries
     inputs:

docs/changelog.md

@@ -1,3 +1,5 @@
+# Release notes for v0.7.1:
+- ### Adding support for underscore char in tokens (#130) by @nvarscar
 # Release notes for v0.7.0:
 - ### Improving schema history table - new columns (#124) by @nvarscar
 # Release notes for v0.6.4:

internal/functions/Resolve-VariableToken.ps1

@@ -24,7 +24,7 @@
     foreach ($obj in $InputObject) {
         if ($obj -is [string]) {
             $output = $obj
-            foreach ($token in (Get-VariableToken -InputString $obj -RegexString $TokenRegex.Replace('token', '[a-zA-Z0-9\-.]+'))) {
+            foreach ($token in (Get-VariableToken -InputString $obj -RegexString $TokenRegex.Replace('token', '[a-zA-Z0-9_\-.]+'))) {
                 #Replace variables found in the config
                 $tokenRegExString = $TokenRegex.Replace('token', [Regex]::Escape($token))
                 if ($Runtime) {

tests/Invoke-DBOQuery.Tests.ps1

@@ -140,8 +140,8 @@ Describe "Invoke-DBOQuery tests" -Tag $commandName, IntegrationTests {
         }
         It "should run the query with custom variables and custom token template" {
             Set-PSFConfig -FullName dbops.config.variabletoken -Value '\$(token)\$'
-            $query = "SELECT '`$Test`$' AS A, '`$Test2`$' AS B UNION ALL SELECT '3' AS A, '4' AS B"
-            $result = Invoke-DBOQuery -Query $query -SqlInstance $script:mssqlInstance -Credential $script:mssqlCredential -As DataTable -Variables @{ Test = '1'; Test2 = '2' }
+            $query = "SELECT '`$Test`$' AS A, '`$Test_2.1-3`$' AS B UNION ALL SELECT '3' AS A, '4' AS B"
+            $result = Invoke-DBOQuery -Query $query -SqlInstance $script:mssqlInstance -Credential $script:mssqlCredential -As DataTable -Variables @{ Test = '1'; "Test_2.1-3" = '2' }
             $result.A | Should -Be '1', '3'
             $result.B | Should -Be '2', '4'
             (Get-PSFConfig -FullName dbops.config.variabletoken).ResetValue()

tests/Update-DBOSchemaTable.Tests.ps1

@@ -57,7 +57,7 @@ Describe "Update-DBOSchemaTable integration tests" -Tag $commandName, Integratio
 
             #Verifying SchemaVersions table
             $testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f 'SchemaVersions')
-            $testResults.column_name | Should -Be @('Id', 'ScriptName', 'Applied', 'Checksum', 'AppliedBy', 'ExecutionTime')
+            $testResults.column_name | Should -BeIn @('Id', 'ScriptName', 'Applied', 'Checksum', 'AppliedBy', 'ExecutionTime')
         }
         It "upgrade custom schema table" {
             $null = Invoke-DBOQuery @connParams -Database $newDbName -Query ($schemaTableQuery -f $logTable)
@@ -66,7 +66,7 @@ Describe "Update-DBOSchemaTable integration tests" -Tag $commandName, Integratio
             $result | Should -BeNullOrEmpty
 
             $testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)
-            $testResults.column_name | Should -Be @('Id', 'ScriptName', 'Applied', 'Checksum', 'AppliedBy', 'ExecutionTime')
+            $testResults.column_name | Should -BeIn @('Id', 'ScriptName', 'Applied', 'Checksum', 'AppliedBy', 'ExecutionTime')
         }
     }
     Context  "$commandName whatif tests" {
@@ -77,7 +77,7 @@ Describe "Update-DBOSchemaTable integration tests" -Tag $commandName, Integratio
             $result | Should -BeNullOrEmpty
 
             $testResults = Invoke-DBOQuery @connParams -Database $newDbName -Query ($verificationQuery -f $logTable)
-            $testResults.column_name | Should -Be @('Id', 'ScriptName', 'Applied')
+            $testResults.column_name | Should -BeIn @('Id', 'ScriptName', 'Applied')
         }
     }
 }

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')
         }
     }
 }

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')
         }
     }
 }