Merge pull request #17 from Horusiath/dev

Trigger 1.0.5 release

Author: Aaronontheweb

.gitignore

@@ -211,3 +211,6 @@ FakesAssemblies/
 /src/.Akka.boltdata/TestResults.json
 resetdev.bat
 /src/packages/repositories.config
+
+# FAKE build folder
+.fake/

README.md

@@ -16,8 +16,8 @@ akka.persistence.journal.postgresql.connection-string = "<database connection st
 Similar configuration may be used to setup a PostgreSql snapshot store:
 
 ```
-akka.persistence.snasphot-store.plugin = "akka.persistence.snasphot-store.postgresql"
-akka.persistence.snasphot-store.postgresql.connection-string = "<database connection string>"
+akka.persistence.snapshot-store.plugin = "akka.persistence.snapshot-store.postgresql"
+akka.persistence.snapshot-store.postgresql.connection-string = "<database connection string>"
 ```
 
 Remember that connection string must be provided separately to Journal and Snapshot Store. To finish setup simply initialize plugin using: `PostgreSqlPersistence.Init(actorSystem);`
@@ -29,25 +29,27 @@ Both journal and snapshot store share the same configuration keys (however they
 - `class` (string with fully qualified type name) - determines class to be used as a persistent journal. Default: *Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql* (for journal) and *Akka.Persistence.PostgreSql.Snapshot.PostgreSqlSnapshotStore, Akka.Persistence.PostgreSql* (for snapshot store).
 - `plugin-dispatcher` (string with configuration path) - describes a message dispatcher for persistent journal. Default: *akka.actor.default-dispatcher*
 - `connection-string` - connection string used to access PostgreSql database. Default: *none*.
+- `connection-string-name` - in case when connection-string is empty, this field specifies entry in the \*.config connection string section, from where connection string will be taken. Default: *none*.
 - `connection-timeout` - timespan determining default connection timeouts on database-related operations. Default: *30s*
 - `schema-name` - name of the database schema, where journal or snapshot store tables should be placed. Default: *public*
 - `table-name` - name of the table used by either journal or snapshot store. Default: *event_journal* (for journal) or *snapshot_store* (for snapshot store)
 - `auto-initialize` - flag determining if journal or snapshot store related tables should by automatically created when they have not been found in connected database. Default: *false*
+- `timestamp-provider` (journal only) - type of the object used to generate journal event timestamps. Default: *Akka.Persistence.Sql.Common.Journal.DefaultTimestampProvider, Akka.Persistence.Sql.Common*
 
 ### Custom SQL data queries
 
 PostgreSql persistence plugin defines a default table schema used for both journal and snapshot store.
 
 **EventJournal table**:
 
-    +----------------+-------------+------------+---------------+---------+
-    | persistence_id | sequence_nr | is_deleted | payload_type  | payload |
-    +----------------+-------------+------------+---------------+---------+
-    | varchar(200)   | bigint      | boolean    | varchar(500)  | bytea   |
-    +----------------+-------------+------------+---------------+---------+
- 
+    +----------------+-------------+------------+---------------+---------+--------------------------+
+    | persistence_id | sequence_nr | is_deleted | payload_type  | payload |       created_at         |
+    +----------------+-------------+------------+---------------+---------+--------------------------+
+    | varchar(200)   | bigint      | boolean    | varchar(500)  | bytea   | timestamp with time zone |
+    +----------------+-------------+------------+---------------+---------+--------------------------+
+
 **SnapshotStore table**:
- 
+
     +----------------+--------------+--------------------------+------------------+---------------+----------+
     | persistence_id | sequence_nr  | created_at               | created_at_ticks | snapshot_type | snapshot |
     +----------------+--------------+--------------------------+------------------+--------------------------+
@@ -59,9 +61,9 @@ PostgreSql persistence plugin defines a default table schema used for both journ
 Underneath Akka.Persistence.PostgreSql uses the Npgsql library to communicate with the database. You may choose not to use a dedicated built in ones, but to create your own being better fit for your use case. To do so, you have to create your own versions of `IJournalQueryBuilder` and `IJournalQueryMapper` (for custom journals) or `ISnapshotQueryBuilder` and `ISnapshotQueryMapper` (for custom snapshot store) and then attach inside journal, just like in the example below:
 
 ```csharp
-class MyCustomPostgreSqlJournal: Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal 
+class MyCustomPostgreSqlJournal: Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal
 {
-    public MyCustomPostgreSqlJournal() : base() 
+    public MyCustomPostgreSqlJournal() : base()
     {
         QueryBuilder = new MyCustomJournalQueryBuilder();
         QueryMapper = new MyCustomJournalQueryMapper();
@@ -85,4 +87,4 @@ In order to run the tests, you must do the following things:
 2. Install PostgreSql with the default settings.  The default connection string uses the following credentials:
   1. Username: postgres
   2. Password: postgres
-3. A custom app.config file can be used and needs to be placed in the same folder as the dll
+3. A custom app.config file can be used and needs to be placed in the same folder as the dll

RELEASE_NOTES.md

@@ -1,9 +1,16 @@
+#### 1.0.5 August 08 2015 ####
+
+- Changed tables schema: renamed payload_type column to manifest for journal and snapshot tables
+- Changed tables schema: added created_at column to journal table
+- Added compatibility with Persistent queries API
+- Added ability to specify connection string stored in \*.config files
+
 #### 1.0.4 August 07 2015 ####
 
 #### 1.0.3 June 12 2015 ####
 **Bugfix release for Akka.NET v1.0.2.**
 
-This release addresses an issue with Akka.Persistence.SqlServer and Akka.Persistence.PostgreSql where both packages were missing a reference to Akka.Persistence.Sql.Common. 
+This release addresses an issue with Akka.Persistence.SqlServer and Akka.Persistence.PostgreSql where both packages were missing a reference to Akka.Persistence.Sql.Common.
 
 In Akka.NET v1.0.3 we've packaged Akka.Persistence.Sql.Common into its own NuGet package and referenced it in the affected packages.
 

build.cmd

@@ -4,17 +4,17 @@ pushd %~dp0
 
 src\.nuget\NuGet.exe update -self
 
-src\.nuget\NuGet.exe install FAKE -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages -ExcludeVersion -Version 3.28.8
+src\.nuget\NuGet.exe install FAKE -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages -ExcludeVersion -Version 4.1.0
 
 src\.nuget\NuGet.exe install xunit.runner.console -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages\FAKE -ExcludeVersion -Version 2.0.0
 src\.nuget\NuGet.exe install nunit.runners -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages\FAKE -ExcludeVersion -Version 2.6.4
 
-if not exist src\packages\SourceLink.Fake\tools\SourceLink.fsx ( 
+if not exist src\packages\SourceLink.Fake\tools\SourceLink.fsx (
   src\.nuget\nuget.exe install SourceLink.Fake -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages -ExcludeVersion
 )
 rem cls
 
 set encoding=utf-8
 src\packages\FAKE\tools\FAKE.exe build.fsx %*
 
-popd
+popd

src/Akka.Persistence.PostgreSql.Tests/Akka.Persistence.PostgreSql.Tests.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,7 +14,8 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>7066842a</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,23 +35,25 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Akka">
-      <HintPath>..\Packages\Akka.1.0.4\lib\net45\Akka.dll</HintPath>
+    <Reference Include="Akka, Version=1.0.5.14, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.1.0.5\lib\net45\Akka.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Akka.Persistence">
-      <HintPath>..\Packages\Akka.Persistence.1.0.4.12-beta\lib\net45\Akka.Persistence.dll</HintPath>
+    <Reference Include="Akka.Persistence, Version=1.0.5.15, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.Persistence.1.0.5.15-beta\lib\net45\Akka.Persistence.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Akka.Persistence.Sql.Common">
-      <HintPath>..\Packages\Akka.Persistence.Sql.Common.1.0.4.12-beta\lib\net45\Akka.Persistence.Sql.Common.dll</HintPath>
+    <Reference Include="Akka.Persistence.TestKit, Version=1.0.5.15, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.Persistence.TestKit.1.0.5.15-beta\lib\net45\Akka.Persistence.TestKit.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Akka.Persistence.TestKit">
-      <HintPath>..\Packages\Akka.Persistence.TestKit.1.0.4.12-beta\lib\net45\Akka.Persistence.TestKit.dll</HintPath>
+    <Reference Include="Akka.TestKit, Version=1.0.5.14, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.TestKit.1.0.5\lib\net45\Akka.TestKit.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Akka.TestKit">
-      <HintPath>..\Packages\Akka.TestKit.1.0.4\lib\net45\Akka.TestKit.dll</HintPath>
-    </Reference>
-    <Reference Include="Akka.TestKit.Xunit2">
-      <HintPath>..\Packages\Akka.TestKit.Xunit2.1.0.4\lib\net45\Akka.TestKit.Xunit2.dll</HintPath>
+    <Reference Include="Akka.TestKit.Xunit2, Version=1.0.5.14, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.TestKit.Xunit2.1.0.5\lib\net45\Akka.TestKit.Xunit2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Google.ProtocolBuffers">
       <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath>
@@ -79,11 +81,17 @@
     <Reference Include="xunit.abstractions">
       <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -112,7 +120,6 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
   </Target>
   <!-- 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.

src/Akka.Persistence.PostgreSql.Tests/PostgreSqlJournalSpec.cs

@@ -1,14 +1,15 @@
 using System.Configuration;
 using Akka.Configuration;
 using Akka.Persistence.TestKit.Journal;
+using Xunit.Abstractions;
 
 namespace Akka.Persistence.PostgreSql.Tests
 {
     public class PostgreSqlJournalSpec : JournalSpec
     {
         private static readonly Config SpecConfig;
 
-        static PostgreSqlJournalSpec()
+        static PostgreSqlJournalSpec() 
         {
             var connectionString = ConfigurationManager.ConnectionStrings["TestDb"].ConnectionString;
 
@@ -34,8 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
             DbUtils.Initialize();
         }
 
-        public PostgreSqlJournalSpec()
-            : base(SpecConfig, "PostgreSqlJournalSpec")
+        public PostgreSqlJournalSpec(ITestOutputHelper output)
+            : base(SpecConfig, "PostgreSqlJournalSpec", output: output)
         {
             Initialize();
         }

src/Akka.Persistence.PostgreSql.Tests/PostgreSqlSnapshotStoreSpec.cs

@@ -1,6 +1,7 @@
 using System.Configuration;
 using Akka.Configuration;
 using Akka.Persistence.TestKit.Snapshot;
+using Xunit.Abstractions;
 
 namespace Akka.Persistence.PostgreSql.Tests
 {
@@ -34,8 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Snapshot.PostgreSqlSnapshotStore, Akka.Per
             DbUtils.Initialize();
         }
 
-        public PostgreSqlSnapshotStoreSpec()
-            : base(SpecConfig, "PostgreSqlSnapshotStoreSpec")
+        public PostgreSqlSnapshotStoreSpec(ITestOutputHelper output)
+            : base(SpecConfig, "PostgreSqlSnapshotStoreSpec", output: output)
         {
             Initialize();
         }

src/Akka.Persistence.PostgreSql.Tests/app.config

@@ -1,6 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
-    <add name="TestDb" connectionString="Server=localhost;Port=5432;Database=akka_persistence_tests;User Id=postgres;Password=postgres" providerName="Npgsql"/>
+    <add name="TestDb" connectionString="Server=localhost;Port=5432;Database=akka_persistence_tests;User Id=postgres;Password=postgres" providerName="Npgsql" />
   </connectionStrings>
+  <!--<runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="xunit.assert" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.2929" newVersion="2.0.0.2929" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.2929" newVersion="2.0.0.2929" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>-->
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="xunit.assert" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.3179" newVersion="2.1.0.3179" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.3179" newVersion="2.1.0.3179" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

src/Akka.Persistence.PostgreSql.Tests/packages.config

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Akka" version="1.0.4" targetFramework="net45" />
-  <package id="Akka.Persistence" version="1.0.4.12-beta" targetFramework="net45" />
-  <package id="Akka.Persistence.Sql.Common" version="1.0.4.12-beta" targetFramework="net45" />
-  <package id="Akka.Persistence.TestKit" version="1.0.4.12-beta" targetFramework="net45" />
-  <package id="Akka.TestKit" version="1.0.4" targetFramework="net45" />
-  <package id="Akka.TestKit.Xunit2" version="1.0.4" targetFramework="net45" />
+  <package id="Akka" version="1.0.5" targetFramework="net45" />
+  <package id="Akka.Persistence" version="1.0.5.15-beta" targetFramework="net45" />
+  <package id="Akka.Persistence.TestKit" version="1.0.5.15-beta" targetFramework="net45" />
+  <package id="Akka.TestKit" version="1.0.5" targetFramework="net45" />
+  <package id="Akka.TestKit.Xunit2" version="1.0.5" targetFramework="net45" />
   <package id="Google.ProtocolBuffers" version="2.4.1.521" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
   <package id="Npgsql" version="2.2.5" targetFramework="net45" />
-  <package id="xunit" version="2.0.0" targetFramework="net45" />
+  <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
 </packages>