Merge pull request rails#47552 from lsylvester/where-include-index

Allow both include and where on PostgreSQL add_index

Author: yahonda

activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb

@@ -16,7 +16,7 @@ def accept(o)
       delegate :quote_column_name, :quote_table_name, :quote_default_expression, :type_to_sql,
         :options_include_default?, :supports_indexes_in_create?, :use_foreign_keys?,
         :quoted_columns_for_index, :supports_partial_index?, :supports_check_constraints?,
-        :supports_exclusion_constraints?, to: :@conn, private: true
+        :supports_index_include?, :supports_exclusion_constraints?, to: :@conn, private: true
 
       private
         def visit_AlterTable(o)
@@ -104,6 +104,7 @@ def visit_CreateIndexDefinition(o)
           sql << "#{quote_column_name(index.name)} ON #{quote_table_name(index.table)}"
           sql << "USING #{index.using}" if supports_index_using? && index.using
           sql << "(#{quoted_columns(index)})"
+          sql << "INCLUDE (#{quoted_include_columns(o.index.include)})" if supports_index_include? && o.index.include
           sql << "WHERE #{index.where}" if supports_partial_index? && index.where
 
           sql.join(" ")

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

@@ -5,8 +5,7 @@ module ConnectionAdapters
     module PostgreSQL
       class SchemaCreation < SchemaCreation # :nodoc:
         private
-          delegate :quoted_include_columns_for_index, :supports_index_include?,
-          to: :@conn
+          delegate :quoted_include_columns_for_index, to: :@conn
 
           def visit_AlterTable(o)
             sql = super
@@ -30,12 +29,6 @@ def visit_CheckConstraintDefinition(o)
             super.dup.tap { |sql| sql << " NOT VALID" unless o.validate? }
           end
 
-          def visit_CreateIndexDefinition(o)
-            super.dup.tap do |sql|
-              sql << " INCLUDE (#{quoted_include_columns(o.index.include)})" if supports_index_include? && o.index.include
-            end
-          end
-
           def visit_ValidateConstraint(name)
             "VALIDATE CONSTRAINT #{quote_column_name(name)}"
           end

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

@@ -108,7 +108,7 @@ def indexes(table_name) # :nodoc:
             oid = row[4]
             comment = row[5]
             valid = row[6]
-            using, expressions, where, include = inddef.scan(/ USING (\w+?) \((.+?)\)(?: NULLS(?: NOT)? DISTINCT)?(?: WHERE (.+?))?(?: INCLUDE \((.+)\))?\z/m).flatten
+            using, expressions, include, where = inddef.scan(/ USING (\w+?) \((.+?)\)(?: NULLS(?: NOT)? DISTINCT)?(?: INCLUDE \((.+?)\))?(?: WHERE (.+))?\z/m).flatten
 
             orders = {}
             opclasses = {}

activerecord/test/cases/migration/index_test.rb

@@ -286,6 +286,14 @@ def test_add_index_with_multiple_included_columns
           connection.remove_index("testings", "last_name")
           assert_not connection.index_exists?("testings", "last_name")
         end
+
+        def test_add_index_with_included_column_and_where_clause
+          connection.add_index("testings", "last_name", include: :foo, where: "first_name = 'john doe'")
+          assert connection.index_exists?("testings", "last_name", include: :foo, where: "first_name = 'john doe'")
+
+          connection.remove_index("testings", "last_name")
+          assert_not connection.index_exists?("testings", "last_name", include: :foo, where: "first_name = 'john doe'")
+        end
       end
 
       private