Skip to content

Commit

Permalink
Merge branch 'dev' into change-highest-sequence-nr-sql
Browse files Browse the repository at this point in the history
  • Loading branch information
@Arkatufus
Arkatufus authored Mar 5, 2021
2 parents 0c55131 + 29652a2 commit fd65bfb
Show file tree
Hide file tree
Showing 18 changed files with 31 additions and 38 deletions.
5 changes: 3 additions & 2 deletions src/Akka.Persistence.PostgreSql.Tests/Json/PostgreSqlJournalJsonSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString(@"
akka.persistence {
akka.persistence {
publish-plugin-commands = on
journal {
plugin = ""akka.persistence.journal.postgresql""
Expand All @@ -35,7 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
stored-as = ""jsonb""
}
}
}");
}
akka.test.single-expect-default = 10s");
}

// TODO: hack. Replace when https://github.com/akkadotnet/akka.net/issues/3811
Expand Down
5 changes: 3 additions & 2 deletions src/Akka.Persistence.PostgreSql.Tests/Json/PostgreSqlSnapshotStoreJsonSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString(@"
akka.persistence {
akka.persistence {
publish-plugin-commands = on
snapshot-store {
plugin = ""akka.persistence.snapshot-store.postgresql""
Expand All @@ -35,7 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Snapshot.PostgreSqlSnapshotStore, Akka.Per
stored-as = ""JSONB""
}
}
}");
}
akka.test.single-expect-default = 10s");
}


Expand Down
3 changes: 1 addition & 2 deletions src/Akka.Persistence.PostgreSql.Tests/Performance/PostgreSqlJournalPerfSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,13 @@ private static Config CreateSpecConfig(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString(@"
akka.loglevel = INFO
akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
akka.persistence.journal.postgresql {
class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
auto-initialize = on
connection-string = """ + DbUtils.ConnectionString + @"""
}
akka.test.single-expect-default = 3s")
akka.test.single-expect-default = 10s")
.WithFallback(PostgreSqlPersistence.DefaultConfiguration())
.WithFallback(Persistence.DefaultConfig());
}
Expand Down
3 changes: 2 additions & 1 deletion src/Akka.Persistence.PostgreSql.Tests/PostgreSqlJournalConnectionFailureSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
connection-string = """ + connectionString + @"""
}
}
}";
}
akka.test.single-expect-default = 10s";

return ConfigurationFactory.ParseString(config);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Akka.Persistence.PostgreSql.Tests/PostgreSqlJournalSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
connection-string = """ + DbUtils.ConnectionString + @"""
}
}
}";
}
akka.test.single-expect-default = 10s";

return ConfigurationFactory.ParseString(config);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Akka.Persistence.PostgreSql.Tests/PostgreSqlSnapshotStoreConnectionFailureSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ class = ""Akka.Persistence.PostgreSql.Snapshot.PostgreSqlSnapshotStore, Akka.Per
connection-string = """ + connectionString + @"""
}
}
}";
}
akka.test.single-expect-default = 10s";

return ConfigurationFactory.ParseString(config);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Akka.Persistence.PostgreSql.Tests/PostgreSqlSnapshotStoreSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Snapshot.PostgreSqlSnapshotStore, Akka.Per
connection-string = """ + DbUtils.ConnectionString + @"""
}
}
}";
}
akka.test.single-expect-default = 10s";

