Merge pull request #13 from max-ieremenko/release/3.0

Release/3.0
max-ieremenko · May 27, 2021 · 6a259d2 · 6a259d2
2 parents 0d845bb + 6233a1e
commit 6a259d2
Show file tree

Hide file tree

Showing 387 changed files with 6,161 additions and 2,391 deletions.
diff --git a/Build/build-scripts.ps1 b/Build/build-scripts.ps1
@@ -81,9 +81,74 @@ function Wait-Mssql($connectionString) {
                 Start-Sleep -Seconds 1
             }
         }
+
+        $connection.Open()
     }
     finally {
         $connection.Dispose()
     }
 }
 
+function Start-Pgsql {
+    $npgsqldll = Join-Path $env:USERPROFILE ".nuget\packages\npgsql\4.0.11\lib\netstandard2.0\Npgsql.dll"
+    Add-Type -Path $npgsqldll
+
+    $containerId = exec { 
+        docker run `
+            -d `
+            -p 5432 `
+            sqldatabase/postgres:13.3
+    }
+
+    $ip = exec { 
+        docker inspect `
+            --format "{{.NetworkSettings.Networks.bridge.IPAddress}}"  `
+            $containerId
+    }
+
+    $port = exec { 
+        docker inspect `
+            --format "{{(index (index .NetworkSettings.Ports \""5432/tcp\"") 0).HostPort}}"  `
+            $containerId
+    }
+
+    $builder = New-Object -TypeName Npgsql.NpgsqlConnectionStringBuilder
+    $builder["Database"] = "sqldatabasetest"
+    $builder["Username"] = "postgres"
+    $builder["Password"] = "qwerty"
+    $builder["Timeout"] = 5
+
+    $builder.Host = "localhost"
+    $builder.Port = $port.ToString()
+    $connectionString = $builder.ToString()
+
+    $builder.Host = $ip.ToString()
+    $builder.Port = 5432
+    $remoteConnectionString = $builder.ToString()
+
+    return @{
+        containerId            = $containerId
+        connectionString       = $connectionString
+        remoteConnectionString = $remoteConnectionString
+    }
+}
+
+function Wait-Pgsql($connectionString) {
+    $connection = New-Object -TypeName Npgsql.NpgsqlConnection -ArgumentList $connectionString
+    try {
+        for ($i = 0; $i -lt 20; $i++) {
+            try {
+                $connection.Open()
+                return
+            }
+            catch {
+                Start-Sleep -Seconds 1
+            }
+        }
+
+        $connection.Open()
+    }
+    finally {
+        $connection.Dispose()
+    }
+}
diff --git a/Build/build-tasks.it-linux.ps1 b/Build/build-tasks.it-linux.ps1
@@ -1,20 +1,21 @@
 param(
-    $settings,
-    $targetFramework,
-    $image
+    $settings
+    , $targetFramework
+    , $database
+    , $image
 )
 
-task Test RunMssql, UnZip, RunTest
+task Test StartDatabase, UnZip, RunTest
 
 . .\build-scripts.ps1
 
