Escape postgres identifiers when using upper case

digitallyinduced · Aug 20, 2023 · 9c95b0f · 9c95b0f
1 parent 3863375
commit 9c95b0f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/IHP/IDE/SchemaDesigner/Compiler.hs b/IHP/IDE/SchemaDesigner/Compiler.hs
@@ -206,9 +206,10 @@ compilePostgresType (PCustomType theType) = theType
 compileIdentifier :: Text -> Text
 compileIdentifier identifier = if identifierNeedsQuoting then tshow identifier else identifier
     where
-        identifierNeedsQuoting = isKeyword || containsChar ' ' || containsChar '-'
+        identifierNeedsQuoting = isKeyword || containsChar ' ' || containsChar '-' || isUsingUppercase
         isKeyword = IHP.Prelude.toUpper identifier `elem` keywords
         containsChar char = Text.any (char ==) identifier
+        isUsingUppercase = Text.toLower identifier /= identifier
 
         keywords = [ "ABORT"
             , "ABSOLUTE"

diff --git a/Test/IDE/SchemaDesigner/CompilerSpec.hs b/Test/IDE/SchemaDesigner/CompilerSpec.hs
@@ -571,7 +571,7 @@ tests = do
             compileSql [statement] `shouldBe` sql
 
         it "should compile a CREATE TABLE statement with a composite primary key" do
-            let sql = cs [plain|CREATE TABLE orderTrucks (\n    order_id BIGSERIAL NOT NULL,\n    truck_id BIGSERIAL NOT NULL,\n    PRIMARY KEY(order_id, truck_id)\n);\n|]
+            let sql = cs [plain|CREATE TABLE "orderTrucks" (\n    order_id BIGSERIAL NOT NULL,\n    truck_id BIGSERIAL NOT NULL,\n    PRIMARY KEY(order_id, truck_id)\n);\n|]
             let statement = StatementCreateTable CreateTable
                     { name = "orderTrucks"
                     , columns =
@@ -1052,4 +1052,19 @@ tests = do
                             , primaryKeyConstraint = PrimaryKeyConstraint []
                             }
                         ]
+            compileSql statements `shouldBe` sql
+
+        it "should escape policy names with different casing" do
+            let sql = [trimming|
+                CREATE POLICY "Public" ON plans USING (true) WITH CHECK (false);
+            |] <> "\n"
+            let statements = [
+                        CreatePolicy
+                            { name = "Public"
+                            , action = Nothing
+                            , tableName = "plans"
+                            , using = Just (VarExpression "true")
+                            , check = Just (VarExpression "false")
+                            }
+                        ]
             compileSql statements `shouldBe` sql