Accept nested functions in Dangerous Query Methods

koic · koic · commit a1b3a1d1681d · 2022-07-20T17:02:22.000+09:00
Follow up rails/rails#44010.
diff --git a/lib/active_record/connection_adapters/oracle_enhanced/quoting.rb b/lib/active_record/connection_adapters/oracle_enhanced/quoting.rb
@@ -142,7 +142,7 @@ def column_name_with_order_matcher
           (
             (?:
               # "table_name"."column_name" | function(one or no argument)
-              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+")) | \w+\((?:|\g<2>)\)
+              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
             )
             (?:(?:\s+AS)?\s+(?:\w+|"\w+"))?
           )
@@ -155,7 +155,7 @@ def column_name_with_order_matcher
           (
             (?:
               # "table_name"."column_name" | function(one or no argument)
-              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+")) | \w+\((?:|\g<2>)\)
+              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
             )
             (?:\s+ASC|\s+DESC)?
             (?:\s+NULLS\s+(?:FIRST|LAST))?

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ def column_name_with_order_matcher`
`142`	`142`	`(`
`143`	`143`	`(?:`
`144`	`144`	`# "table_name"."column_name" \| function(one or no argument)`
`145`		`- ((?:\w+\.\|"\w+"\.)?(?:\w+\|"\w+")) \| \w+\((?:\|\g<2>)\)`
	`145`	`+ ((?:\w+\.\|"\w+"\.)?(?:\w+\|"\w+") \| \w+\((?:\|\g<2>)\))`
`146`	`146`	`)`
`147`	`147`	`(?:(?:\s+AS)?\s+(?:\w+\|"\w+"))?`
`148`	`148`	`)`
`@@ -155,7 +155,7 @@ def column_name_with_order_matcher`
`155`	`155`	`(`
`156`	`156`	`(?:`
`157`	`157`	`# "table_name"."column_name" \| function(one or no argument)`
`158`		`- ((?:\w+\.\|"\w+"\.)?(?:\w+\|"\w+")) \| \w+\((?:\|\g<2>)\)`
	`158`	`+ ((?:\w+\.\|"\w+"\.)?(?:\w+\|"\w+") \| \w+\((?:\|\g<2>)\))`
`159`	`159`	`)`
`160`	`160`	`(?:\s+ASC\|\s+DESC)?`
`161`	`161`	`(?:\s+NULLS\s+(?:FIRST\|LAST))?`