Merge pull request rails#51429 from fatkodima/fix-pg-include-indexes-with-keywords

Fix PostgreSQL `include` indexes with keyword column names

Author: byroot

activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb

@@ -112,7 +112,7 @@ def indexes(table_name) # :nodoc:
 
             orders = {}
             opclasses = {}
-            include_columns = include ? include.split(",").map(&:strip) : []
+            include_columns = include ? include.split(",").map { |c| Utils.unquote_identifier(c.strip.gsub('""', '"')) } : []
 
             if indkey.include?(0)
               columns = expressions

activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb

@@ -346,6 +346,22 @@ def test_include_multiple_columns_index
             assert_equal ["number", "data"], index.include
           end
         end
+
+        def test_include_keyword_column_name
+          with_example_table("id integer, timestamp integer") do
+            @connection.add_index "ex", :id, name: "include", include: [:timestamp]
+            index = @connection.indexes("ex").find { |idx| idx.name == "include" }
+            assert_equal ["timestamp"], index.include
+          end
+        end
+
+        def test_include_escaped_quotes_column_name
+          with_example_table(%{id integer, "I""like""quotes" integer}) do
+            @connection.add_index "ex", :id, name: "include", include: [:"I\"like\"quotes"]
+            index = @connection.indexes("ex").find { |idx| idx.name == "include" }
+            assert_equal ["I\"like\"quotes"], index.include
+          end
+        end
       end
 
       def test_expression_index