Merge pull request #2252 from yahonda/backport_2249_to_release61

yahonda · web-flow · commit 5617efe10e2d · 2022-01-21T00:22:33.000+09:00
Merge pull request #2249 from swamp09/fix_columns_for_distinct
diff --git a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
@@ -661,7 +661,7 @@ def columns_for_distinct(columns, orders) #:nodoc:
           }.reject(&:blank?).map.with_index { |column, i|
             "FIRST_VALUE(#{column}) OVER (PARTITION BY #{columns} ORDER BY #{column}) AS alias_#{i}__"
           }
-        [super, *order_columns].join(", ")
+        (order_columns << super).join(", ")
       end
 
       def temporary_table?(table_name) #:nodoc:

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ def columns_for_distinct(columns, orders) #:nodoc:`
`661`	`661`	`}.reject(&:blank?).map.with_index { \|column, i\|`
`662`	`662`	`"FIRST_VALUE(#{column}) OVER (PARTITION BY #{columns} ORDER BY #{column}) AS alias_#{i}__"`
`663`	`663`	`}`
`664`		`- [super, *order_columns].join(", ")`
	`664`	`+ (order_columns << super).join(", ")`
`665`	`665`	`end`
`666`	`666`
`667`	`667`	`def temporary_table?(table_name) #:nodoc:`