Merge pull request #59 from sqlcollaborative/development

v0.5

Author: nvarscar

appveyor.yml

@@ -3,39 +3,77 @@
 build: false
 version: 0.1.{build}
 
+#images
+
+image:
+  - Ubuntu1804
+  - Visual Studio 2017
+
 # Set build info
 environment:
   environment: development
   version: 0.1.$(appveyor_build_number)
-  
+  PGUSER: postgres
+  PGPASSWORD: Password12!
+
   matrix:
-    # - scenario: MSSQL
-    #   main_instance: localhost\SQL2017
-    #   services:
-    #     - mssql2017
-    - scenario: ALL
-      # main_instance: localhost\SQL2017
-
-#Configure services
-services:
-  - mssql2017
-  
-# Set alternative clone folder
-clone_folder: c:\github\dbops
+  - scenario: all
+#  - scenario: mysql
 
-before_test:
-  # run preparation scripts
-  - ps: .\Tests\appveyor.prep.ps1
- 
-test_script:
-   # Test with native PS version
-  - ps: .\Tests\appveyor.pester.ps1
 
-  # Collecting results
-  - ps: .\Tests\appveyor.pester.ps1 -Finalize
+for:
+  - matrix:
+      only:
+        - image: Visual Studio 2017
+          #scenario: all
+    environment:
+        mssql_instance: localhost\SQL2017
+        scenario: windows
+    services:
+      - mssql2017
+      - mysql
+      - postgresql
+    before_test:
+      - SET PATH=C:\Program Files\PostgreSQL\9.6\bin\;%PATH%
+      - psql -c "CREATE USER sa WITH PASSWORD 'Password12!';" -U postgres
+      - psql -c "ALTER USER sa WITH SUPERUSER;" -U postgres
+      - ps: .\tests\appveyor.prep.ps1
+
+  - matrix:
+      only:
+        - image: Ubuntu1804
+          scenario: all
+    environment:
+        mssql_instance: localhost
+    services:
+      - mssql
+      - mysql
+      - postgresql
+    before_test:
+      - sudo -u postgres psql -c "CREATE USER sa WITH PASSWORD 'Password12!';"
+      - sudo -u postgres psql -c "ALTER USER sa WITH SUPERUSER;"
+      - ps: .\tests\appveyor.prep.ps1
+      - docker run --name dbops-oracle -d -p 1521:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
+
+# before_test:
+#   # run preparation scripts
+#   - ps: .\tests\appveyor.prep.ps1
+#   # create postres user
 
+
+test_script:
+  # Test with native PS version
+  - ps: .\tests\appveyor.pester.ps1
+  # Collecting results
+  - ps: .\tests\appveyor.pester.ps1 -Finalize
 after_test:
-  - ps: .\Tests\appveyor.post.ps1
+  - ps: .\tests\appveyor.post.ps1
+
+
+# Set alternative clone folder
+#clone_folder: c:\github\dbops
+
+
 
 #on_finish:
 #  - ps:

bin/dbup-core.dll

@@ -1,4 +1,5 @@
-[CmdletBinding(SupportsShouldProcess = $true)]
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSShouldProcess", "")]
+[CmdletBinding(SupportsShouldProcess)]
 Param (
     [Alias('Server', 'SqlServer', 'DBServer', 'Instance')]
     [string]$SqlInstance,
@@ -20,13 +21,14 @@ Param (
     [switch]$Append,
     [Alias('Config')]
     [object]$Configuration,
+    [string[]]$Build,
     [string]$Schema,
     [switch]$CreateDatabase,
     [AllowNull()]
     [string]$ConnectionString,
-    [ValidateSet('SQLServer', 'Oracle')]
-    [Alias('Type', 'ServerType')]
-    [string]$ConnectionType = 'SQLServer'
+    [ValidateSet('SqlServer', 'Oracle', 'MySQL', 'PostgreSQL')]
+    [Alias('ConnectionType', 'ServerType')]
+    [string]$Type = 'SQLServer'
 )
 
 #Import module
@@ -37,22 +39,23 @@ If (-not (Get-Module dbops)) {
 
 $config = Get-DBOConfig -Path "$PSScriptRoot\dbops.config.json" -Configuration $Configuration
 
-#Convert custom parameters into a package configuration, excluding variables
+#Merge custom parameters into a configuration
+$newConfig = @{}
 foreach ($key in ($PSBoundParameters.Keys)) {
-    if ($key -in [DBOpsConfigProperty].GetEnumNames() -and $key -ne 'Variables') {
-        Write-PSFMessage -Level Debug -Message "Overriding parameter $key with $($PSBoundParameters[$key])"
-        $config.SetValue($key, $PSBoundParameters[$key])
+    if ($key -in [DBOpsConfig]::EnumProperties()) {
+        $newConfig.$key = $PSBoundParameters[$key]
     }
 }
+$config.Merge($newConfig)
 
 #Prepare deployment function call parameters
 $params = @{
-    PackageFile = "$PSScriptRoot\dbops.package.json"
+    PackageFile   = "$PSScriptRoot\dbops.package.json"
     Configuration = $config
 }
 foreach ($key in ($PSBoundParameters.Keys)) {
     #If any custom properties were specified
-    if ($key -in @('OutputFile', 'Append', 'Variables', 'ConnectionType')) {
+    if ($key -in @('OutputFile', 'Append', 'Type', 'Build')) {
         $params += @{ $key = $PSBoundParameters[$key] }
     }
 }