Also remove leading whitespace in SplitMarginComments.

dweitzman · bramp · commit 112deeb6d58c · 2018-06-06T07:45:08.000-07:00
This was separated from the previous diff because it impacts query plans, although in seemingly-harmless way.

Signed-off-by: David Weitzman &lt;dweitzman@pinterest.com&gt;
diff --git a/comments.go b/comments.go
@@ -111,7 +111,7 @@ func SplitMarginComments(sql string) (query string, comments MarginComments) {
 		Leading:  strings.TrimLeftFunc(sql[:leadingEnd], unicode.IsSpace),
 		Trailing: strings.TrimRightFunc(sql[trailingStart:], unicode.IsSpace),
 	}
-	return strings.TrimRightFunc(sql[leadingEnd:trailingStart], unicode.IsSpace), comments
+	return strings.TrimFunc(sql[leadingEnd:trailingStart], unicode.IsSpace), comments
 }
 
 // StripLeadingComments trims the SQL string and removes any leading comments
diff --git a/comments_test.go b/comments_test.go
@@ -79,6 +79,11 @@ func TestSplitComments(t *testing.T) {
 		outSQL:              "foo",
 		outLeadingComments:  "/* before */ ",
 		outTrailingComments: " /* bar */",
+	}, {
+		input:               "/* before1 */ /* before2 */ foo /* after1 */ /* after2 */",
+		outSQL:              "foo",
+		outLeadingComments:  "/* before1 */ /* before2 */ ",
+		outTrailingComments: " /* after1 */ /* after2 */",
 	}, {
 		input:               "/** before */ foo /** bar */",
 		outSQL:              "foo",
@@ -110,11 +115,8 @@ func TestSplitComments(t *testing.T) {
 		outLeadingComments:  "",
 		outTrailingComments: "",
 	}, {
-		input: " foo ",
-		// NOTE(dweitzman): Preserving leading whitespace because the WhereClause entries for 'update'
-		// in exec_cases.txt have leading whitespace and if we trim it here that will change. It may be
-		// safe to change, but changing query plans is not an intended effect of this diff.
-		outSQL:              " foo",
+		input:               " foo ",
+		outSQL:              "foo",
 		outLeadingComments:  "",
 		outTrailingComments: "",
 	}}

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func SplitMarginComments(sql string) (query string, comments MarginComments) {`
`111`	`111`	`Leading: strings.TrimLeftFunc(sql[:leadingEnd], unicode.IsSpace),`
`112`	`112`	`Trailing: strings.TrimRightFunc(sql[trailingStart:], unicode.IsSpace),`
`113`	`113`	`}`
`114`		`- return strings.TrimRightFunc(sql[leadingEnd:trailingStart], unicode.IsSpace), comments`
	`114`	`+ return strings.TrimFunc(sql[leadingEnd:trailingStart], unicode.IsSpace), comments`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`// StripLeadingComments trims the SQL string and removes any leading comments`