squibble: clean SQL before diffing

tailscale · Mar 19, 2024 · f5bf154 · f5bf154
1 parent 859b5cb
commit f5bf154
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/squibble.go b/squibble.go
@@ -354,6 +354,8 @@ func SQLDigest(text string) (string, error) {
 	for i, r := range sr {
 		if r.Type == "table" {
 			sr[i].SQL = ""
+		} else {
+			sr[i].SQL = cleanSQL(sr[i].SQL)
 		}
 	}
 	h := sha256.New()
@@ -373,6 +375,8 @@ func DBDigest(ctx context.Context, db DBConn) (string, error) {
 	for i, r := range sr {
 		if r.Type == "table" {
 			sr[i].SQL = ""
+		} else {
+			sr[i].SQL = cleanSQL(sr[i].SQL)
 		}
 	}
 	h := sha256.New()

diff --git a/textcrime.go b/textcrime.go
@@ -86,3 +86,5 @@ func cleanLines(s string) []string {
 	}
 	return lines
 }
+
+func cleanSQL(s string) string { return strings.Join(cleanLines(s), " ") }