Fix wrong database name on existing database error for New-AzSqlDatabaseSecondary

src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.cs

@@ -56,6 +56,13 @@ public void TestCreateNamedSecondaryDatabase()
             RunPowerShellTest("Test-CreateNamedSecondaryDatabase");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestCreateNamedSecondaryDatabaseNegative()
+        {
+            RunPowerShellTest("Test-CreateNamedSecondaryDatabaseNegative");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetReplicationLink()

src/Sql/Sql.Test/ScenarioTests/DatabaseReplicationTests.ps1

@@ -197,6 +197,40 @@ function Test-CreateNamedSecondaryDatabase()
 	}
 }
 
+<#
+	.SYNOPSIS
+	Tests creating a named secondary database of already existing database
+#>
+function Test-CreateNamedSecondaryDatabaseNegative()
+{
+	# Setup
+    $location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
+	$rg = Create-ResourceGroupForTest $location
+	$server = Create-ServerForTest $rg $location
+	$database = Create-DatabaseForTest $rg $server
+
+	$partRg = Create-ResourceGroupForTest $location
+	$partServer = Create-ServerForTest $partRg $location
+
+	try
+	{
+		# Attempt to Create Named Readable Secondary Using Existing Database Name
+		$readSecondary = New-AzSqlDatabaseSecondary -ResourceGroupName $partRg.ResourceGroupName -ServerName $partServer.ServerName -DatabaseName "secondary" `
+		 -PartnerResourceGroupName $rg.ResourceGroupName -PartnerServerName $server.ServerName -PartnerDatabaseName $database.DatabaseName -AllowConnections All
+		Assert-Null $readSecondary
+	}
+	catch
+	{
+		$ErrorMessage = $_.Exception.Message
+		Assert-AreEqual True $ErrorMessage.Contains("Database with name: '" + $database.DatabaseName + "' already exists in server '" + $server.ServerName + "'.")
+	}
+	finally
+	{
+		Remove-ResourceGroupForTest $rg
+		Remove-ResourceGroupForTest $partRg
+	}
+}
+
 <#
 	.SYNOPSIS
 	Tests getting a secondary database

src/Sql/Sql/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 ## Upcoming Release
 * Fixed potential server name case insensitive error in `New-AzSqlServer` and `Set-AzSqlServer`
+* Fixed wrong database name returned on existing database error in `New-AzSqlDatabaseSecondary`
 
 ## Version 2.9.0
 * Added support for Service principal and guest users in Set-AzSqlInstanceActiveDirectoryAdministrator cmdlet`

src/Sql/Sql/Replication/Cmdlet/NewAzureSqlDatabaseSecondary.cs

@@ -172,7 +172,7 @@ protected override IEnumerable<AzureReplicationLinkModel> GetEntity()
 
             // The database already exists
             throw new PSArgumentException(
-                string.Format(Resources.DatabaseNameExists, this.DatabaseName, this.PartnerServerName),
+                string.Format(Resources.DatabaseNameExists, GetEffectivePartnerDatabaseName(this.DatabaseName, this.PartnerDatabaseName), this.PartnerServerName),
                 "DatabaseName");
         }