From 9dcb7e4ee50b4380f24326a469ee32dd69847788 Mon Sep 17 00:00:00 2001
From: Cory Rivera <corivera@microsoft.com>
Date: Wed, 7 Jun 2023 09:47:16 -0700
Subject: [PATCH] Update default values for Owner and Collation in Create
 Database dialog (#23332)

---
 extensions/mssql/config.json                               | 2 +-
 extensions/mssql/src/objectManagement/ui/databaseDialog.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/mssql/config.json b/extensions/mssql/config.json
index b90864ec4b..6046df85ba 100644
--- a/extensions/mssql/config.json
+++ b/extensions/mssql/config.json
@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "4.8.0.16",
+	"version": "4.8.0.17",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net7.0.zip",
 		"Windows_64": "win-x64-net7.0.zip",
diff --git a/extensions/mssql/src/objectManagement/ui/databaseDialog.ts b/extensions/mssql/src/objectManagement/ui/databaseDialog.ts
index 916c137691..4ee60857ed 100644
--- a/extensions/mssql/src/objectManagement/ui/databaseDialog.ts
+++ b/extensions/mssql/src/objectManagement/ui/databaseDialog.ts
@@ -35,6 +35,7 @@ export class DatabaseDialog extends ObjectManagementDialogBase<ObjectManagement.
 		containers.push(this.createLabelInputContainer(localizedConstants.NameText, this._nameInput));
 
 		if (this.viewInfo.loginNames?.length > 0) {
+			this.objectInfo.owner = this.viewInfo.loginNames[0];
 			let ownerDropbox = this.createDropdown(localizedConstants.OwnerText, async () => {
 				this.objectInfo.owner = ownerDropbox.value as string;
 			}, this.viewInfo.loginNames, this.viewInfo.loginNames[0]);
@@ -47,6 +48,7 @@ export class DatabaseDialog extends ObjectManagementDialogBase<ObjectManagement.
 	private initializeOptionsSection(): azdata.GroupContainer {
 		let containers: azdata.Component[] = [];
 		if (this.viewInfo.collationNames?.length > 0) {
+			this.objectInfo.collationName = this.viewInfo.collationNames[0];
 			let collationDropbox = this.createDropdown(localizedConstants.CollationText, async () => {
 				this.objectInfo.collationName = collationDropbox.value as string;
 			}, this.viewInfo.collationNames, this.viewInfo.collationNames[0]);