Remove-DbaDbTableData - Fix normalized table quoting edge cases (review of #10316)

potatoqualitee · Copilot · potatoqualitee · commit 5e3c3bb36700 · 2026-04-10T20:15:10.000+02:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/docs/trackers/features/commit-bug-review-TRACKER.md b/docs/trackers/features/commit-bug-review-TRACKER.md
@@ -124,7 +124,7 @@ Find real bugs (logic errors, null refs, incorrect behavior) and fix them. Skip
 | 1662d73a6 | New-DbaDatabase - Support Azure Blob Storage paths for data and log files (#10315) | DONE | Preserved rooted Data/Log paths for validation while still trimming file names; added unit regression tests. |
 | 241a118ce | Test-DbaDbCompression, Get-DbaDbPageInfo - Normalize table names via Get-ObjectNameParts (#10313) | DONE | Preserved schema-/database-qualified table matching and escaped SQL literals; added unit regression tests. |
 | 14a47a26c | Export-DbaCsv, Export-DbaDacPackage - Normalize table/schema names via Get-ObjectNameParts (#10314) | DONE | Export-DbaCsv invalid-name handling was already fixed by follow-up 74a2d1ae1; this review added Export-DbaDacPackage table-name validation and a unit regression test.
-| fe639f6e6 | Remove-DbaDbTableData - Normalize table name via Get-ObjectNameParts (#10316) | PENDING | |
+| fe639f6e6 | Remove-DbaDbTableData - Normalize table name via Get-ObjectNameParts (#10316) | DONE | Preserved database..table names, escaped ] in rebuilt identifiers, and added regression coverage. |
 | 070d2ee7f | Fix AppVeyor dbatools.library cache miss by installing to AllUsers scope (#10335) | PENDING | |
 | e3f6cc121 | Fix test for Invoke-DbaAdvancedUpdate (#10334) | PENDING | |
 | 6aafd24ed | Fix test for Test-DbaSpn by suppressing the warning on AppVeyor (#10331) | PENDING | |
diff --git a/public/Remove-DbaDbTableData.ps1 b/public/Remove-DbaDbTableData.ps1
@@ -218,12 +218,26 @@ function Remove-DbaDbTableData {
 
         if (Test-Bound Table) {
             $nameParts = Get-ObjectNameParts -ObjectName $Table
+            if (-not $nameParts.Parsed) {
+                Stop-Function -Message "Please check you are using proper one-, two-, or three-part names. If your table name contains special characters you must use [ ] to wrap the name. The value $Table could not be parsed as a valid table name."
+                return
+            }
+
+            $quotedTableName = "[" + $nameParts.Name.Replace("]", "]]") + "]"
             if ($nameParts.Database) {
-                $bracketedTable = "[$($nameParts.Database)].[$($nameParts.Schema)].[$($nameParts.Name)]"
+                $quotedDatabaseName = "[" + $nameParts.Database.Replace("]", "]]") + "]"
+
+                if ($nameParts.Schema) {
+                    $quotedSchemaName = "[" + $nameParts.Schema.Replace("]", "]]") + "]"
+                    $bracketedTable = "$quotedDatabaseName.$quotedSchemaName.$quotedTableName"
+                } else {
+                    $bracketedTable = "$quotedDatabaseName..$quotedTableName"
+                }
             } elseif ($nameParts.Schema) {
-                $bracketedTable = "[$($nameParts.Schema)].[$($nameParts.Name)]"
+                $quotedSchemaName = "[" + $nameParts.Schema.Replace("]", "]]") + "]"
+                $bracketedTable = "$quotedSchemaName.$quotedTableName"
             } else {
-                $bracketedTable = "[$($nameParts.Name)]"
+                $bracketedTable = $quotedTableName
             }
             $sql += "    DELETE TOP ($BatchSize) FROM $bracketedTable;"
         } elseif (Test-Bound DeleteSql) {
diff --git a/tests/Remove-DbaDbTableData.Tests.ps1 b/tests/Remove-DbaDbTableData.Tests.ps1
@@ -1,6 +1,6 @@
 #Requires -Module @{ ModuleName="Pester"; ModuleVersion="5.0" }
 param(
-    $ModuleName  = "dbatools",
+    $ModuleName = "dbatools",
     $CommandName = "Remove-DbaDbTableData",
     $PSDefaultParameterValues = $TestConfig.Defaults
 )
@@ -27,6 +27,101 @@ Describe $CommandName -Tag UnitTests {
             Compare-Object -ReferenceObject $expectedParameters -DifferenceObject $hasParameters | Should -BeNullOrEmpty
         }
     }
+
+    InModuleScope dbatools {
+        Context "Table name normalization" {
+            BeforeAll {
+                function Write-Message { }
+                function Select-DefaultView {
+                    param(
+                        [Parameter(ValueFromPipeline)]
+                        $InputObject,
+                        [Parameter(ValueFromRemainingArguments)]
+                        $RemainingArguments
+                    )
+
+                    process {
+                        $InputObject
+                    }
+                }
+            }
+
+            BeforeEach {
+                $script:executedSql = @()
+                $script:deleteRowCounts = @(10, 0)
+                $script:rowCountIndex = 0
+
+                $script:mockServer = [PSCustomObject]@{
+                    Name               = "sql1"
+                    ComputerName       = "sql1"
+                    DatabaseEngineType = [Microsoft.SqlServer.Management.Common.DatabaseEngineType]::Standalone
+                }
+
+                $script:mockDatabase = [PSCustomObject]@{
+                    Name          = "db1"
+                    Parent        = $script:mockServer
+                    RecoveryModel = "Simple"
+                }
+
+                Add-Member -InputObject $script:mockDatabase -Name Query -MemberType ScriptMethod -Value {
+                    param($sql)
+
+                    $script:executedSql += $sql
+
+                    if ($sql -like "SELECT COUNT(1) FROM msdb.dbo.log_shipping_monitor_primary*") {
+                        return 0
+                    }
+
+                    if ($sql -eq "CHECKPOINT") {
+                        return [PSCustomObject]@{
+                            RowCount     = 0
+                            ErrorMessage = $null
+                        }
+                    }
+
+                    $rowCount = $script:deleteRowCounts[$script:rowCountIndex]
+                    if ($script:rowCountIndex -lt ($script:deleteRowCounts.Count - 1)) {
+                        $script:rowCountIndex += 1
+                    }
+
+                    return [PSCustomObject]@{
+                        RowCount     = $rowCount
+                        ErrorMessage = $null
+                    }
+                } -Force
+
+                Mock Test-FunctionInterrupt { $false }
+                Mock Get-DbaDatabase { $script:mockDatabase }
+                Mock Stop-Function { throw $Message }
+            }
+
+            It "Preserves the empty schema segment in three-part table names" {
+                $result = Remove-DbaDbTableData -SqlInstance "sql1" -Database "db1" -Table "MyDb..Test" -BatchSize 10 -Confirm:$false
+                $deleteSql = $script:executedSql | Where-Object { $PSItem -like "*DELETE TOP (10) FROM*" } | Select-Object -First 1
+
+                $deleteSql | Should -Not -BeNullOrEmpty
+                $deleteSql.Contains("DELETE TOP (10) FROM [MyDb]..[Test];") | Should -Be $true
+                $result.TotalRowsDeleted | Should -Be 10
+                $result.TotalIterations | Should -Be 1
+            }
+
+            It "Escapes closing brackets in bracketed table names" {
+                $result = Remove-DbaDbTableData -SqlInstance "sql1" -Database "db1" -Table "[dbo].[Test]]Name]" -BatchSize 10 -Confirm:$false
+                $deleteSql = $script:executedSql | Where-Object { $PSItem -like "*DELETE TOP (10) FROM*" } | Select-Object -First 1
+
+                $deleteSql | Should -Not -BeNullOrEmpty
+                $deleteSql.Contains("DELETE TOP (10) FROM [dbo].[Test]]Name];") | Should -Be $true
+                $result.TotalRowsDeleted | Should -Be 10
+                $result.TotalIterations | Should -Be 1
+            }
+
+            It "Stops early when the table name cannot be parsed" {
+                {
+                    Remove-DbaDbTableData -SqlInstance "sql1" -Database "db1" -Table "one.two.three.four" -Confirm:$false
+                } | Should -Throw "*could not be parsed as a valid table name*"
+            }
+        }
+    }
 }
 
 Describe $CommandName -Tag IntegrationTests {
@@ -175,6 +270,46 @@ Describe $CommandName -Tag IntegrationTests {
             $result.Database | Should -Be $dbnameSimpleModel
             (Invoke-DbaQuery -SqlInstance $server -Database $dbnameSimpleModel -Query "SELECT COUNT(1) AS [RowCount] FROM dbo.Test").RowCount | Should -Be 0
         }
+
+        It "Removes Data for a specified database when -Table uses database..table format" {
+            $result = Remove-DbaDbTableData -SqlInstance $server -Database $dbnameSimpleModel -Table "$dbnameSimpleModel..Test" -BatchSize 10
+            $result.TotalIterations | Should -Be 10
+            $result.TotalRowsDeleted | Should -Be 100
+            $result.LogBackups.Count | Should -Be 0
+            $result.Timings.Count | Should -Be 10
+            $result.Database | Should -Be $dbnameSimpleModel
+            (Invoke-DbaQuery -SqlInstance $server -Database $dbnameSimpleModel -Query "SELECT COUNT(1) AS [RowCount] FROM dbo.Test").RowCount | Should -Be 0
+        }
+    }
+
+    Context "Functionality with escaped table names" {
+        BeforeEach {
+            $sqlAddRowsToEscapedTable = "
+                    IF OBJECT_ID(N'[dbo].[Test]]Name]', N'U') IS NOT NULL
+                        DROP TABLE [dbo].[Test]]Name];
+
+                    CREATE TABLE [dbo].[Test]]Name] (Id INTEGER);
+
+                    DECLARE
+                        @loopCounter INTEGER = 0;
+
+                    WHILE @loopCounter < 25
+                    BEGIN
+                        INSERT INTO [dbo].[Test]]Name] VALUES (@loopCounter);
+                        SET @loopCounter = @loopCounter + 1;
+                    END;"
+            $null = Invoke-DbaQuery -SqlInstance $server -Database $dbnameSimpleModel -Query $sqlAddRowsToEscapedTable
+        }
+
+        It "Removes Data for a table name that contains a closing bracket" {
+            $result = Remove-DbaDbTableData -SqlInstance $server -Database $dbnameSimpleModel -Table "[dbo].[Test]]Name]" -BatchSize 10
+            $result.TotalIterations | Should -Be 3
+            $result.TotalRowsDeleted | Should -Be 25
+            $result.LogBackups.Count | Should -Be 0
+            $result.Timings.Count | Should -Be 3
+            $result.Database | Should -Be $dbnameSimpleModel
+            (Invoke-DbaQuery -SqlInstance $server -Database $dbnameSimpleModel -Query "SELECT COUNT(1) AS [RowCount] FROM [dbo].[Test]]Name]").RowCount | Should -Be 0
+        }
     }
 
     Context "Functionality with bulk_logged recovery model" {
