Integrate generate script with task service (#426)

* Support generate script for backup

* change

* update task service data contract for Generate Script

* more changes

* update test

* add comments

* Add missing files

* update stub backup operation for testing

* pr comments

* remove empty space

* Fix tests

* Add unit/integration tests and isCancelable to TaskInfo

* address pr comments

* pr comments - fix tests

* fix minor issue

* fix minor issues

* remove unused variable
This commit is contained in:
Kate Shin
2017-08-09 19:59:40 -07:00
committed by GitHub
parent 6696b7e72f
commit cd870e6f15
26 changed files with 845 additions and 386 deletions

View File

@@ -3277,27 +3277,27 @@ namespace Microsoft.SqlTools.ServiceLayer
}
}
public static string Backup_TaskName
public static string BackupTaskName
{
get
{
return Keys.GetString(Keys.Backup_TaskName);
return Keys.GetString(Keys.BackupTaskName);
}
}
public static string Task_InProgress
public static string TaskInProgress
{
get
{
return Keys.GetString(Keys.Task_InProgress);
return Keys.GetString(Keys.TaskInProgress);
}
}
public static string Task_Completed
public static string TaskCompleted
{
get
{
return Keys.GetString(Keys.Task_Completed);
return Keys.GetString(Keys.TaskCompleted);
}
}
@@ -3485,6 +3485,14 @@ namespace Microsoft.SqlTools.ServiceLayer
}
}
public static string ScriptTaskName
{
get
{
return Keys.GetString(Keys.ScriptTaskName);
}
}
public static string ConnectionServiceListDbErrorNotConnected(string uri)
{
return Keys.GetString(Keys.ConnectionServiceListDbErrorNotConnected, uri);
@@ -4823,13 +4831,13 @@ namespace Microsoft.SqlTools.ServiceLayer
public const string prototype_file_noApplicableFileGroup = "prototype_file_noApplicableFileGroup";
public const string Backup_TaskName = "Backup_TaskName";
public const string BackupTaskName = "BackupTaskName";
public const string Task_InProgress = "Task_InProgress";
public const string TaskInProgress = "TaskInProgress";
public const string Task_Completed = "Task_Completed";
public const string TaskCompleted = "TaskCompleted";
public const string ConflictWithNoRecovery = "ConflictWithNoRecovery";
@@ -4901,6 +4909,9 @@ namespace Microsoft.SqlTools.ServiceLayer
public const string TheLastBackupTaken = "TheLastBackupTaken";
public const string ScriptTaskName = "ScriptTaskName";
private Keys()
{ }

View File

@@ -1811,15 +1811,15 @@
<value>No Applicable Filegroup</value>
<comment></comment>
</data>
<data name="Backup_TaskName" xml:space="preserve">
<data name="BackupTaskName" xml:space="preserve">
<value>Backup Database</value>
<comment></comment>
</data>
<data name="Task_InProgress" xml:space="preserve">
<data name="TaskInProgress" xml:space="preserve">
<value>In progress</value>
<comment></comment>
</data>
<data name="Task_Completed" xml:space="preserve">
<data name="TaskCompleted" xml:space="preserve">
<value>Completed</value>
<comment></comment>
</data>
@@ -1915,4 +1915,8 @@
<value>The last backup taken ({0})</value>
<comment></comment>
</data>
<data name="ScriptTaskName" xml:space="preserve">
<value>scripting</value>
<comment></comment>
</data>
</root>

View File

@@ -805,12 +805,12 @@ prototype_file_noApplicableFileGroup = No Applicable Filegroup
############################################################################
# Backup Service
Backup_TaskName = Backup Database
BackupTaskName = Backup Database
############################################################################
# Task Service
Task_InProgress = In progress
Task_Completed = Completed
TaskInProgress = In progress
TaskCompleted = Completed
###########################################################################
# Restore
@@ -836,4 +836,8 @@ RestoreBackupSetFinishDate = Finish Date
RestoreBackupSetSize = Size
RestoreBackupSetUserName = User Name
RestoreBackupSetExpiration = Expiration
TheLastBackupTaken = The last backup taken ({0})
TheLastBackupTaken = The last backup taken ({0})
############################################################################
# Generate Script
ScriptTaskName = scripting

View File

@@ -2110,20 +2110,6 @@
<source>Result set has too many rows to be safely loaded</source>
<target state="new">Result set has too many rows to be safely loaded</target>
</trans-unit>
<trans-unit id="Backup_TaskName">
<source>Backup Database</source>
<target state="new">Backup Database</target>
<note></note>
</trans-unit>
<trans-unit id="Task_InProgress">
<source>In progress</source>
<target state="new">In progress</target>
<note></note>
</trans-unit>
<trans-unit id="Task_Completed">
<source>Completed</source>
<target state="new">Completed</target>
</trans-unit>
<trans-unit id="prototype_db_prop_parameterization">
<source>Parameterization</source>
<target state="new">Parameterization</target>
@@ -2244,6 +2230,26 @@
<target state="new">The last backup taken ({0})</target>
<note></note>
</trans-unit>
<trans-unit id="BackupTaskName">
<source>Backup Database</source>
<target state="new">Backup Database</target>
<note></note>
</trans-unit>
<trans-unit id="TaskInProgress">
<source>In progress</source>
<target state="new">In progress</target>
<note></note>
</trans-unit>
<trans-unit id="TaskCompleted">
<source>Completed</source>
<target state="new">Completed</target>
<note></note>
</trans-unit>
<trans-unit id="ScriptTaskName">
<source>scripting</source>
<target state="new">scripting</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>