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

enable AAD auth for Table Designer (#1396)

Browse Source
This commit is contained in:
Alan Ren
2022-02-08 12:56:43 -08:00
committed by GitHub
parent 25bbbcf60e
commit 6b1b2720f2
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Packages.props
View File

@@ -21,7 +21,7 @@
<PackageReference Update="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="1.1.1" /> <PackageReference Update="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="1.1.1" />
<PackageReference Update="Microsoft.Data.SqlClient" Version="3.0.0"/> <PackageReference Update="Microsoft.Data.SqlClient" Version="3.0.0"/>
<PackageReference Update="Microsoft.SqlServer.SqlManagementObjects" Version="161.46367.54" /> <PackageReference Update="Microsoft.SqlServer.SqlManagementObjects" Version="161.46367.54" />
<PackageReference Update="Microsoft.SqlServer.DACFx" Version="160.5415.1-preview" GeneratePathProperty="true" /> <PackageReference Update="Microsoft.SqlServer.DACFx" Version="160.5421.1-preview" GeneratePathProperty="true" />
<PackageReference Update="Microsoft.Azure.Kusto.Data" Version="9.0.4" /> <PackageReference Update="Microsoft.Azure.Kusto.Data" Version="9.0.4" />
<PackageReference Update="Microsoft.Azure.Kusto.Language" Version="9.0.4"/> <PackageReference Update="Microsoft.Azure.Kusto.Language" Version="9.0.4"/>
<PackageReference Update="Microsoft.SqlServer.Assessment" Version="[1.0.305]" /> <PackageReference Update="Microsoft.SqlServer.Assessment" Version="[1.0.305]" />

2
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
View File

@@ -4674,7 +4674,7 @@ The Query Processor estimates that implementing the following index could improv
<comment></comment> <comment></comment>
</data> </data>
<data name="ForeignKeyIsNotForReplicationDescription" xml:space="preserve"> <data name="ForeignKeyIsNotForReplicationDescription" xml:space="preserve">
<value>Enables or disables an IDENTITY constraint for data inserted by a replication process.</value> <value>Enables or disables the constraint for data inserted by a replication process.</value>
<comment></comment> <comment></comment>
</data> </data>
<data name="SqlForeignKeyAction_NoAction" xml:space="preserve"> <data name="SqlForeignKeyAction_NoAction" xml:space="preserve">

2
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
View File

@@ -2241,7 +2241,7 @@ TableColumnIdentitySeedPropertyDescription = Displays the initial row value for
TableDesignerIsEnabledPropertyTitle = Is Enabled TableDesignerIsEnabledPropertyTitle = Is Enabled
ForeignKeyIsEnabledDescription = Specifies whether the foreign key is Enabled ForeignKeyIsEnabledDescription = Specifies whether the foreign key is Enabled
ForeignKeyIsNotForReplicationTitle = Not For Replication 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_NoAction = No Action
SqlForeignKeyAction_Cascade = Cascade SqlForeignKeyAction_Cascade = Cascade
SqlForeignKeyAction_SetNull = Set Null SqlForeignKeyAction_SetNull = Set Null

4
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
View File

@@ -5661,8 +5661,8 @@
<note></note> <note></note>
</trans-unit> </trans-unit>
<trans-unit id="ForeignKeyIsNotForReplicationDescription"> <trans-unit id="ForeignKeyIsNotForReplicationDescription">
<source>Enables or disables an IDENTITY constraint for data inserted by a replication process.</source> <source>Enables or disables the constraint for data inserted by a replication process.</source>
<target state="new">Enables or disables an IDENTITY constraint for data inserted by a replication process.</target> <target state="new">Enables or disables the constraint for data inserted by a replication process.</target>
<note></note> <note></note>
</trans-unit> </trans-unit>
<trans-unit id="SqlForeignKeyAction_NoAction"> <trans-unit id="SqlForeignKeyAction_NoAction">

2
src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/TableInfo.cs
View File

@@ -23,5 +23,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
public string ConnectionString { get; set; } public string ConnectionString { get; set; }
public string Id { get; set; } public string Id { get; set; }
public string AccessToken { get; set; }
} }
} }

3
src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs
View File

@@ -515,6 +515,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner
tableViewModel.Name.Value = table.Name; tableViewModel.Name.Value = table.Name;
tableViewModel.Schema.Value = table.Schema; tableViewModel.Schema.Value = table.Schema;
tableViewModel.Description.Value = table.Description; tableViewModel.Description.Value = table.Description;
tableViewModel.Description.Enabled = false; // TODO: https://github.com/microsoft/azuredatastudio/issues/18247
foreach (var column in table.Columns.Items) foreach (var column in table.Columns.Items)
{ {
@@ -771,7 +772,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner
var connectinStringbuilder = new SqlConnectionStringBuilder(tableInfo.ConnectionString); var connectinStringbuilder = new SqlConnectionStringBuilder(tableInfo.ConnectionString);
connectinStringbuilder.InitialCatalog = tableInfo.Database; connectinStringbuilder.InitialCatalog = tableInfo.Database;
var connectionString = connectinStringbuilder.ToString(); 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; this.idTableMap[tableInfo.Id] = tableDesigner;
return tableDesigner; return tableDesigner;
} }