Merge branch 'dev' into feature/queryBatchProcessing

This commit is contained in:
benrr101
2016-08-19 15:31:02 -07:00
7 changed files with 17 additions and 12 deletions

View File

@@ -107,7 +107,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution
ServerName = "sqltools11"
};
return new ConnectionInfo(CreateMockFactory(data, throwOnRead), "test://test", connDetails);
return new ConnectionInfo(CreateMockFactory(data, throwOnRead), OwnerUri, connDetails);
}
#endregion

View File

@@ -381,6 +381,9 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution
//VerifyQueryExecuteCallCount(requestContext, Times.Once(), Times.Never(), Times.Never());
//Assert.NotNull(result.Messages);
//Assert.NotEmpty(result.Messages);
// ... There should not be an active query
Assert.Empty(queryService.ActiveQueries);
}
//[Fact]

View File

@@ -91,6 +91,12 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Utility
public override int FieldCount { get { return Rows?.Current.Count ?? 0; } }
public override int RecordsAffected
{
// Mimics the behavior of SqlDataReader
get { return Rows != null ? -1 : 1; }
}
#region Not Implemented
public override bool GetBoolean(int ordinal)
@@ -200,7 +206,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Utility
public override int Depth { get; }
public override bool IsClosed { get; }
public override int RecordsAffected { get; }
#endregion
}