check if @ServerName already present with username don't append server name (#3428)

Ajay Kumar Yadav · vincent1173 · commit 815be8e82410 · 2017-01-19T11:58:29.000+05:30
diff --git a/Tasks/SqlAzureDacpacDeployment/Tests/L0UtilityGetSqlCmdArgs.ps1 b/Tasks/SqlAzureDacpacDeployment/Tests/L0UtilityGetSqlCmdArgs.ps1
@@ -26,6 +26,18 @@ $sqlPackageCommandLineArguments = Get-SqlPackageCommandArguments -dacpacFile "az
 Assert-AreEqual '/SourceFile:"azureDacpac.dacpac" /Action:Publish /TargetConnectionString:"connectionString:10/20/30" /Profile:"Profile.xml" Add_args' `
                                     $sqlPackageCommandLineArguments "Should have constructed Argument for Connection String"
 
+$sqlPackageCommandLineArguments = Get-SqlPackageCommandArguments -dacpacFile "azureDacpac.dacpac" -targetMethod "server" -serverName "yyy.database.windows.net" `
+                                    -databaseName "databaseName" -sqlUsername "user@sql" -sqlPassword "sqlPassword" -publishProfile "Profile.xml" -additionalArguments "Add_args"
+
+Assert-AreEqual '/SourceFile:"azureDacpac.dacpac" /Action:Publish /TargetServerName:"yyy.database.windows.net" /TargetDatabaseName:"databaseName" /TargetUser:"user@sql@yyy.database.windows.net" /TargetPassword:"sqlPassword" /Profile:"Profile.xml" Add_args' `
+                                    $sqlPackageCommandLineArguments "Should have constructed Argument for TargetMethod Server"
+
+$sqlPackageCommandLineArguments = Get-SqlPackageCommandArguments -dacpacFile "azureDacpac.dacpac" -targetMethod "server" -serverName "yyy.database.windows.net" `
+                                    -databaseName "databaseName" -sqlUsername "sqluser@yyy.database.windows.net" -sqlPassword "sqlPassword" -publishProfile "Profile.xml" -additionalArguments "Add_args"
+
+Assert-AreEqual '/SourceFile:"azureDacpac.dacpac" /Action:Publish /TargetServerName:"yyy.database.windows.net" /TargetDatabaseName:"databaseName" /TargetUser:"sqluser@yyy.database.windows.net" /TargetPassword:"sqlPassword" /Profile:"Profile.xml" Add_args' `
+                                    $sqlPackageCommandLineArguments "Should have constructed Argument for TargetMethod Server"
+
 Assert-Throws {
     Get-SqlPackageCommandArguments -dacpacFile "azureDacpac.dacpac" -targetMethod "connectionString" -connectionString "connectionString:10/20/30" -publishProfile "Profile.json" `
                                     -additionalArguments "Add_args" -isOutputSecure
diff --git a/Tasks/SqlAzureDacpacDeployment/Utility.ps1 b/Tasks/SqlAzureDacpacDeployment/Utility.ps1
@@ -147,7 +147,7 @@ function Get-SqlPackageCommandArguments
 
         if($sqlUsername)
         {
-            if($sqlUsername.Contains('@'))
+            if((-not $sqlUsername.Trim().EndsWith("@" + $serverName.Trim())) -and $sqlUsername.Contains('@'))
             {
                 $sqlUsername = $sqlUsername + "@" + $serverName 
             }
diff --git a/Tasks/SqlAzureDacpacDeployment/task.json b/Tasks/SqlAzureDacpacDeployment/task.json
@@ -16,7 +16,7 @@
     "version": {
         "Major": 1,
         "Minor": 1,
-        "Patch": 4
+        "Patch": 5
     },
     "demands": [
         "sqlpackage"
diff --git a/Tasks/SqlAzureDacpacDeployment/task.loc.json b/Tasks/SqlAzureDacpacDeployment/task.loc.json
@@ -16,7 +16,7 @@
   "version": {
     "Major": 1,
     "Minor": 1,
-    "Patch": 4
+    "Patch": 5
   },
   "demands": [
     "sqlpackage"

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ function Get-SqlPackageCommandArguments`
`147`	`147`
`148`	`148`	`if($sqlUsername)`
`149`	`149`	`{`
`150`		`- if($sqlUsername.Contains('@'))`
	`150`	`+ if((-not $sqlUsername.Trim().EndsWith("@" + $serverName.Trim())) -and $sqlUsername.Contains('@'))`
`151`	`151`	`{`
`152`	`152`	`$sqlUsername = $sqlUsername + "@" + $serverName`
`153`	`153`	`}`