diff --git a/extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts b/extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts index 7a077e35e8..14ace66dec 100644 --- a/extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts +++ b/extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts @@ -119,6 +119,7 @@ export class SchemaCompareOptionsDialog { private static readonly ExternalFileFormats: string = localize('SchemaCompare.ExternalFileFormats', 'External File Formats'); private static readonly ExternalTables: string = localize('SchemaCompare.ExternalTables', 'External Tables'); private static readonly Filegroups: string = localize('SchemaCompare.Filegroups', 'Filegroups'); + private static readonly Files: string = localize('SchemaCompare.Files', 'Files'); private static readonly FileTables: string = localize('SchemaCompare.FileTables', 'File Tables'); private static readonly FullTextCatalogs: string = localize('SchemaCompare.FullTextCatalogs', 'Full Text Catalogs'); private static readonly FullTextStoplists: string = localize('SchemaCompare.FullTextStoplists', 'Full Text Stoplists'); @@ -362,6 +363,7 @@ export class SchemaCompareOptionsDialog { SchemaCompareOptionsDialog.ExternalFileFormats, SchemaCompareOptionsDialog.ExternalTables, SchemaCompareOptionsDialog.Filegroups, + SchemaCompareOptionsDialog.Files, SchemaCompareOptionsDialog.FileTables, SchemaCompareOptionsDialog.FullTextCatalogs, SchemaCompareOptionsDialog.FullTextStoplists, @@ -1146,6 +1148,8 @@ export class SchemaCompareOptionsDialog { return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.ExternalTables)) ? false : true; case SchemaCompareOptionsDialog.Filegroups: return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.Filegroups)) ? false : true; + case SchemaCompareOptionsDialog.Files: + return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.Files)) ? false : true; case SchemaCompareOptionsDialog.FileTables: return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.FileTables)) ? false : true; case SchemaCompareOptionsDialog.FullTextCatalogs: @@ -1341,6 +1345,11 @@ export class SchemaCompareOptionsDialog { this.excludedObjectTypes.push(azdata.SchemaObjectType.Filegroups); } return; + case SchemaCompareOptionsDialog.Files: + if (!included) { + this.excludedObjectTypes.push(azdata.SchemaObjectType.Files); + } + return; case SchemaCompareOptionsDialog.FileTables: if (!included) { this.excludedObjectTypes.push(azdata.SchemaObjectType.FileTables); diff --git a/src/sql/azdata.d.ts b/src/sql/azdata.d.ts index 8486d563f6..18989d3315 100644 --- a/src/sql/azdata.d.ts +++ b/src/sql/azdata.d.ts @@ -1912,53 +1912,54 @@ declare module 'azdata' { ExternalFileFormats = 16, ExternalTables = 17, Filegroups = 18, - FileTables = 19, - FullTextCatalogs = 20, - FullTextStoplists = 21, - MessageTypes = 22, - PartitionFunctions = 23, - PartitionSchemes = 24, - Permissions = 25, - Queues = 26, - RemoteServiceBindings = 27, - RoleMembership = 28, - Rules = 29, - ScalarValuedFunctions = 30, - SearchPropertyLists = 31, - SecurityPolicies = 32, - Sequences = 33, - Services = 34, - Signatures = 35, - StoredProcedures = 36, - SymmetricKeys = 37, - Synonyms = 38, - Tables = 39, - TableValuedFunctions = 40, - UserDefinedDataTypes = 41, - UserDefinedTableTypes = 42, - ClrUserDefinedTypes = 43, - Users = 44, - Views = 45, - XmlSchemaCollections = 46, - Audits = 47, - Credentials = 48, - CryptographicProviders = 49, - DatabaseAuditSpecifications = 50, - DatabaseEncryptionKeys = 51, - DatabaseScopedCredentials = 52, - Endpoints = 53, - ErrorMessages = 54, - EventNotifications = 55, - EventSessions = 56, - LinkedServerLogins = 57, - LinkedServers = 58, - Logins = 59, - MasterKeys = 60, - Routes = 61, - ServerAuditSpecifications = 62, - ServerRoleMembership = 63, - ServerRoles = 64, - ServerTriggers = 65 + Files = 19, + FileTables = 20, + FullTextCatalogs = 21, + FullTextStoplists = 22, + MessageTypes = 23, + PartitionFunctions = 24, + PartitionSchemes = 25, + Permissions = 26, + Queues = 27, + RemoteServiceBindings = 28, + RoleMembership = 29, + Rules = 30, + ScalarValuedFunctions = 31, + SearchPropertyLists = 32, + SecurityPolicies = 33, + Sequences = 34, + Services = 35, + Signatures = 36, + StoredProcedures = 37, + SymmetricKeys = 38, + Synonyms = 39, + Tables = 40, + TableValuedFunctions = 41, + UserDefinedDataTypes = 42, + UserDefinedTableTypes = 43, + ClrUserDefinedTypes = 44, + Users = 45, + Views = 46, + XmlSchemaCollections = 47, + Audits = 48, + Credentials = 49, + CryptographicProviders = 50, + DatabaseAuditSpecifications = 51, + DatabaseEncryptionKeys = 52, + DatabaseScopedCredentials = 53, + Endpoints = 54, + ErrorMessages = 55, + EventNotifications = 56, + EventSessions = 57, + LinkedServerLogins = 58, + LinkedServers = 59, + Logins = 60, + MasterKeys = 61, + Routes = 62, + ServerAuditSpecifications = 63, + ServerRoleMembership = 64, + ServerRoles = 65, + ServerTriggers = 66 } export interface SchemaCompareObjectId { diff --git a/src/sql/workbench/api/common/sqlExtHostTypes.ts b/src/sql/workbench/api/common/sqlExtHostTypes.ts index 30c552d1f6..104607f396 100644 --- a/src/sql/workbench/api/common/sqlExtHostTypes.ts +++ b/src/sql/workbench/api/common/sqlExtHostTypes.ts @@ -622,53 +622,54 @@ export enum SchemaObjectType { ExternalFileFormats = 16, ExternalTables = 17, Filegroups = 18, - FileTables = 19, - FullTextCatalogs = 20, - FullTextStoplists = 21, - MessageTypes = 22, - PartitionFunctions = 23, - PartitionSchemes = 24, - Permissions = 25, - Queues = 26, - RemoteServiceBindings = 27, - RoleMembership = 28, - Rules = 29, - ScalarValuedFunctions = 30, - SearchPropertyLists = 31, - SecurityPolicies = 32, - Sequences = 33, - Services = 34, - Signatures = 35, - StoredProcedures = 36, - SymmetricKeys = 37, - Synonyms = 38, - Tables = 39, - TableValuedFunctions = 40, - UserDefinedDataTypes = 41, - UserDefinedTableTypes = 42, - ClrUserDefinedTypes = 43, - Users = 44, - Views = 45, - XmlSchemaCollections = 46, - Audits = 47, - Credentials = 48, - CryptographicProviders = 49, - DatabaseAuditSpecifications = 50, - DatabaseEncryptionKeys = 51, - DatabaseScopedCredentials = 52, - Endpoints = 53, - ErrorMessages = 54, - EventNotifications = 55, - EventSessions = 56, - LinkedServerLogins = 57, - LinkedServers = 58, - Logins = 59, - MasterKeys = 60, - Routes = 61, - ServerAuditSpecifications = 62, - ServerRoleMembership = 63, - ServerRoles = 64, - ServerTriggers = 65 + Files = 19, + FileTables = 20, + FullTextCatalogs = 21, + FullTextStoplists = 22, + MessageTypes = 23, + PartitionFunctions = 24, + PartitionSchemes = 25, + Permissions = 26, + Queues = 27, + RemoteServiceBindings = 28, + RoleMembership = 29, + Rules = 30, + ScalarValuedFunctions = 31, + SearchPropertyLists = 32, + SecurityPolicies = 33, + Sequences = 34, + Services = 35, + Signatures = 36, + StoredProcedures = 37, + SymmetricKeys = 38, + Synonyms = 39, + Tables = 40, + TableValuedFunctions = 41, + UserDefinedDataTypes = 42, + UserDefinedTableTypes = 43, + ClrUserDefinedTypes = 44, + Users = 45, + Views = 46, + XmlSchemaCollections = 47, + Audits = 48, + Credentials = 49, + CryptographicProviders = 50, + DatabaseAuditSpecifications = 51, + DatabaseEncryptionKeys = 52, + DatabaseScopedCredentials = 53, + Endpoints = 54, + ErrorMessages = 55, + EventNotifications = 56, + EventSessions = 57, + LinkedServerLogins = 58, + LinkedServers = 59, + Logins = 60, + MasterKeys = 61, + Routes = 62, + ServerAuditSpecifications = 63, + ServerRoleMembership = 64, + ServerRoles = 65, + ServerTriggers = 66 } export enum ColumnType {