Merge pull request #10425 from hvitved/ruby/bad-join-fix

hvitved · web-flow · commit 40241acbfce1 · 2022-09-15T12:09:14.000+02:00
Ruby: Fix bad join-order in DB upgrade script
diff --git a/ruby/ql/lib/upgrades/4ba51641799d2aaa315c7323931e2dd2a94c9f9d/locations_default.ql b/ruby/ql/lib/upgrades/4ba51641799d2aaa315c7323931e2dd2a94c9f9d/locations_default.ql
@@ -58,11 +58,11 @@ where
     ruby_ast_node_info(node, _, _, loc) and
     exists(Location first |
       body_statement(node, 0, first) and
-      locations_default(first, file, start_line, start_column, _, _)
+      locations_default(first, pragma[only_bind_into](file), start_line, start_column, _, _)
     ) and
     exists(Location last |
       last = max(Location l, int i | body_statement(node, i, l) | l order by i) and
-      locations_default(last, file, _, _, end_line, end_column)
+      locations_default(last, pragma[only_bind_into](file), _, _, end_line, end_column)
     )
   )
 select loc, file, start_line, start_column, end_line, end_column

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,11 @@ where`
`58`	`58`	`ruby_ast_node_info(node, _, _, loc) and`
`59`	`59`	`exists(Location first \|`
`60`	`60`	`body_statement(node, 0, first) and`
`61`		`- locations_default(first, file, start_line, start_column, _, _)`
	`61`	`+ locations_default(first, pragma[only_bind_into](file), start_line, start_column, _, _)`
`62`	`62`	`) and`
`63`	`63`	`exists(Location last \|`
`64`	`64`	`last = max(Location l, int i \| body_statement(node, i, l) \| l order by i) and`
`65`		`- locations_default(last, file, _, _, end_line, end_column)`
	`65`	`+ locations_default(last, pragma[only_bind_into](file), _, _, end_line, end_column)`
`66`	`66`	`)`
`67`	`67`	`)`
`68`	`68`	`select loc, file, start_line, start_column, end_line, end_column`