SQLizer: Allow backing stores to turn off aggregate function handling.

Author: dburkart

sqlite_backing.go

@@ -16,6 +16,7 @@ type SQLiteBacking struct {
 
 // New creates a new SQLiteBacking with the given SQLite database connection
 func NewSQLiteBacking(db *gosql.DB, s *SQLizer) *SQLiteBacking {
+	s.HandleAggregateFunctions = false
 	return &SQLiteBacking{
 		sqlizer: s,
 		db:      db,

sqlizer.go

@@ -38,11 +38,12 @@ const (
 )
 
 type SQLizer struct {
-	Tables             map[string]*Table
-	Permissions        uint
-	Backing            BackingStore
-	AggregateFunctions []*AggregateFunctionColumn
-	RawStatement       string
+	Tables                   map[string]*Table
+	Permissions              uint
+	Backing                  BackingStore
+	AggregateFunctions       []*AggregateFunctionColumn
+	RawStatement             string
+	HandleAggregateFunctions bool
 }
 
 func (s *SQLizer) SetPermissions(permissions uint) {
@@ -89,7 +90,7 @@ func (s *SQLizer) Execute(statement string) (ResultRows, error) {
 
 		rows := s.Backing.Rows()
 
-		if len(rows) > 0 && len(s.AggregateFunctions) > 0 {
+		if len(rows) > 0 && len(s.AggregateFunctions) > 0 && s.HandleAggregateFunctions {
 			var result ResultRows
 			for idx, aggregate := range s.AggregateFunctions {
 				r := aggregate.Call(rows)
@@ -288,6 +289,8 @@ func Initialize(structs ...any) *SQLizer {
 		sql.addStructTable(s)
 	}
 
+	sql.HandleAggregateFunctions = true
+
 	return &sql
 }
 

test/all_test.go

@@ -1,14 +1,14 @@
 package test
 
 import (
-	"fmt"
-	"github.com/hexops/gotextdiff/span"
 	"io"
 	"os"
 	"path"
 	"path/filepath"
 	"testing"
 
+	"github.com/hexops/gotextdiff/span"
+
 	"github.com/hexops/gotextdiff"
 	"github.com/hexops/gotextdiff/myers"
 )
@@ -105,7 +105,9 @@ func TestE2E(t *testing.T) {
 				edits := myers.ComputeEdits(span.URIFromPath("expectations/"+testName), string(b), output)
 				diff := gotextdiff.ToUnified("expectations/"+testName, "input/"+testName, string(b), edits)
 
-				fmt.Println(diff)
+				if len(diff.Hunks) > 0 {
+					t.Fatal(diff)
+				}
 			})
 		}
 		return nil

validate.go

@@ -59,11 +59,13 @@ func (v *Validator) Visit(n sql.Node) (sql.Visitor, sql.Node, error) {
 			f.ResultPosition = len(v.columns)
 			v.s.AggregateFunctions = append(v.s.AggregateFunctions, f)
 			s = f.UnderlyingColumn
-			n = &sql.ResultColumn{
-				Expr: &sql.Ident{
-					Name:   s,
-					Quoted: false,
-				},
+			if v.s.HandleAggregateFunctions {
+				n = &sql.ResultColumn{
+					Expr: &sql.Ident{
+						Name:   s,
+						Quoted: false,
+					},
+				}
 			}
 		}