Address additional code review feedback

Co-authored-by: johlju <[email protected]>

Author: Copilot

source/Public/Get-SqlDscDateTime.ps1

@@ -83,7 +83,7 @@ function Get-SqlDscDateTime
     process
     {
         Write-Verbose -Message (
-            $script:localizedData.DateTime_Get_RetrievingDateTime -f $DateTimeFunction
+            $script:localizedData.Get_SqlDscDateTime_RetrievingDateTime -f $DateTimeFunction
         )
 
         $query = "SELECT $DateTimeFunction()"
@@ -111,7 +111,7 @@ function Get-SqlDscDateTime
         catch
         {
             $writeErrorParameters = @{
-                Message      = $script:localizedData.DateTime_Get_FailedToRetrieve -f $DateTimeFunction, $_.Exception.Message
+                Message      = $script:localizedData.Get_SqlDscDateTime_FailedToRetrieve -f $DateTimeFunction, $_.Exception.Message
                 Category     = 'InvalidOperation'
                 ErrorId      = 'GSDD0001' # cSpell: disable-line
                 TargetObject = $DateTimeFunction

source/Public/Invoke-SqlDscScalarQuery.ps1

@@ -90,7 +90,7 @@ function Invoke-SqlDscScalarQuery
         }
 
         Write-Verbose -Message (
-            $script:localizedData.ScalarQuery_Invoke_ExecutingQuery -f $redactedQuery
+            $script:localizedData.Invoke_SqlDscScalarQuery_ExecutingQuery -f $redactedQuery
         )
 
         $previousStatementTimeout = $null
@@ -112,10 +112,10 @@ function Invoke-SqlDscScalarQuery
         catch
         {
             $writeErrorParameters = @{
-                Message      = $script:localizedData.ScalarQuery_Invoke_FailedToExecute -f $_.Exception.Message
+                Message      = $script:localizedData.Invoke_SqlDscScalarQuery_FailedToExecute -f $_.Exception.Message
                 Category     = 'InvalidOperation'
                 ErrorId      = 'ISDSQ0002' # cSpell: disable-line
-                TargetObject = $Query
+                TargetObject = $redactedQuery
                 Exception    = $_.Exception
             }
 

source/en-US/SqlServerDsc.strings.psd1

@@ -634,10 +634,10 @@ ConvertFrom-StringData @'
     Get_SqlDscSetupLog_PathNotFound = Path '{0}' does not exist. (GSDSL0006)
 
     ## Invoke-SqlDscScalarQuery
-    ScalarQuery_Invoke_ExecutingQuery = Executing the scalar query `{0}`. (ISDSQ0001)
-    ScalarQuery_Invoke_FailedToExecute = Failed to execute scalar query: {0} (ISDSQ0002)
+    Invoke_SqlDscScalarQuery_ExecutingQuery = Executing the scalar query `{0}`. (ISDSQ0001)
+    Invoke_SqlDscScalarQuery_FailedToExecute = Failed to execute scalar query: {0} (ISDSQ0002)
 
     ## Get-SqlDscDateTime
-    DateTime_Get_RetrievingDateTime = Retrieving date and time using {0}(). (GSDD0001)
-    DateTime_Get_FailedToRetrieve = Failed to retrieve date and time using {0}(): {1} (GSDD0002)
+    Get_SqlDscDateTime_RetrievingDateTime = Retrieving date and time using {0}(). (GSDD0001)
+    Get_SqlDscDateTime_FailedToRetrieve = Failed to retrieve date and time using {0}(): {1} (GSDD0002)
 '@

tests/Integration/Commands/Invoke-SqlDscScalarQuery.Integration.Tests.ps1

@@ -31,6 +31,10 @@ BeforeAll {
     Import-Module -Name $script:moduleName -Force -ErrorAction 'Stop'
 }
 
+AfterAll {
+    Remove-Item -Path 'env:SqlServerDscCI' -ErrorAction 'SilentlyContinue'
+}
+
 Describe 'Invoke-SqlDscScalarQuery' -Tag @('Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') {
     BeforeAll {
         $script:mockInstanceName = 'DSCSQLTEST'
@@ -46,8 +50,6 @@ Describe 'Invoke-SqlDscScalarQuery' -Tag @('Integration_SQL2017', 'Integration_S
 
     AfterAll {
         Disconnect-SqlDscDatabaseEngine -ServerObject $script:serverObject -Force
-
-        Remove-Item -Path 'env:SqlServerDscCI'
     }
 
     Context 'When executing a scalar query' {

tests/Unit/Public/Invoke-SqlDscScalarQuery.Tests.ps1

@@ -76,6 +76,21 @@ Describe 'Invoke-SqlDscScalarQuery' -Tag 'Public' {
         $result.ParameterListAsString | Should -Be $MockExpectedParameters
     }
 
+    It 'Should have ServerObject as a mandatory parameter' {
+        $parameterInfo = (Get-Command -Name 'Invoke-SqlDscScalarQuery').Parameters['ServerObject']
+        $parameterInfo.Attributes.Mandatory | Should -Contain $true
+    }
+
+    It 'Should have Query as a mandatory parameter' {
+        $parameterInfo = (Get-Command -Name 'Invoke-SqlDscScalarQuery').Parameters['Query']
+        $parameterInfo.Attributes.Mandatory | Should -Contain $true
+    }
+
+    It 'Should accept ServerObject from pipeline' {
+        $parameterInfo = (Get-Command -Name 'Invoke-SqlDscScalarQuery').Parameters['ServerObject']
+        $parameterInfo.Attributes.ValueFromPipeline | Should -Contain $true
+    }
+
     Context 'When executing a scalar query' {
         BeforeAll {
             $mockConnectionContext = New-Object -TypeName 'Microsoft.SqlServer.Management.Smo.ServerConnection'