Adjusting ADS to support new changes for CloudServerType for SQLOD (#12824)

* Add CodeQL Analysis workflow (#10195)

* Add CodeQL Analysis workflow

* Fix path

* Adjusting ADS to support new changes for CloudServerType for SQLOD

* Using existing constants instead of hardcoded values

* Updating STS version

Co-authored-by: Justin Hutchings <jhutchings1@users.noreply.github.com>

extensions/kusto/src/contextProvider.ts

@@ -19,8 +19,9 @@ export enum ContextKeys {
 }
 
 const isCloudEditions = [
-	5,
+	azdata.DatabaseEngineEdition.SqlDatabase,
-	6
+	azdata.DatabaseEngineEdition.SqlDataWarehouse,
+	azdata.DatabaseEngineEdition.SqlOnDemand
 ];
 
 export function setCommandContext(key: ContextKeys | string, value: any) {

extensions/mssql/config.json

@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "3.0.0-release.45",
+	"version": "3.0.0-release.46",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp3.1.zip",
 		"Windows_64": "win-x64-netcoreapp3.1.zip",

extensions/mssql/package.json

@@ -488,11 +488,6 @@
               "field": "isCloud",
               "operator": "!=",
               "value": true
-            },
-            {
-              "field": "engineEditionId",
-              "operator": "!=",
-              "value": "11"
             }
           ],
           "databaseProperties": [
@@ -571,6 +566,11 @@
               "field": "isCloud",
               "operator": "==",
               "value": true
+            },
+            {
+              "field": "engineEditionId",
+              "operator": "!=",
+              "value": "11"
             }
           ],
           "databaseProperties": [
@@ -632,10 +632,6 @@
             {
               "displayName": "%cloud.databaseProperties.compatibilityLevel%",
               "value": "compatibilityLevel"
-            },
-            {
-              "displayName": "%cloud.databaseProperties.owner%",
-              "value": "owner"
             }
           ],
           "serverProperties": [

extensions/mssql/src/contextProvider.ts

@@ -21,9 +21,9 @@ enum ContextKeys {
 }
 
 const isCloudEditions = [
-	5,
+	azdata.DatabaseEngineEdition.SqlDatabase,
-	6,
+	azdata.DatabaseEngineEdition.SqlDataWarehouse,
-	11
+	azdata.DatabaseEngineEdition.SqlOnDemand
 ];
 
 function setCommandContext(key: ContextKeys | string, value: any) {

src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesJson.ts

@@ -21,11 +21,6 @@ export const properties: Array<ProviderProperties> = [
 						field: 'isCloud',
 						operator: '!=',
 						value: true
-					},
-					{
-						field: 'engineEditionId',
-						operator: '!=',
-						value: '11'
 					}
 				],
 				databaseProperties: [
@@ -82,6 +77,11 @@ export const properties: Array<ProviderProperties> = [
 						field: 'isCloud',
 						operator: '==',
 						value: true
+					},
+					{
+						field: 'engineEditionId',
+						operator: '!=',
+						value: '11'
 					}
 				],
 				databaseProperties: [
@@ -126,10 +126,6 @@ export const properties: Array<ProviderProperties> = [
 					{
 						displayName: nls.localize('compatibilityLevel', "Compatibility Level"),
 						value: 'compatibilityLevel'
-					},
-					{
-						displayName: nls.localize('owner', "Owner"),
-						value: 'owner'
 					}
 				],
 				serverProperties: [

src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts

@@ -140,7 +140,7 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, {
 				TreeNodeContextKey.NodeType.isEqualTo('Table'),
 				TreeNodeContextKey.NodeType.isEqualTo('View'),
 				TreeNodeContextKey.NodeType.isEqualTo('Schema'),
-				TreeNodeContextKey.NodeType.isEqualTo('User'),
+				ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo('User'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())),
 				TreeNodeContextKey.NodeType.isEqualTo('UserDefinedTableType'),
 				TreeNodeContextKey.NodeType.isEqualTo('StoredProcedure'),
 				TreeNodeContextKey.NodeType.isEqualTo('AggregateFunction'),