Merge pull request #3683 from sbwalker/dev

resolve regression installation issue with PostgreSQL
oqtane · Jan 25, 2024 · 7d175ad · 7d175ad
2 parents 0db413c + de2c565
commit 7d175ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs b/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs
@@ -87,6 +87,11 @@ public override string RewriteName(string name)
             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
@@ -47,7 +47,7 @@ private string RewriteSqlEntityTableName(string name)
 
         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
@@ -14,7 +14,12 @@ protected MultiDatabaseMigration(IDatabase database)
 
         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);
         }
     }
 }