-$mssqlContainerId = ""
+$containerId = ""
 $connectionString = ""
 $remoteConnectionString = ""
 $tempDir = Join-Path $settings.bin ([Guid]::NewGuid().ToString())
 
 Enter-Build {
-    Write-Output "$image"
+    Write-Output "$database on $targetFramework on $image"
 }
 
 task UnZip {
@@ -24,21 +25,21 @@ task UnZip {
     Expand-Archive -Path $package -DestinationPath $tempDir
 }
 
-task RunMssql {
-    $info = Start-Mssql
+task StartDatabase {
+    $info = & "Start-$database"
 
-    $script:mssqlContainerId = $info.containerId
+    $script:containerId = $info.containerId
     $script:remoteConnectionString = $info.remoteConnectionString
     $script:connectionString = $info.connectionString
 
     Write-Output $connectionString
 }
 
 task RunTest {
-    Wait-Mssql $info.connectionString
+    & "Wait-$database" $connectionString
 
     $app = $tempDir + ":/app"
-    $test = $settings.integrationTests + ":/test"
+    $test = (Join-Path $settings.integrationTests $database) + ":/test"
 
     exec {
         docker run --rm `
@@ -57,7 +58,7 @@ Exit-Build {
         Remove-Item -Path $tempDir -Force -Recurse
     }
 
-    if ($mssqlContainerId) {
-        exec { docker container rm -f $mssqlContainerId } | Out-Null
+    if ($containerId) {
+        exec { docker container rm -f $containerId } | Out-Null
     }
 }
diff --git a/Build/build-tasks.it-ps-core.ps1 b/Build/build-tasks.it-ps-core.ps1
@@ -1,32 +1,33 @@
 param(
-    $settings,
-    $image
+    $settings
+    , $database
+    , $image
 )
 
-task Test RunMssql, RunTest
+task Test StartDatabase, RunTest
 
 . .\build-scripts.ps1
 
-$mssqlContainerId = ""
+$containerId = ""
 $connectionString = ""
 
 Enter-Build {
-    Write-Output "$image"
+    Write-Output "$database on $image"
 }
 
-task RunMssql {
-    $info = Start-Mssql
+task StartDatabase {
+    $info = & "Start-$database"
 
-    $script:mssqlContainerId = $info.containerId
+    $script:containerId = $info.containerId
     $script:connectionString = $info.remoteConnectionString
 
     Write-Output $connectionString
-    Wait-Mssql $info.connectionString
+    & "Wait-$database" $info.connectionString
 }
 
 task RunTest {
     $app = $settings.artifactsPowerShell + ":/root/.local/share/powershell/Modules/SqlDatabase"
-    $test = $settings.integrationTests + ":/test"
+    $test = (Join-Path $settings.integrationTests $database) + ":/test"
 
     exec {
         docker run --rm `
@@ -39,7 +40,7 @@ task RunTest {
 }
 
 Exit-Build {
-    if ($mssqlContainerId) {
-        exec { docker container rm -f $mssqlContainerId } | Out-Null
+    if ($containerId) {
+        exec { docker container rm -f $containerId } | Out-Null
     }
 }
diff --git a/Build/build-tasks.it-ps-desktop.ps1 b/Build/build-tasks.it-ps-desktop.ps1
@@ -2,12 +2,14 @@ param(
     $settings
 )
 
-task Test RunMssql, CopyModule, PublishModule, RunTest
+task Test RunContainers, CopyModule, PublishModule, RunTest
 
 . .\build-scripts.ps1
 
 $mssqlContainerId = ""
-$connectionString = ""
+$mssqlConnectionString = ""
+$pgsqlContainerId = ""
+$pgsqlConnectionString = ""
 $testDir = Join-Path ([Environment]::GetFolderPath("MyDocuments")) "WindowsPowerShell\modules\SqlDatabase"
 
 task CopyModule {
@@ -25,23 +27,30 @@ task PublishModule {
     exec { powershell -NoLogo -Command "$command" }
 }
 
-task RunMssql {
+task RunContainers {
     $info = Start-Mssql
-
     $script:mssqlContainerId = $info.containerId
-    $script:connectionString = $info.connectionString
+    $script:mssqlConnectionString = $info.connectionString
+    Write-Output $mssqlConnectionString
 
-    Write-Output $connectionString
+    $info = Start-Pgsql
+    $script:pgsqlContainerId = $info.containerId
+    $script:pgsqlConnectionString = $info.connectionString
+    Write-Output $pgsqlConnectionString
 }
 
 task RunTest {
-    Wait-Mssql $connectionString
-
-    $env:connectionString = $connectionString
+    Wait-Mssql $mssqlConnectionString
+    Wait-Pgsql $pgsqlConnectionString
 
-    $testScript = Join-Path $settings.integrationTests "TestPowerShell.ps1"
+    $env:connectionString = $mssqlConnectionString
+    $testScript = Join-Path $settings.integrationTests "MsSql\TestPowerShell.ps1"
     $command = ". $testScript"
+    exec { powershell -NoLogo -Command "$command" }
 
+    $env:connectionString = $pgsqlConnectionString
+    $testScript = Join-Path $settings.integrationTests "PgSql\TestPowerShell.ps1"
+    $command = ". $testScript"
     exec { powershell -NoLogo -Command "$command" }
 }
 
@@ -50,7 +59,5 @@ Exit-Build {
         Remove-Item -Path $testDir -Force -Recurse
     }
 
-    if ($mssqlContainerId) {
-        exec { docker container rm -f $mssqlContainerId } | Out-Null
-    }
+    exec { docker container rm -f $mssqlContainerId $pgsqlContainerId } | Out-Null
 }
diff --git a/Build/build-tasks.it-tool-linux.ps1 b/Build/build-tasks.it-tool-linux.ps1
@@ -1,34 +1,35 @@
 param(
-    $settings,
-    $image
+    $settings
+    , $database
+    , $image
 )
 
-task Test RunMssql, RunTest
+task Test StartDatabase, RunTest
 
 . .\build-scripts.ps1
 
-$mssqlContainerId = ""
+$containerId = ""
 $connectionString = ""
 
 Enter-Build {
-    Write-Output "$image"
+    Write-Output "$database on $image"
 }
 
-task RunMssql {
-    $info = Start-Mssql
+task StartDatabase {
+    $info = & "Start-$database"
 
-    $script:mssqlContainerId = $info.containerId
+    $script:containerId = $info.containerId
     $script:connectionString = $info.remoteConnectionString
 
     Write-Output $connectionString
-    Wait-Mssql $info.connectionString
+    & "Wait-$database" $info.connectionString
 }
 
 task RunTest {
     $packageVersion = $settings.version
     $packageName = "SqlDatabase.GlobalTool.$packageVersion.nupkg"
     $app = (Join-Path $settings.artifacts $packageName) + ":/app/$packageName"
-    $test = $settings.integrationTests + ":/test"
+    $test = (Join-Path $settings.integrationTests $database) + ":/test"
 
     exec {
         docker run --rm `
@@ -44,7 +45,7 @@ task RunTest {
 }
 
 Exit-Build {
-    if ($mssqlContainerId) {
-        exec { docker container rm -f $mssqlContainerId } | Out-Null
+    if ($containerId) {
+        exec { docker container rm -f $containerId } | Out-Null
     }
 }
diff --git a/Build/build-tasks.it-win.ps1 b/Build/build-tasks.it-win.ps1
@@ -1,13 +1,14 @@
 param(
-    $settings,
-    $targetFramework
+    $settings
+    , $targetFramework
+    , $database
 )
 
-task Test RunMssql, UnZip, RunTest
+task Test StartDatabase, UnZip, RunTest
 
 . .\build-scripts.ps1
 
-$mssqlContainerId = ""
+$containerId = ""
 $connectionString = ""
 $tempDir = Join-Path $settings.bin ([Guid]::NewGuid().ToString())
 
@@ -22,20 +23,21 @@ task UnZip {
     Expand-Archive -Path $package -DestinationPath $tempDir
 }
 
-task RunMssql {
-    $info = Start-Mssql
+task StartDatabase {
+    $info = & "Start-$database"
 
-    $script:mssqlContainerId = $info.containerId
+    $script:containerId = $info.containerId
     $script:connectionString = $info.connectionString
 
     Write-Output $connectionString
 }
 
 task RunTest {
-    Wait-Mssql $info.connectionString
+    & "Wait-$database" $connectionString
 
     $app = Join-Path $tempDir "SqlDatabase.exe"
-    $script = Join-Path $settings.integrationTests "Test.ps1"
+    $script = (Join-Path $settings.integrationTests $database)
+    $script = Join-Path $script "Test.ps1"
 
     & $script $app $connectionString
 }
@@ -45,7 +47,7 @@ Exit-Build {
         Remove-Item -Path $tempDir -Force -Recurse
     }
 
-    if ($mssqlContainerId) {
-        exec { docker container rm -f $mssqlContainerId } | Out-Null
+    if ($containerId) {
+        exec { docker container rm -f $containerId } | Out-Null
     }
 }