Merge pull request #201 from damianh/patch-1.1.3

Make streamId a sql parameter of type SqlDbType.Char (cherrypicked from #197)
SQLStreamStore · Oct 26, 2018 · 135a6fb · 135a6fb
2 parents 0de9102 + 0b476ac
commit 135a6fb
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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=
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -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>

diff --git a/src/SqlStreamStore.MsSql/MsSqlStreamStore.AppendStream.cs b/src/SqlStreamStore.MsSql/MsSqlStreamStore.AppendStream.cs
@@ -131,7 +131,7 @@ private static async Task<T> RetryOnDeadLock<T>(Func<Task<T>> operation)
         {
             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())
@@ -236,7 +236,7 @@ private static async Task<T> RetryOnDeadLock<T>(Func<Task<T>> operation)
         {
             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)
@@ -343,7 +343,7 @@ private static async Task<T> RetryOnDeadLock<T>(Func<Task<T>> operation)
 
             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);
@@ -459,7 +459,7 @@ private async Task CheckStreamMaxCount(string streamId, int? maxCount, Cancellat
         {
             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)

diff --git a/src/SqlStreamStore.MsSql/MsSqlStreamStore.Delete.cs b/src/SqlStreamStore.MsSql/MsSqlStreamStore.Delete.cs
@@ -1,6 +1,7 @@
 namespace SqlStreamStore
 {
     using System;
+    using System.Data;
     using System.Data.SqlClient;
     using System.Threading;
     using System.Threading.Tasks;
@@ -38,7 +39,7 @@ public partial class MsSqlStreamStore
                     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)
@@ -76,7 +77,7 @@ public partial class MsSqlStreamStore
                 {
                     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
                         {
@@ -142,7 +143,7 @@ await command
             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();

diff --git a/src/SqlStreamStore.MsSql/MsSqlStreamStore.ReadStream.cs b/src/SqlStreamStore.MsSql/MsSqlStreamStore.ReadStream.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Data;
     using System.Data.SqlClient;
     using System.Linq;
     using System.Threading;
@@ -91,7 +92,7 @@ public partial class MsSqlStreamStore
 
             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);
 
@@ -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();

diff --git a/src/SqlStreamStore.MsSql/MsSqlStreamStore.cs b/src/SqlStreamStore.MsSql/MsSqlStreamStore.cs
@@ -210,7 +210,7 @@ await command
                 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)
@@ -235,7 +235,7 @@ await command
                 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