lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 09:42:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing PostgreSQL when creating DistributedLocks table

Browse Source
This commit is contained in:
hopla
2016-04-12 20:52:06 +02:00
committed by Sébastien Ros
parent a4f2e040b2
commit 010b1884bd
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard/Data/Migration/AutomaticDataMigrations.cs
View File

@@ -84,8 +84,11 @@ namespace Orchard.Data.Migration {
// Ensure the distributed lock record schema exists. // Ensure the distributed lock record schema exists.
var schemaBuilder = new SchemaBuilder(_dataMigrationInterpreter); var schemaBuilder = new SchemaBuilder(_dataMigrationInterpreter);
var distributedLockSchemaBuilder = new DistributedLockSchemaBuilder(_shellSettings, schemaBuilder); var distributedLockSchemaBuilder = new DistributedLockSchemaBuilder(_shellSettings, schemaBuilder);
if (distributedLockSchemaBuilder.EnsureSchema()) if (!distributedLockSchemaBuilder.SchemaExists()) {
// Workaround to avoid some Transaction issue for PostgreSQL.
_transactionManager.RequireNew(); _transactionManager.RequireNew();
distributedLockSchemaBuilder.CreateSchema();
}
} }
} }
} }

8
src/Orchard/Tasks/Locking/Services/DistributedLockSchemaBuilder.cs
View File

@@ -13,14 +13,6 @@ namespace Orchard.Tasks.Locking.Services {
_schemaBuilder = schemaBuilder; _schemaBuilder = schemaBuilder;
} }
public bool EnsureSchema() {
if (SchemaExists())
return false;
CreateSchema();
return true;
}
public void CreateSchema() { public void CreateSchema() {
_schemaBuilder.CreateTable(TableName, table => table _schemaBuilder.CreateTable(TableName, table => table
.Column<int>("Id", column => column.PrimaryKey().Identity()) .Column<int>("Id", column => column.PrimaryKey().Identity())