Removed the last remnants of the EventFlow.EventStores.MsSql project and made the SQL scripts idempotent

rasmus · rasmus · commit b29f1d8b730b · 2016-03-29T20:12:03.000+02:00
diff --git a/EventFlow.sln b/EventFlow.sln
@@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{7387D1
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventFlow", "Source\EventFlow\EventFlow.csproj", "{11131251-778D-4D2E-BDD1-4844A789BCA9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventFlow.EventStores.MsSql", "Source\EventFlow.EventStores.MsSql\EventFlow.EventStores.MsSql.csproj", "{0C92026E-7E6D-40B9-A4DD-A7041E23AA7D}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MSSQL", "MSSQL", "{E4FC24C0-3EB3-4203-B4F2-0B534B42574A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventFlow.Tests", "Source\EventFlow.Tests\EventFlow.Tests.csproj", "{7747E4A0-B378-46B6-837D-5E78C497B061}"
@@ -88,10 +86,6 @@ Global
 		{11131251-778D-4D2E-BDD1-4844A789BCA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11131251-778D-4D2E-BDD1-4844A789BCA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11131251-778D-4D2E-BDD1-4844A789BCA9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C92026E-7E6D-40B9-A4DD-A7041E23AA7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C92026E-7E6D-40B9-A4DD-A7041E23AA7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C92026E-7E6D-40B9-A4DD-A7041E23AA7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C92026E-7E6D-40B9-A4DD-A7041E23AA7D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7747E4A0-B378-46B6-837D-5E78C497B061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7747E4A0-B378-46B6-837D-5E78C497B061}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7747E4A0-B378-46B6-837D-5E78C497B061}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -189,7 +183,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{0C92026E-7E6D-40B9-A4DD-A7041E23AA7D} = {E4FC24C0-3EB3-4203-B4F2-0B534B42574A}
 		{E4FC24C0-3EB3-4203-B4F2-0B534B42574A} = {92F3C263-8C0C-4D12-B41A-452E48D2E5E8}
 		{A6F6232B-764F-4428-9EB5-CC98BE4F5E90} = {E4FC24C0-3EB3-4203-B4F2-0B534B42574A}
 		{EE6F7B78-3EF1-488F-B90A-8E7F350B7D51} = {9876C758-0A72-400E-A1B1-685E1C22ACB2}
diff --git a/Source/EventFlow.EventStores.MsSql/EventFlow.EventStores.MsSql.csproj b/Source/EventFlow.EventStores.MsSql/EventFlow.EventStores.MsSql.csproj
diff --git a/Source/EventFlow.EventStores.MsSql/EventFlow.EventStores.MsSql.nuspec b/Source/EventFlow.EventStores.MsSql/EventFlow.EventStores.MsSql.nuspec
@@ -2,10 +2,10 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>EventFlow.EventStores.MsSql</id>
-    <title>EventFlow.EventStores.MsSql - MSSQL event store</title>
+    <title>[Deprecated] EventFlow.EventStores.MsSql</title>
     <version>0.0.0</version>
     <authors>rasmus</authors>
-    <description>MSSQL event store for EventFlow</description>
+    <description>Deprecated MSSQL event store package for EventFlow. All content has been moved to EventFlow.MsSql.</description>
     <language>en-US</language>
     <iconUrl>https://raw.githubusercontent.com/rasmus/EventFlow/master/icon-256.png</iconUrl>
     <projectUrl>https://github.com/rasmus/EventFlow</projectUrl>
@@ -17,7 +17,4 @@
     @dependencies@
     @references@
   </metadata>
-  <files>
-  	<file src="bin\EventFlow.EventStores.MsSql.dll" target="lib\net451" />
-  </files>
 </package>
diff --git a/Source/EventFlow.EventStores.MsSql/Properties/AssemblyInfo.cs b/Source/EventFlow.EventStores.MsSql/Properties/AssemblyInfo.cs
diff --git a/Source/EventFlow.EventStores.MsSql/Scripts/0001 - Create table EventFlow.sql b/Source/EventFlow.EventStores.MsSql/Scripts/0001 - Create table EventFlow.sql
diff --git a/Source/EventFlow.EventStores.MsSql/Scripts/0002 - Create eventdatamodel_list_type.sql b/Source/EventFlow.EventStores.MsSql/Scripts/0002 - Create eventdatamodel_list_type.sql
diff --git a/Source/EventFlow.EventStores.MsSql/paket.references b/Source/EventFlow.EventStores.MsSql/paket.references
diff --git a/Source/EventFlow.MsSql.Tests/EventFlow.MsSql.Tests.csproj b/Source/EventFlow.MsSql.Tests/EventFlow.MsSql.Tests.csproj
@@ -57,10 +57,6 @@
     <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EventFlow.EventStores.MsSql\EventFlow.EventStores.MsSql.csproj">
-      <Project>{0c92026e-7e6d-40b9-a4dd-a7041e23aa7d}</Project>
-      <Name>EventFlow.EventStores.MsSql</Name>
-    </ProjectReference>
     <ProjectReference Include="..\EventFlow.MsSql\EventFlow.MsSql.csproj">
       <Project>{a0c8e77f-db74-4035-b0de-9baddfca5ebe}</Project>
       <Name>EventFlow.MsSql</Name>
diff --git a/Source/EventFlow.MsSql.Tests/IntegrationTests/EventStores/MsSqlEventStoreTests.cs b/Source/EventFlow.MsSql.Tests/IntegrationTests/EventStores/MsSqlEventStoreTests.cs
@@ -23,7 +23,6 @@
 // 
 
 using EventFlow.Configuration;
-using EventFlow.EventStores.MsSql;
 using EventFlow.Extensions;
 using EventFlow.MsSql.EventStores;
 using EventFlow.MsSql.Extensions;
diff --git a/Source/EventFlow.MsSql.Tests/IntegrationTests/EventStores/MsSqlScriptsTests.cs b/Source/EventFlow.MsSql.Tests/IntegrationTests/EventStores/MsSqlScriptsTests.cs
@@ -23,8 +23,8 @@
 // 
 
 using System.Linq;
-using EventFlow.EventStores.MsSql;
 using EventFlow.Extensions;
+using EventFlow.MsSql.EventStores;
 using EventFlow.TestHelpers;
 using EventFlow.TestHelpers.Extensions;
 using Helpz.MsSql;
diff --git a/Source/EventFlow.MsSql.Tests/IntegrationTests/ReadStores/MsSqlReadModelStoreTests.cs b/Source/EventFlow.MsSql.Tests/IntegrationTests/ReadStores/MsSqlReadModelStoreTests.cs
@@ -25,8 +25,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using EventFlow.Configuration;
-using EventFlow.EventStores.MsSql;
 using EventFlow.Extensions;
+using EventFlow.MsSql.EventStores;
 using EventFlow.MsSql.Extensions;
 using EventFlow.MsSql.Tests.IntegrationTests.ReadStores.QueryHandlers;
 using EventFlow.MsSql.Tests.IntegrationTests.ReadStores.ReadModels;
diff --git a/Source/EventFlow.MsSql/EventFlow.MsSql.csproj b/Source/EventFlow.MsSql/EventFlow.MsSql.csproj
@@ -46,6 +46,7 @@
     </Compile>
     <Compile Include="Connections\IMsSqlConnectionFactory.cs" />
     <Compile Include="Connections\MsSqlConnectionFactory.cs" />
+    <Compile Include="EventStores\EventFlowEventStoresMsSql.cs" />
     <Compile Include="EventStores\MsSqlEventPersistence.cs" />
     <Compile Include="Extensions\EventFlowOptionsMsSqlEventStoreExtensions.cs" />
     <Compile Include="Extensions\EventFlowOptionsMsSqlExtensions.cs" />
@@ -84,6 +85,12 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="EventStores\Scripts\0001 - Create table EventFlow.sql" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="EventStores\Scripts\0002 - Create eventdatamodel_list_type.sql" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Source/EventFlow.MsSql/EventStores/EventFlowEventStoresMsSql.cs b/Source/EventFlow.MsSql/EventStores/EventFlowEventStoresMsSql.cs
@@ -23,9 +23,8 @@
 //
 
 using System.Reflection;
-using EventFlow.MsSql;
 
-namespace EventFlow.EventStores.MsSql
+namespace EventFlow.MsSql.EventStores
 {
     public static class EventFlowEventStoresMsSql
     {
diff --git a/Source/EventFlow.MsSql/EventStores/Scripts/0001 - Create table EventFlow.sql b/Source/EventFlow.MsSql/EventStores/Scripts/0001 - Create table EventFlow.sql
@@ -0,0 +1,22 @@
+﻿IF NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE table_schema = N'dbo'  AND table_name = N'EventFlow')
+BEGIN
+	CREATE TABLE [dbo].[EventFlow](
+		[GlobalSequenceNumber] [bigint] IDENTITY(1,1) NOT NULL,
+		[BatchId] [uniqueidentifier] NOT NULL,
+		[AggregateId] [nvarchar](255) NOT NULL,
+		[AggregateName] [nvarchar](255) NOT NULL,
+		[Data] [nvarchar](max) NOT NULL,
+		[Metadata] [nvarchar](max) NOT NULL,
+		[AggregateSequenceNumber] [int] NOT NULL,
+		CONSTRAINT [PK_EventFlow] PRIMARY KEY CLUSTERED
+		(
+			[GlobalSequenceNumber] ASC
+		)
+	)
+
+	CREATE UNIQUE NONCLUSTERED INDEX [IX_EventFlow_AggregateId_AggregateSequenceNumber] ON [dbo].[EventFlow]
+	(
+		[AggregateId] ASC,
+		[AggregateSequenceNumber] ASC
+	)
+END
diff --git a/Source/EventFlow.MsSql/EventStores/Scripts/0002 - Create eventdatamodel_list_type.sql b/Source/EventFlow.MsSql/EventStores/Scripts/0002 - Create eventdatamodel_list_type.sql
@@ -0,0 +1,12 @@
+﻿IF EXISTS (SELECT * FROM SYS.TYPES WHERE is_table_type = 1 AND name = 'eventdatamodel_list_type')
+BEGIN
+	CREATE TYPE eventdatamodel_list_type AS TABLE
+	(
+		[AggregateId] [nvarchar](255) NOT NULL,
+		[AggregateName] [nvarchar](255) NOT NULL,
+		[AggregateSequenceNumber] [int] NOT NULL,
+		[BatchId] [uniqueidentifier] NOT NULL,
+		[Data] [nvarchar](max) NOT NULL,
+		[Metadata] [nvarchar](max) NOT NULL
+	)
+END
