ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Sql tools service update to fix SC bugs (#6673)

Browse Source
This commit is contained in:
Udeesha Gautam
2019-08-09 14:43:37 -07:00
committed by GitHub
parent f5e3b51151
commit 2d2b61a001
3 changed files with 105 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/schema-compare/src/dialogs/schemaCompareOptionsDialog.ts
View File

@@ -119,6 +119,7 @@ export class SchemaCompareOptionsDialog {
private static readonly ExternalFileFormats: string = localize('SchemaCompare.ExternalFileFormats', 'External File Formats'); private static readonly ExternalFileFormats: string = localize('SchemaCompare.ExternalFileFormats', 'External File Formats');
private static readonly ExternalTables: string = localize('SchemaCompare.ExternalTables', 'External Tables'); private static readonly ExternalTables: string = localize('SchemaCompare.ExternalTables', 'External Tables');
private static readonly Filegroups: string = localize('SchemaCompare.Filegroups', 'Filegroups'); 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 FileTables: string = localize('SchemaCompare.FileTables', 'File Tables');
private static readonly FullTextCatalogs: string = localize('SchemaCompare.FullTextCatalogs', 'Full Text Catalogs'); private static readonly FullTextCatalogs: string = localize('SchemaCompare.FullTextCatalogs', 'Full Text Catalogs');
private static readonly FullTextStoplists: string = localize('SchemaCompare.FullTextStoplists', 'Full Text Stoplists'); private static readonly FullTextStoplists: string = localize('SchemaCompare.FullTextStoplists', 'Full Text Stoplists');
@@ -362,6 +363,7 @@ export class SchemaCompareOptionsDialog {
SchemaCompareOptionsDialog.ExternalFileFormats, SchemaCompareOptionsDialog.ExternalFileFormats,
SchemaCompareOptionsDialog.ExternalTables, SchemaCompareOptionsDialog.ExternalTables,
SchemaCompareOptionsDialog.Filegroups, SchemaCompareOptionsDialog.Filegroups,
SchemaCompareOptionsDialog.Files,
SchemaCompareOptionsDialog.FileTables, SchemaCompareOptionsDialog.FileTables,
SchemaCompareOptionsDialog.FullTextCatalogs, SchemaCompareOptionsDialog.FullTextCatalogs,
SchemaCompareOptionsDialog.FullTextStoplists, SchemaCompareOptionsDialog.FullTextStoplists,
@@ -1146,6 +1148,8 @@ export class SchemaCompareOptionsDialog {
return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.ExternalTables)) ? false : true; return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.ExternalTables)) ? false : true;
case SchemaCompareOptionsDialog.Filegroups: case SchemaCompareOptionsDialog.Filegroups:
return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.Filegroups)) ? false : true; 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: case SchemaCompareOptionsDialog.FileTables:
return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.FileTables)) ? false : true; return (this.deploymentOptions.excludeObjectTypes.find(x => x === azdata.SchemaObjectType.FileTables)) ? false : true;
case SchemaCompareOptionsDialog.FullTextCatalogs: case SchemaCompareOptionsDialog.FullTextCatalogs:
@@ -1341,6 +1345,11 @@ export class SchemaCompareOptionsDialog {
this.excludedObjectTypes.push(azdata.SchemaObjectType.Filegroups); this.excludedObjectTypes.push(azdata.SchemaObjectType.Filegroups);
} }
return; return;
case SchemaCompareOptionsDialog.Files:
if (!included) {
this.excludedObjectTypes.push(azdata.SchemaObjectType.Files);
}
return;
case SchemaCompareOptionsDialog.FileTables: case SchemaCompareOptionsDialog.FileTables:
if (!included) { if (!included) {
this.excludedObjectTypes.push(azdata.SchemaObjectType.FileTables); this.excludedObjectTypes.push(azdata.SchemaObjectType.FileTables);

95
src/sql/azdata.d.ts vendored
View File

@@ -1912,53 +1912,54 @@ declare module 'azdata' {
ExternalFileFormats = 16, ExternalFileFormats = 16,
ExternalTables = 17, ExternalTables = 17,
Filegroups = 18, Filegroups = 18,
FileTables = 19, Files = 19,
FullTextCatalogs = 20, FileTables = 20,
FullTextStoplists = 21, FullTextCatalogs = 21,
MessageTypes = 22, FullTextStoplists = 22,
PartitionFunctions = 23, MessageTypes = 23,
PartitionSchemes = 24, PartitionFunctions = 24,
Permissions = 25, PartitionSchemes = 25,
Queues = 26, Permissions = 26,
RemoteServiceBindings = 27, Queues = 27,
RoleMembership = 28, RemoteServiceBindings = 28,
Rules = 29, RoleMembership = 29,
ScalarValuedFunctions = 30, Rules = 30,
SearchPropertyLists = 31, ScalarValuedFunctions = 31,
SecurityPolicies = 32, SearchPropertyLists = 32,
Sequences = 33, SecurityPolicies = 33,
Services = 34, Sequences = 34,
Signatures = 35, Services = 35,
StoredProcedures = 36, Signatures = 36,
SymmetricKeys = 37, StoredProcedures = 37,
Synonyms = 38, SymmetricKeys = 38,
Tables = 39, Synonyms = 39,
TableValuedFunctions = 40, Tables = 40,
UserDefinedDataTypes = 41, TableValuedFunctions = 41,
UserDefinedTableTypes = 42, UserDefinedDataTypes = 42,
ClrUserDefinedTypes = 43, UserDefinedTableTypes = 43,
Users = 44, ClrUserDefinedTypes = 44,
Views = 45, Users = 45,
XmlSchemaCollections = 46, Views = 46,
Audits = 47, XmlSchemaCollections = 47,
Credentials = 48, Audits = 48,
CryptographicProviders = 49, Credentials = 49,
DatabaseAuditSpecifications = 50, CryptographicProviders = 50,
DatabaseEncryptionKeys = 51, DatabaseAuditSpecifications = 51,
DatabaseScopedCredentials = 52, DatabaseEncryptionKeys = 52,
Endpoints = 53, DatabaseScopedCredentials = 53,
ErrorMessages = 54, Endpoints = 54,
EventNotifications = 55, ErrorMessages = 55,
EventSessions = 56, EventNotifications = 56,
LinkedServerLogins = 57, EventSessions = 57,
LinkedServers = 58, LinkedServerLogins = 58,
Logins = 59, LinkedServers = 59,
MasterKeys = 60, Logins = 60,
Routes = 61, MasterKeys = 61,
ServerAuditSpecifications = 62, Routes = 62,
ServerRoleMembership = 63, ServerAuditSpecifications = 63,
ServerRoles = 64, ServerRoleMembership = 64,
ServerTriggers = 65 ServerRoles = 65,
ServerTriggers = 66
} }
export interface SchemaCompareObjectId { export interface SchemaCompareObjectId {

95
src/sql/workbench/api/common/sqlExtHostTypes.ts
View File

@@ -622,53 +622,54 @@ export enum SchemaObjectType {
ExternalFileFormats = 16, ExternalFileFormats = 16,
ExternalTables = 17, ExternalTables = 17,
Filegroups = 18, Filegroups = 18,
FileTables = 19, Files = 19,
FullTextCatalogs = 20, FileTables = 20,
FullTextStoplists = 21, FullTextCatalogs = 21,
MessageTypes = 22, FullTextStoplists = 22,
PartitionFunctions = 23, MessageTypes = 23,
PartitionSchemes = 24, PartitionFunctions = 24,
Permissions = 25, PartitionSchemes = 25,
Queues = 26, Permissions = 26,
RemoteServiceBindings = 27, Queues = 27,
RoleMembership = 28, RemoteServiceBindings = 28,
Rules = 29, RoleMembership = 29,
ScalarValuedFunctions = 30, Rules = 30,
SearchPropertyLists = 31, ScalarValuedFunctions = 31,
SecurityPolicies = 32, SearchPropertyLists = 32,
Sequences = 33, SecurityPolicies = 33,
Services = 34, Sequences = 34,
Signatures = 35, Services = 35,
StoredProcedures = 36, Signatures = 36,
SymmetricKeys = 37, StoredProcedures = 37,
Synonyms = 38, SymmetricKeys = 38,
Tables = 39, Synonyms = 39,
TableValuedFunctions = 40, Tables = 40,
UserDefinedDataTypes = 41, TableValuedFunctions = 41,
UserDefinedTableTypes = 42, UserDefinedDataTypes = 42,
ClrUserDefinedTypes = 43, UserDefinedTableTypes = 43,
Users = 44, ClrUserDefinedTypes = 44,
Views = 45, Users = 45,
XmlSchemaCollections = 46, Views = 46,
Audits = 47, XmlSchemaCollections = 47,
Credentials = 48, Audits = 48,
CryptographicProviders = 49, Credentials = 49,
DatabaseAuditSpecifications = 50, CryptographicProviders = 50,
DatabaseEncryptionKeys = 51, DatabaseAuditSpecifications = 51,
DatabaseScopedCredentials = 52, DatabaseEncryptionKeys = 52,
Endpoints = 53, DatabaseScopedCredentials = 53,
ErrorMessages = 54, Endpoints = 54,
EventNotifications = 55, ErrorMessages = 55,
EventSessions = 56, EventNotifications = 56,
LinkedServerLogins = 57, EventSessions = 57,
LinkedServers = 58, LinkedServerLogins = 58,
Logins = 59, LinkedServers = 59,
MasterKeys = 60, Logins = 60,
Routes = 61, MasterKeys = 61,
ServerAuditSpecifications = 62, Routes = 62,
ServerRoleMembership = 63, ServerAuditSpecifications = 63,
ServerRoles = 64, ServerRoleMembership = 64,
ServerTriggers = 65 ServerRoles = 65,
ServerTriggers = 66
} }
export enum ColumnType { export enum ColumnType {