Merge pull request #425 from mozilla/pb/fix-explain-script

philbooth · web-flow · commit b033726a4b22 · 2018-11-01T13:20:23.000Z
#425 r=shane-tomlinson
diff --git a/scripts/explain-warn.js b/scripts/explain-warn.js
@@ -301,11 +301,15 @@ function getProcedureNames () {
 }
 
 function getPath (procedure) {
-  return cp.execSync(
-    `git grep "${procedure}" | grep 'CREATE PROCEDURE' | cut -d ':' -f 1 | sed '/^$/d'`,
+  const path = cp.execSync(
+    `git grep "${procedure}" | grep 'CREATE PROCEDURE' | sed '/^$/d'`,
     RETURN_STRING
   )
-    .trim()
+    .match(/(lib\/db\/schema\/patch-[0-9]+-[0-9]+\.sql)/)
+
+  if (path) {
+    return path[1]
+  }
 }
 
 function extractSelects (path, procedure) {

Original file line number	Diff line number	Diff line change
`@@ -301,11 +301,15 @@ function getProcedureNames () {`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`function getPath (procedure) {`
`304`		`- return cp.execSync(`
`305`		- `git grep "${procedure}" \| grep 'CREATE PROCEDURE' \| cut -d ':' -f 1 \| sed '/^$/d'`,
	`304`	`+ const path = cp.execSync(`
	`305`	+ `git grep "${procedure}" \| grep 'CREATE PROCEDURE' \| sed '/^$/d'`,
`306`	`306`	`RETURN_STRING`
`307`	`307`	`)`
`308`		`- .trim()`
	`308`	`+ .match(/(lib\/db\/schema\/patch-[0-9]+-[0-9]+\.sql)/)`
	`309`	`+`
	`310`	`+ if (path) {`
	`311`	`+ return path[1]`
	`312`	`+ }`
`309`	`313`	`}`
`310`	`314`
`311`	`315`	`function extractSelects (path, procedure) {`