Skip to content

Use Invoke-DbaQuery instead of ExecuteNonQuery for long batches to avoid issues on AppVeyor #10149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potatoqualitee merged 6 commits into from
Feb 11, 2026
Merged

Use Invoke-DbaQuery instead of ExecuteNonQuery for long batches to avoid issues on AppVeyor #10149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cb0b4a
fix issues only seen on AppVeyor
andreasjordan Feb 10, 2026
cc7ce65
Add comments and remove splits
andreasjordan Feb 11, 2026
b4466e1
move comment to correct position
andreasjordan Feb 11, 2026
fe49cb8
revert change where not needed
andreasjordan Feb 11, 2026
7a54631
change also Install-DbaDarlingData
andreasjordan Feb 11, 2026
e81c1de
fix variable name
andreasjordan Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions public/Get-DbaUserPermission.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,13 @@ function Get-DbaUserPermission {

try {
Write-Message -Level Verbose -Message "Removing STIG schema if it still exists from previous run"
$tempdb.ExecuteNonQuery($removeStigSQL)
# We use Invoke-DbaQuery (here and later in the code) because using ExecuteNonQuery with long batches causes problems on AppVeyor.
$null = Invoke-DbaQuery -SqlInstance $server -Database tempdb -Query $removeStigSQL -EnableException
Write-Message -Level Verbose -Message "Creating STIG schema customized for master database"
$createStigSQL = $sql.Replace("<TARGETDB>", 'master')
$tempdb.ExecuteNonQuery($createStigSQL)
$null = Invoke-DbaQuery -SqlInstance $server -Database tempdb -Query $createStigSQL -EnableException
Write-Message -Level Verbose -Message "Building data table for server objects"
$serverDT = $tempdb.Query($serverSQL)
$serverDT = Invoke-DbaQuery -SqlInstance $server -Database tempdb -Query $serverSQL -EnableException
foreach ($row in $serverDT) {
[PSCustomObject]@{
ComputerName = $server.ComputerName
Expand Down Expand Up @@ -294,13 +295,13 @@ function Get-DbaUserPermission {

try {
Write-Message -Level Verbose -Message "Removing STIG schema if it still exists from previous run"
$tempdb.ExecuteNonQuery($removeStigSQL)
$null = Invoke-DbaQuery -SqlInstance $server -Database tempdb -Query $removeStigSQL -EnableException
Write-Message -Level Verbose -Message "Creating STIG schema customized for current database"
$createStigSQL = $sql.Replace("<TARGETDB>", $db.Name)
Write-Message -Level Verbose -Message "Length of createStigSQL: $($createStigSQL.Length)"
$tempdb.ExecuteNonQuery($createStigSQL)
$null = Invoke-DbaQuery -SqlInstance $server -Database tempdb -Query $createStigSQL -EnableException
Write-Message -Level Verbose -Message "Building data table for database objects"
$dbDT = $db.Query($dbSQL)
$dbDT = Invoke-DbaQuery -SqlInstance $server -Database $db.Name -Query $dbSQL -EnableException
foreach ($row in $dbDT) {
[PSCustomObject]@{
ComputerName = $server.ComputerName
Expand All @@ -326,8 +327,12 @@ function Get-DbaUserPermission {
}
}

Write-Message -Level Verbose -Message "Removing STIG schema from tempdb"
$tempdb.ExecuteNonQuery($removeStigSQL)
try {
Write-Message -Level Verbose -Message "Removing STIG schema from tempdb"
$null = Invoke-DbaQuery -SqlInstance $server -Database tempdb -Query $removeStigSQL -EnableException
} catch {
Stop-Function -Message "Failed to remove STIG schema from tempdb on $instance" -ErrorRecord $_ -Target $instance -Continue
}
}
}
}
5 changes: 2 additions & 3 deletions public/Install-DbaDarlingData.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,8 @@ function Install-DbaDarlingData {
}
if ($Pscmdlet.ShouldProcess($instance, "installing/updating $scriptName in $database")) {
try {
foreach ($query in ($sql -Split "\nGO\b")) {
$null = $db.Query($query)
}
# We use Invoke-DbaQuery because using ExecuteNonQuery with long batches causes problems on AppVeyor.
$null = Invoke-DbaQuery -SqlInstance $server -Database $Database -Query $sql -EnableException
} catch {
Write-Message -Level Warning -Message "Could not execute at least one portion of $scriptName in $Database on $instance." -ErrorRecord $_
$scriptError = $true
Expand Down
7 changes: 3 additions & 4 deletions public/Install-DbaMaintenanceSolution.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,8 @@ function Install-DbaMaintenanceSolution {
Write-ProgressHelper -ExcludePercent -Message "Installing $shortFileName"
$sql = $fileContents[$file]
try {
foreach ($query in ($sql -Split "\nGO\b")) {
$null = $db.Invoke($query)
}
# We use Invoke-DbaQuery because using ExecuteNonQuery with long batches causes problems on AppVeyor.
$null = Invoke-DbaQuery -SqlInstance $server -Database $Database -Query $sql -EnableException
} catch {
$result = "Failed"
Stop-Function -Message "Could not execute $shortFileName in $Database on $instance" -ErrorRecord $_ -Target $db -Continue
Expand Down Expand Up @@ -807,7 +806,7 @@ function Install-DbaMaintenanceSolution {
}
}

if ($query) {
if ($sql) {
# then whatif wasn't passed
[PSCustomObject]@{
ComputerName = $server.ComputerName
Expand Down
12 changes: 5 additions & 7 deletions public/Install-DbaWhoIsActive.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ function Install-DbaWhoIsActive {

$sql = [IO.File]::ReadAllText($sqlfile)
$sql = $sql -replace 'USE master', ''
$batches = $sql -split "GO\r\n"

$matchString = 'Who Is Active? v'

Expand Down Expand Up @@ -187,12 +186,11 @@ function Install-DbaWhoIsActive {

if ($server.Databases[$Database]) {
$ProcedureExists = ($server.Query($ProcedureExists_Query, $Database)).proc_count
foreach ($batch in $batches) {
try {
$null = $server.databases[$Database].ExecuteNonQuery($batch)
} catch {
Stop-Function -Message "Failed to install stored procedure." -ErrorRecord $_ -Continue -Target $instance
}
try {
# We use Invoke-DbaQuery because using ExecuteNonQuery with long batches causes problems on AppVeyor.
$null = Invoke-DbaQuery -SqlInstance $server -Database $Database -Query $sql -EnableException
} catch {
Stop-Function -Message "Failed to install stored procedure." -ErrorRecord $_ -Continue -Target $instance
}

if ($ProcedureExists -gt 0) {
Expand Down