From de2c56560ef4a433cfb8593f2db45adb35c035ca Mon Sep 17 00:00:00 2001 From: sbwalker Date: Thu, 25 Jan 2024 13:39:23 -0500 Subject: [PATCH] resolve regression installation issue with PostgreSQL --- Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs | 5 +++++ .../Migrations/EntityBuilders/BaseEntityBuilder.cs | 2 +- .../Migrations/Framework/MultiDatabaseMigration.cs | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs b/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs index f8806564..a9e6e0d8 100644 --- a/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs +++ b/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs @@ -87,6 +87,11 @@ namespace Oqtane.Database.PostgreSQL return _rewriter.RewriteName(name); } + public override string RewriteName(string name, bool isQuery) + { + return _rewriter.RewriteName(name); + } + public override string RewriteValue(string value, string type) { if (type == "bool") diff --git a/Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs b/Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs index 34d54a62..b97a3d60 100644 --- a/Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs +++ b/Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs @@ -47,7 +47,7 @@ namespace Oqtane.Migrations.EntityBuilders private string RewriteName(string name) { - return RewriteName(name, false); + return ActiveDatabase.RewriteName(name); } private string RewriteName(string name, bool isQuery) diff --git a/Oqtane.Server/Migrations/Framework/MultiDatabaseMigration.cs b/Oqtane.Server/Migrations/Framework/MultiDatabaseMigration.cs index 8379c3e3..87fb34cc 100644 --- a/Oqtane.Server/Migrations/Framework/MultiDatabaseMigration.cs +++ b/Oqtane.Server/Migrations/Framework/MultiDatabaseMigration.cs @@ -14,7 +14,12 @@ namespace Oqtane.Migrations protected string RewriteName(string name) { - return ActiveDatabase.RewriteName(name); + return ActiveDatabase.RewriteName(name, false); + } + + protected string RewriteName(string name, bool isQuery) + { + return ActiveDatabase.RewriteName(name, isQuery); } } }