|
| 1 | +package cmd |
| 2 | + |
| 3 | +import ( |
| 4 | + "fmt" |
| 5 | + "os" |
| 6 | + |
| 7 | + "github.com/boringsql/regresql/regresql" |
| 8 | + "github.com/spf13/cobra" |
| 9 | +) |
| 10 | + |
| 11 | +var ( |
| 12 | + diffCwd string |
| 13 | + diffFrom string |
| 14 | + diffTo string |
| 15 | + diffQuery string |
| 16 | + diffRunFilter string |
| 17 | + |
| 18 | + diffCmd = &cobra.Command{ |
| 19 | + Use: "diff", |
| 20 | + Short: "Compare query outputs between two snapshot versions", |
| 21 | + Long: `Compare query outputs between two snapshot versions. |
| 22 | +
|
| 23 | +This command restores two different snapshots and runs all queries against both, |
| 24 | +then shows the differences in query output. |
| 25 | +
|
| 26 | +Examples: |
| 27 | + regresql diff --from v1 --to v2 |
| 28 | + regresql diff --from v1 --to v3 --query orders/get_order_total.sql |
| 29 | + regresql diff --from sha256:abc123 --to current`, |
| 30 | + Run: func(cmd *cobra.Command, args []string) { |
| 31 | + if err := checkDirectory(diffCwd); err != nil { |
| 32 | + fmt.Print(err.Error()) |
| 33 | + os.Exit(1) |
| 34 | + } |
| 35 | + if err := runDiff(); err != nil { |
| 36 | + fmt.Printf("Error: %s\n", err.Error()) |
| 37 | + os.Exit(1) |
| 38 | + } |
| 39 | + }, |
| 40 | + } |
| 41 | +) |
| 42 | + |
| 43 | +func init() { |
| 44 | + RootCmd.AddCommand(diffCmd) |
| 45 | + |
| 46 | + diffCmd.Flags().StringVarP(&diffCwd, "cwd", "C", ".", "Change to directory") |
| 47 | + diffCmd.Flags().StringVar(&diffFrom, "from", "", "Source snapshot (tag or hash prefix)") |
| 48 | + diffCmd.Flags().StringVar(&diffTo, "to", "", "Target snapshot (tag, hash, or 'current', default: current)") |
| 49 | + diffCmd.Flags().StringVar(&diffQuery, "query", "", "Specific query to compare (optional)") |
| 50 | + diffCmd.Flags().StringVar(&diffRunFilter, "run", "", "Run only queries matching regexp") |
| 51 | + |
| 52 | + diffCmd.MarkFlagRequired("from") |
| 53 | +} |
| 54 | + |
| 55 | +func runDiff() error { |
| 56 | + snapshotsDir := regresql.GetSnapshotsDir(diffCwd) |
| 57 | + |
| 58 | + metadata, err := regresql.ReadSnapshotMetadata(snapshotsDir) |
| 59 | + if err != nil { |
| 60 | + return fmt.Errorf("no snapshot metadata found: %w", err) |
| 61 | + } |
| 62 | + |
| 63 | + fromInfo, err := regresql.ResolveSnapshot(metadata, diffFrom) |
| 64 | + if err != nil { |
| 65 | + return fmt.Errorf("cannot resolve --from snapshot: %w", err) |
| 66 | + } |
| 67 | + |
| 68 | + toRef := diffTo |
| 69 | + if toRef == "" || toRef == "current" { |
| 70 | + if metadata.Current == nil { |
| 71 | + return fmt.Errorf("no current snapshot") |
| 72 | + } |
| 73 | + toRef = metadata.Current.Hash |
| 74 | + } |
| 75 | + toInfo, err := regresql.ResolveSnapshot(metadata, toRef) |
| 76 | + if err != nil { |
| 77 | + return fmt.Errorf("cannot resolve --to snapshot: %w", err) |
| 78 | + } |
| 79 | + |
| 80 | + if !regresql.SnapshotExists(fromInfo) { |
| 81 | + return fmt.Errorf("source snapshot file not found: %s", fromInfo.Path) |
| 82 | + } |
| 83 | + if !regresql.SnapshotExists(toInfo) { |
| 84 | + return fmt.Errorf("target snapshot file not found: %s", toInfo.Path) |
| 85 | + } |
| 86 | + |
| 87 | + if fromInfo.Hash == toInfo.Hash { |
| 88 | + fmt.Printf("Both snapshots are identical (%s)\n", regresql.FormatSnapshotRef(fromInfo)) |
| 89 | + return nil |
| 90 | + } |
| 91 | + |
| 92 | + fmt.Printf("Comparing snapshots:\n") |
| 93 | + fmt.Printf(" From: %s (%s)\n", regresql.FormatSnapshotRef(fromInfo), fromInfo.Path) |
| 94 | + fmt.Printf(" To: %s (%s)\n", regresql.FormatSnapshotRef(toInfo), toInfo.Path) |
| 95 | + fmt.Println() |
| 96 | + |
| 97 | + result, err := regresql.DiffSnapshots(diffCwd, fromInfo, toInfo, diffQuery, diffRunFilter) |
| 98 | + if err != nil { |
| 99 | + return err |
| 100 | + } |
| 101 | + |
| 102 | + printDiffResult(result, fromInfo, toInfo) |
| 103 | + |
| 104 | + return nil |
| 105 | +} |
| 106 | + |
| 107 | +func printDiffResult(result *regresql.SnapshotDiffResult, from, to *regresql.SnapshotInfo) { |
| 108 | + if len(result.Changed) == 0 && len(result.Errors) == 0 { |
| 109 | + fmt.Printf("No differences found (%d queries compared)\n", len(result.Unchanged)) |
| 110 | + return |
| 111 | + } |
| 112 | + |
| 113 | + if len(result.Changed) > 0 { |
| 114 | + fmt.Printf("CHANGED (%d):\n", len(result.Changed)) |
| 115 | + for _, diff := range result.Changed { |
| 116 | + fmt.Printf(" %s\n", diff.QueryPath) |
| 117 | + if diff.FromRows != diff.ToRows { |
| 118 | + fmt.Printf(" Rows: %d → %d\n", diff.FromRows, diff.ToRows) |
| 119 | + } |
| 120 | + if diff.Diff != "" { |
| 121 | + // Show first few lines of diff |
| 122 | + lines := splitLines(diff.Diff, 5) |
| 123 | + for _, line := range lines { |
| 124 | + fmt.Printf(" %s\n", line) |
| 125 | + } |
| 126 | + if len(lines) == 5 { |
| 127 | + fmt.Printf(" ...\n") |
| 128 | + } |
| 129 | + } |
| 130 | + } |
| 131 | + fmt.Println() |
| 132 | + } |
| 133 | + |
| 134 | + if len(result.Errors) > 0 { |
| 135 | + fmt.Printf("ERRORS (%d):\n", len(result.Errors)) |
| 136 | + for _, e := range result.Errors { |
| 137 | + fmt.Printf(" %s: %s\n", e.QueryPath, e.Error) |
| 138 | + } |
| 139 | + fmt.Println() |
| 140 | + } |
| 141 | + |
| 142 | + fmt.Printf("SUMMARY:\n") |
| 143 | + fmt.Printf(" Changed: %d\n", len(result.Changed)) |
| 144 | + fmt.Printf(" Unchanged: %d\n", len(result.Unchanged)) |
| 145 | + if len(result.Errors) > 0 { |
| 146 | + fmt.Printf(" Errors: %d\n", len(result.Errors)) |
| 147 | + } |
| 148 | +} |
| 149 | + |
| 150 | +func splitLines(s string, max int) []string { |
| 151 | + var lines []string |
| 152 | + start := 0 |
| 153 | + count := 0 |
| 154 | + for i := 0; i < len(s) && count < max; i++ { |
| 155 | + if s[i] == '\n' { |
| 156 | + if i > start { |
| 157 | + lines = append(lines, s[start:i]) |
| 158 | + count++ |
| 159 | + } |
| 160 | + start = i + 1 |
| 161 | + } |
| 162 | + } |
| 163 | + if start < len(s) && count < max { |
| 164 | + lines = append(lines, s[start:]) |
| 165 | + } |
| 166 | + return lines |
| 167 | +} |
0 commit comments