return ConfigurationFactory.ParseString(config);
}
Expand Down
4 changes: 1 addition & 3 deletions src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlAllEventsSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString($@"
akka.loglevel = INFO
akka.test.single-expect-default = 10s
akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
akka.persistence.journal.postgresql {{
class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
Expand All @@ -34,7 +32,7 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
connection-string = ""{DbUtils.ConnectionString}""
refresh-interval = 1s
}}
akka.test.single-expect-default = 15s")
akka.test.single-expect-default = 10s")
.WithFallback(PostgreSqlPersistence.DefaultConfiguration())
.WithFallback(SqlReadJournal.DefaultConfiguration())
.WithFallback(Persistence.DefaultConfig());
Expand Down
4 changes: 1 addition & 3 deletions src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentAllEventsSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString($@"
akka.loglevel = INFO
akka.test.single-expect-default = 10s
akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
akka.persistence.journal.postgresql {{
class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
Expand All @@ -34,7 +32,7 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
connection-string = ""{DbUtils.ConnectionString}""
refresh-interval = 1s
}}
akka.test.single-expect-default = 15s")
akka.test.single-expect-default = 10s")
.WithFallback(PostgreSqlPersistence.DefaultConfiguration())
.WithFallback(SqlReadJournal.DefaultConfiguration())
.WithFallback(Persistence.DefaultConfig());
Expand Down
5 changes: 2 additions & 3 deletions src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentEventsByPersistenceIdSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,16 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString($@"
akka.loglevel = INFO
akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
akka.persistence.journal.postgresql {{
class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
plugin-dispatcher = ""akka.actor.default-dispatcher""
table-name = event_journal
auto-initialize = on
connection-string = """ + DbUtils.ConnectionString + @"""
connection-string = ""{DbUtils.ConnectionString}""
refresh-interval = 1s
}}
akka.test.single-expect-default = 15s")
akka.test.single-expect-default = 10s")
.WithFallback(PostgreSqlPersistence.DefaultConfiguration())
.WithFallback(SqlReadJournal.DefaultConfiguration())
.WithFallback(Persistence.DefaultConfig());
Expand Down
5 changes: 2 additions & 3 deletions src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentEventsByTagSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString($@"
akka.loglevel = INFO
akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
akka.persistence.journal.postgresql {{
event-adapters {{
Expand All @@ -39,10 +38,10 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
plugin-dispatcher = ""akka.actor.default-dispatcher""
table-name = event_journal
auto-initialize = on
connection-string = """ + DbUtils.ConnectionString + @"""
connection-string = ""{DbUtils.ConnectionString}""
refresh-interval = 1s
}}
akka.test.single-expect-default = 15s")
akka.test.single-expect-default = 10s")
.WithFallback(PostgreSqlPersistence.DefaultConfiguration())
.WithFallback(SqlReadJournal.DefaultConfiguration())
.WithFallback(Persistence.DefaultConfig());
Expand Down
4 changes: 1 addition & 3 deletions src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentPersistenceIdsSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString($@"
akka.loglevel = INFO
akka.test.single-expect-default = 10s
akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
akka.persistence.journal.postgresql {{
class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
Expand All @@ -34,7 +32,7 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
connection-string = ""{DbUtils.ConnectionString}""
refresh-interval = 1s
}}
akka.test.single-expect-default = 15s")
akka.test.single-expect-default = 10s")
.WithFallback(PostgreSqlPersistence.DefaultConfiguration())
.WithFallback(SqlReadJournal.DefaultConfiguration())
.WithFallback(Persistence.DefaultConfig());
Expand Down
5 changes: 2 additions & 3 deletions src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlEventsByPersistenceIdSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,16 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString($@"
akka.loglevel = INFO
akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
akka.persistence.journal.postgresql {{
class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
plugin-dispatcher = ""akka.actor.default-dispatcher""
table-name = event_journal
auto-initialize = on
connection-string = """ + DbUtils.ConnectionString + @"""
connection-string = ""{DbUtils.ConnectionString}""
refresh-interval = 1s
}}
akka.test.single-expect-default = 15s")
akka.test.single-expect-default = 10s")
.WithFallback(PostgreSqlPersistence.DefaultConfiguration())
.WithFallback(SqlReadJournal.DefaultConfiguration())
.WithFallback(Persistence.DefaultConfig());
Expand Down
6 changes: 2 additions & 4 deletions src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlEventsByTagSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString($@"
akka.loglevel = INFO
akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
akka.persistence.journal.postgresql {{
event-adapters {{
Expand All @@ -34,12 +33,11 @@ private static Config Initialize(PostgresFixture fixture)
}}
class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
plugin-dispatcher = ""akka.actor.default-dispatcher""
table-name = event_journal
auto-initialize = on
connection-string = """ + DbUtils.ConnectionString + @"""
connection-string = ""{DbUtils.ConnectionString}""
refresh-interval = 1s
}}
akka.test.single-expect-default = 15s")
akka.test.single-expect-default = 10s")
.WithFallback(PostgreSqlPersistence.DefaultConfiguration())
.WithFallback(SqlReadJournal.DefaultConfiguration())
.WithFallback(Persistence.DefaultConfig());
Expand Down
4 changes: 1 addition & 3 deletions src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlPersistenceIdsSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
DbUtils.Initialize(fixture);

return ConfigurationFactory.ParseString($@"
akka.loglevel = INFO
akka.test.single-expect-default = 10s
akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
akka.persistence.journal.postgresql {{
class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
Expand All @@ -34,7 +32,7 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
connection-string = ""{DbUtils.ConnectionString}""
refresh-interval = 1s
}}
akka.test.single-expect-default = 15s")
akka.test.single-expect-default = 10s")
.WithFallback(PostgreSqlPersistence.DefaultConfiguration())
.WithFallback(SqlReadJournal.DefaultConfiguration())
.WithFallback(Persistence.DefaultConfig());
Expand Down
3 changes: 2 additions & 1 deletion src/Akka.Persistence.PostgreSql.Tests/Serialization/PostgreSqlJournalSerializationSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
connection-string = """ + DbUtils.ConnectionString + @"""
}
}
}");
}
akka.test.single-expect-default = 10s");
}

[Fact(Skip = "Sql plugin does not support EventAdapter.Manifest")]
Expand Down
3 changes: 2 additions & 1 deletion ...ka.Persistence.PostgreSql.Tests/Serialization/PostgreSqlSnapshotStoreSerializationSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
connection-string = """ + DbUtils.ConnectionString + @"""
}
}
}");
}
akka.test.single-expect-default = 10s");
}
}
}
1 change: 0 additions & 1 deletion src/Akka.Persistence.PostgreSql/postgresql.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
# should corresponding journal table be initialized automatically
auto-initialize = off


# Postgres data type for payload column. Allowed options: bytea, json, jsonb
stored-as = bytea

Expand Down

0 comments on commit fd65bfb

Please sign in to comment.