Skip to content
This repository was archived by the owner on Aug 15, 2024. It is now read-only.

Make streamId a sql parameter of type SqlDbType.Char (cherrypicked from #197) #201

Merged
damianh merged 3 commits into from
Oct 26, 2018
Merged

Make streamId a sql parameter of type SqlDbType.Char (cherrypicked from #197) #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef8a74d
Set version to 1.1.3
damianh Oct 26, 2018
9551052
Make streamId a sql parameter of type SqlDbType.Char so no implicit c…
damianh Oct 26, 2018
0b476ac
Add travis config
damianh Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
language: csharp
mono: none
dotnet: 2.1.202
sudo: required
dist: trusty
script: ./build.sh
env:
global:
secure: e2TyjuwV8DgvfkM/NsZw7Q2Trt7IDO6roqQJHa/xbQh4ZInp2JPLgg/f6YVF51dpBxfxsmYSLBbsnj8SLoTuSa904lyoI7p/xY1CDvvQUPiBQD2ORkSkne7RWepZXg5uwm9DQTJJXohR/aPnpNnFGr8RWMhCfIOPgc6wEX7EVCA=
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<VersionPrefix>1.1.2</VersionPrefix>
<VersionPrefix>1.1.3</VersionPrefix>
<Authors>Damian Hickey</Authors>
<PackageProjectUrl>https://github.com/damianh/SqlStreamStore</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/damianh/SqlStreamStore/blob/master/LICENSE</PackageLicenseUrl>
Expand Down
8 changes: 4 additions & 4 deletions src/SqlStreamStore.MsSql/MsSqlStreamStore.AppendStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ private async Task<MsSqlAppendResult> AppendToStreamExpectedVersionAny(
{
using(var command = new SqlCommand(_scripts.AppendStreamExpectedVersionAny, connection, transaction))
{
command.Parameters.AddWithValue("streamId", sqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = sqlStreamId.Id });
command.Parameters.AddWithValue("streamIdOriginal", sqlStreamId.IdOriginal);

if (messages.Any())
Expand Down Expand Up @@ -236,7 +236,7 @@ private async Task<MsSqlAppendResult> AppendToStreamExpectedVersionNoStream(
{
using(var command = new SqlCommand(_scripts.AppendStreamExpectedVersionNoStream, connection, transaction))
{
command.Parameters.AddWithValue("streamId", sqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = sqlStreamId.Id });
command.Parameters.AddWithValue("streamIdOriginal", sqlStreamId.IdOriginal);

if(messages.Length != 0)
Expand Down Expand Up @@ -343,7 +343,7 @@ private async Task<MsSqlAppendResult> AppendToStreamExpectedVersion(

using(var command = new SqlCommand(_scripts.AppendStreamExpectedVersion, connection, transaction))
{
command.Parameters.AddWithValue("streamId", sqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = sqlStreamId.Id });
command.Parameters.AddWithValue("expectedStreamVersion", expectedVersion);
var eventsParam = CreateNewMessagesSqlParameter(sqlDataRecords);
command.Parameters.Add(eventsParam);
Expand Down Expand Up @@ -459,7 +459,7 @@ private async Task<int> GetStreamVersionOfMessageId(
{
using(var command = new SqlCommand(_scripts.GetStreamVersionOfMessageId, connection, transaction))
{
command.Parameters.AddWithValue("streamId", sqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = sqlStreamId.Id });
command.Parameters.AddWithValue("messageId", messageId);

var result = await command.ExecuteScalarAsync(cancellationToken)
Expand Down
7 changes: 4 additions & 3 deletions src/SqlStreamStore.MsSql/MsSqlStreamStore.Delete.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
namespace SqlStreamStore
{
using System;
using System.Data;
using System.Data.SqlClient;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -38,7 +39,7 @@ protected override async Task DeleteEventInternal(
bool deleted;
using (var command = new SqlCommand(_scripts.DeleteStreamMessage, connection, transaction))
{
command.Parameters.AddWithValue("streamId", sqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = sqlStreamId.Id });
command.Parameters.AddWithValue("eventId", eventId);
var count = await command
.ExecuteScalarAsync(cancellationToken)
Expand Down Expand Up @@ -76,7 +77,7 @@ private async Task DeleteStreamExpectedVersion(
{
using(var command = new SqlCommand(_scripts.DeleteStreamExpectedVersion, connection, transaction))
{
command.Parameters.AddWithValue("streamId", streamIdInfo.SqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = streamIdInfo.SqlStreamId.Id });
command.Parameters.AddWithValue("expectedStreamVersion", expectedVersion);
try
{
Expand Down Expand Up @@ -142,7 +143,7 @@ private async Task DeleteStreamAnyVersion(
bool aStreamIsDeleted;
using (var command = new SqlCommand(_scripts.DeleteStreamAnyVersion, connection, transaction))
{
command.Parameters.AddWithValue("streamId", sqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = sqlStreamId.Id });
var i = await command
.ExecuteScalarAsync(cancellationToken)
.NotOnCapturedContext();
Expand Down
5 changes: 3 additions & 2 deletions src/SqlStreamStore.MsSql/MsSqlStreamStore.ReadStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Threading;
Expand Down Expand Up @@ -91,7 +92,7 @@ private async Task<ReadStreamPage> ReadStreamInternal(

using (var command = new SqlCommand(commandText, connection, transaction))
{
command.Parameters.AddWithValue("streamId", sqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = sqlStreamId.Id });
command.Parameters.AddWithValue("count", count + 1); //Read extra row to see if at end or not
command.Parameters.AddWithValue("streamVersion", streamVersion);

Expand Down Expand Up @@ -185,7 +186,7 @@ private async Task<string> GetJsonData(string streamId, int streamVersion, Cance
await connection.OpenAsync(cancellationToken).NotOnCapturedContext();
using(var command = new SqlCommand(_scripts.ReadMessageData, connection))
{
command.Parameters.AddWithValue("streamId", streamId);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = streamId });
command.Parameters.AddWithValue("streamVersion", streamVersion);

var jsonData = (string)await command.ExecuteScalarAsync(cancellationToken).NotOnCapturedContext();
Expand Down
4 changes: 2 additions & 2 deletions src/SqlStreamStore.MsSql/MsSqlStreamStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ protected override async Task<int> GetStreamMessageCount(
using(var command = new SqlCommand(_scripts.GetStreamMessageCount, connection))
{
var streamIdInfo = new StreamIdInfo(streamId);
command.Parameters.AddWithValue("streamId", streamIdInfo.SqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = streamIdInfo.SqlStreamId.Id });

var result = await command
.ExecuteScalarAsync(cancellationToken)
Expand All @@ -235,7 +235,7 @@ public async Task<int> GetmessageCount(
using (var command = new SqlCommand(_scripts.GetStreamMessageBeforeCreatedCount, connection))
{
var streamIdInfo = new StreamIdInfo(streamId);
command.Parameters.AddWithValue("streamId", streamIdInfo.SqlStreamId.Id);
command.Parameters.Add(new SqlParameter("streamId", SqlDbType.Char, 42) { Value = streamIdInfo.SqlStreamId.Id });
command.Parameters.AddWithValue("created", createdBefore);

var result = await command
Expand Down