diff --git a/Packages.props b/Packages.props index eda9e6cc..61db385f 100644 --- a/Packages.props +++ b/Packages.props @@ -21,7 +21,7 @@ - + diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx index 0b7b21f7..d8e3afff 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx @@ -4674,7 +4674,7 @@ The Query Processor estimates that implementing the following index could improv - Enables or disables an IDENTITY constraint for data inserted by a replication process. + Enables or disables the constraint for data inserted by a replication process. diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings index 5ba08580..f4e2154b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings @@ -2241,7 +2241,7 @@ TableColumnIdentitySeedPropertyDescription = Displays the initial row value for TableDesignerIsEnabledPropertyTitle = Is Enabled ForeignKeyIsEnabledDescription = Specifies whether the foreign key is Enabled ForeignKeyIsNotForReplicationTitle = Not For Replication -ForeignKeyIsNotForReplicationDescription = Enables or disables an IDENTITY constraint for data inserted by a replication process. +ForeignKeyIsNotForReplicationDescription = Enables or disables the constraint for data inserted by a replication process. SqlForeignKeyAction_NoAction = No Action SqlForeignKeyAction_Cascade = Cascade SqlForeignKeyAction_SetNull = Set Null diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf index 818f42f5..235299fd 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf @@ -5661,8 +5661,8 @@ - Enables or disables an IDENTITY constraint for data inserted by a replication process. - Enables or disables an IDENTITY constraint for data inserted by a replication process. + Enables or disables the constraint for data inserted by a replication process. + Enables or disables the constraint for data inserted by a replication process. diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/TableInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/TableInfo.cs index 5e9d52b7..8021e3ae 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/TableInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/TableInfo.cs @@ -23,5 +23,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts public string ConnectionString { get; set; } public string Id { get; set; } + + public string AccessToken { get; set; } } } \ No newline at end of file diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs index e522449b..4a337579 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs @@ -515,6 +515,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner tableViewModel.Name.Value = table.Name; tableViewModel.Schema.Value = table.Schema; tableViewModel.Description.Value = table.Description; + tableViewModel.Description.Enabled = false; // TODO: https://github.com/microsoft/azuredatastudio/issues/18247 foreach (var column in table.Columns.Items) { @@ -771,7 +772,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner var connectinStringbuilder = new SqlConnectionStringBuilder(tableInfo.ConnectionString); connectinStringbuilder.InitialCatalog = tableInfo.Database; var connectionString = connectinStringbuilder.ToString(); - var tableDesigner = new Dac.TableDesigner(connectionString, tableInfo.Schema, tableInfo.Name, tableInfo.IsNewTable); + var tableDesigner = new Dac.TableDesigner(connectionString, tableInfo.AccessToken, tableInfo.Schema, tableInfo.Name, tableInfo.IsNewTable); this.idTableMap[tableInfo.Id] = tableDesigner; return tableDesigner; }