mirror of
https://github.com/ckaczor/sqltoolsservice.git
synced 2026-02-16 10:58:30 -05:00
Removing Exclude/Include to show in tasks view (parity with SSDT) (#814)
This commit is contained in:
@@ -2925,22 +2925,6 @@ namespace Microsoft.SqlTools.ServiceLayer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string IncludeNodeTaskName
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return Keys.GetString(Keys.IncludeNodeTaskName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string ExcludeNodeTaskName
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return Keys.GetString(Keys.ExcludeNodeTaskName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string SchemaCompareExcludeIncludeNodeNotFound
|
public static string SchemaCompareExcludeIncludeNodeNotFound
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@@ -4283,12 +4267,6 @@ namespace Microsoft.SqlTools.ServiceLayer
|
|||||||
public const string PublishChangesTaskName = "PublishChangesTaskName";
|
public const string PublishChangesTaskName = "PublishChangesTaskName";
|
||||||
|
|
||||||
|
|
||||||
public const string IncludeNodeTaskName = "IncludeNodeTaskName";
|
|
||||||
|
|
||||||
|
|
||||||
public const string ExcludeNodeTaskName = "ExcludeNodeTaskName";
|
|
||||||
|
|
||||||
|
|
||||||
public const string SchemaCompareExcludeIncludeNodeNotFound = "SchemaCompareExcludeIncludeNodeNotFound";
|
public const string SchemaCompareExcludeIncludeNodeNotFound = "SchemaCompareExcludeIncludeNodeNotFound";
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1715,14 +1715,6 @@
|
|||||||
<value>Apply schema compare changes</value>
|
<value>Apply schema compare changes</value>
|
||||||
<comment></comment>
|
<comment></comment>
|
||||||
</data>
|
</data>
|
||||||
<data name="IncludeNodeTaskName" xml:space="preserve">
|
|
||||||
<value>Include schema compare node</value>
|
|
||||||
<comment></comment>
|
|
||||||
</data>
|
|
||||||
<data name="ExcludeNodeTaskName" xml:space="preserve">
|
|
||||||
<value>Exclude schema compare node</value>
|
|
||||||
<comment></comment>
|
|
||||||
</data>
|
|
||||||
<data name="SchemaCompareExcludeIncludeNodeNotFound" xml:space="preserve">
|
<data name="SchemaCompareExcludeIncludeNodeNotFound" xml:space="preserve">
|
||||||
<value>Failed to find the specified change in the model</value>
|
<value>Failed to find the specified change in the model</value>
|
||||||
<comment></comment>
|
<comment></comment>
|
||||||
|
|||||||
@@ -796,6 +796,4 @@ ExtractInvalidVersion = Invalid version '{0}' passed. Version must be in the for
|
|||||||
############################################################################
|
############################################################################
|
||||||
# Schema Compare
|
# Schema Compare
|
||||||
PublishChangesTaskName = Apply schema compare changes
|
PublishChangesTaskName = Apply schema compare changes
|
||||||
IncludeNodeTaskName = Include schema compare node
|
|
||||||
ExcludeNodeTaskName = Exclude schema compare node
|
|
||||||
SchemaCompareExcludeIncludeNodeNotFound = Failed to find the specified change in the model
|
SchemaCompareExcludeIncludeNodeNotFound = Failed to find the specified change in the model
|
||||||
@@ -1991,16 +1991,6 @@
|
|||||||
<target state="new">Apply schema compare changes</target>
|
<target state="new">Apply schema compare changes</target>
|
||||||
<note></note>
|
<note></note>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="IncludeNodeTaskName">
|
|
||||||
<source>Include schema compare node</source>
|
|
||||||
<target state="new">Include schema compare node</target>
|
|
||||||
<note></note>
|
|
||||||
</trans-unit>
|
|
||||||
<trans-unit id="ExcludeNodeTaskName">
|
|
||||||
<source>Exclude schema compare node</source>
|
|
||||||
<target state="new">Exclude schema compare node</target>
|
|
||||||
<note></note>
|
|
||||||
</trans-unit>
|
|
||||||
<trans-unit id="SchemaCompareExcludeIncludeNodeNotFound">
|
<trans-unit id="SchemaCompareExcludeIncludeNodeNotFound">
|
||||||
<source>Failed to find the specified change in the model</source>
|
<source>Failed to find the specified change in the model</source>
|
||||||
<target state="new">Failed to find the specified change in the model</target>
|
<target state="new">Failed to find the specified change in the model</target>
|
||||||
|
|||||||
@@ -183,13 +183,9 @@ namespace Microsoft.SqlTools.ServiceLayer.SchemaCopmare
|
|||||||
{
|
{
|
||||||
SchemaComparisonResult compareResult = schemaCompareResults.Value[parameters.OperationId];
|
SchemaComparisonResult compareResult = schemaCompareResults.Value[parameters.OperationId];
|
||||||
operation = new SchemaCompareIncludeExcludeNodeOperation(parameters, compareResult);
|
operation = new SchemaCompareIncludeExcludeNodeOperation(parameters, compareResult);
|
||||||
SqlTask sqlTask = null;
|
|
||||||
TaskMetadata metadata = new TaskMetadata();
|
|
||||||
metadata.TaskOperation = operation;
|
|
||||||
metadata.Name = parameters.IncludeRequest ? SR.IncludeNodeTaskName : SR.ExcludeNodeTaskName;
|
|
||||||
|
|
||||||
sqlTask = SqlTaskManagerInstance.CreateAndRun<SqlTask>(metadata);
|
|
||||||
|
|
||||||
|
operation.Execute(parameters.TaskExecutionMode);
|
||||||
|
|
||||||
await requestContext.SendResult(new ResultStatus()
|
await requestContext.SendResult(new ResultStatus()
|
||||||
{
|
{
|
||||||
Success = true,
|
Success = true,
|
||||||
|
|||||||
Reference in New Issue
Block a user