minor refactor

stephenafamo · stephenafamo · commit 09c8491d11fa · 2024-05-29T01:59:36.000+01:00
diff --git a/dialect/mysql/load.go b/dialect/mysql/load.go
@@ -67,9 +67,9 @@ func Preload[T any, Ts ~[]T](rel orm.Relationship, cols []string, opts ...Preloa
 		var queryMods mods.QueryMods[*dialect.SelectQuery]
 
 		for i, side := range rel.Sides {
-			alias = fmt.Sprintf("%s_%d", side.To, internal.RandInt())
-			if settings.Alias != "" {
-				alias = settings.Alias
+			alias = settings.Alias
+			if settings.Alias == "" {
+				alias = fmt.Sprintf("%s_%d", side.To, internal.RandInt())
 			}
 			on := make([]bob.Expression, 0, len(side.FromColumns)+len(side.FromWhere)+len(side.ToWhere))
 			for i, fromCol := range side.FromColumns {
diff --git a/dialect/mysql/view.go b/dialect/mysql/view.go
@@ -85,10 +85,10 @@ func (v *View[T, Tslice]) Prepare(ctx context.Context, exec bob.Preparer, queryM
 
 // Prepare a statement from an existing query that will be mapped to the view's type
 func (v *View[T, Tslice]) PrepareQuery(ctx context.Context, exec bob.Preparer, q bob.Query) (bob.QueryStmt[T, Tslice], error) {
-	return bob.PrepareQueryx[T, Tslice](ctx, exec, q, v.scanner, v.afterSelect(ctx, exec))
+	return bob.PrepareQueryx[T, Tslice](ctx, exec, q, v.scanner, v.afterSelect(exec))
 }
 
-func (v *View[T, Ts]) afterSelect(ctx context.Context, exec bob.Executor) bob.ExecOption[T] {
+func (v *View[T, Ts]) afterSelect(exec bob.Executor) bob.ExecOption[T] {
 	return func(es *bob.ExecSettings[T]) {
 		es.AfterSelect = func(ctx context.Context, retrieved []T) error {
 			_, err := v.AfterSelectHooks.Do(ctx, exec, retrieved)
@@ -154,23 +154,23 @@ func (v *ViewQuery[T, Tslice]) One() (T, error) {
 	if err := v.hook(); err != nil {
 		return *new(T), err
 	}
-	return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))
+	return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))
 }
 
 // All matching rows
 func (v *ViewQuery[T, Tslice]) All() (Tslice, error) {
 	if err := v.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))
+	return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))
 }
 
 // Cursor to scan through the results
 func (v *ViewQuery[T, Tslice]) Cursor() (scan.ICursor[T], error) {
 	if err := v.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))
+	return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))
 }
 
 // Count the number of matching rows
diff --git a/dialect/psql/load.go b/dialect/psql/load.go
@@ -67,9 +67,9 @@ func Preload[T any, Ts ~[]T](rel orm.Relationship, cols []string, opts ...Preloa
 		var queryMods mods.QueryMods[*dialect.SelectQuery]
 
 		for i, side := range rel.Sides {
-			alias = fmt.Sprintf("%s_%d", side.To, internal.RandInt())
-			if settings.Alias != "" {
-				alias = settings.Alias
+			alias = settings.Alias
+			if settings.Alias == "" {
+				alias = fmt.Sprintf("%s_%d", side.To, internal.RandInt())
 			}
 			on := make([]bob.Expression, 0, len(side.FromColumns)+len(side.FromWhere)+len(side.ToWhere))
 			for i, fromCol := range side.FromColumns {
diff --git a/dialect/psql/table.go b/dialect/psql/table.go
@@ -357,7 +357,7 @@ func (t *TableQuery[Q, T, Ts]) addReturning() {
 	}
 }
 
-func (t *TableQuery[Q, T, Ts]) afterSelect(ctx context.Context, exec bob.Executor) bob.ExecOption[T] {
+func (t *TableQuery[Q, T, Ts]) afterSelect(exec bob.Executor) bob.ExecOption[T] {
 	return func(es *bob.ExecSettings[T]) {
 		es.AfterSelect = func(ctx context.Context, retrieved []T) error {
 			_, err := t.view.AfterSelectHooks.Do(ctx, exec, retrieved)
@@ -390,7 +390,7 @@ func (t *TableQuery[Q, T, Tslice]) One() (T, error) {
 	if err := t.hook(); err != nil {
 		return *new(T), err
 	}
-	return bob.One(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))
+	return bob.One(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))
 }
 
 // All matching rows
@@ -399,7 +399,7 @@ func (t *TableQuery[Q, T, Tslice]) All() (Tslice, error) {
 	if err := t.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Allx[T, Tslice](t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))
+	return bob.Allx[T, Tslice](t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))
 }
 
 // Cursor to scan through the results
@@ -408,5 +408,5 @@ func (t *TableQuery[Q, T, Tslice]) Cursor() (scan.ICursor[T], error) {
 	if err := t.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Cursor(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))
+	return bob.Cursor(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))
 }
diff --git a/dialect/psql/view.go b/dialect/psql/view.go
@@ -104,10 +104,10 @@ func (v *View[T, Tslice]) Prepare(ctx context.Context, exec bob.Preparer, queryM
 
 // Prepare a statement from an existing query that will be mapped to the view's type
 func (v *View[T, Tslice]) PrepareQuery(ctx context.Context, exec bob.Preparer, q bob.Query) (bob.QueryStmt[T, Tslice], error) {
-	return bob.PrepareQueryx[T, Tslice](ctx, exec, q, v.scanner, v.afterSelect(ctx, exec))
+	return bob.PrepareQueryx[T, Tslice](ctx, exec, q, v.scanner, v.afterSelect(exec))
 }
 
-func (v *View[T, Ts]) afterSelect(ctx context.Context, exec bob.Executor) bob.ExecOption[T] {
+func (v *View[T, Ts]) afterSelect(exec bob.Executor) bob.ExecOption[T] {
 	return func(es *bob.ExecSettings[T]) {
 		es.AfterSelect = func(ctx context.Context, retrieved []T) error {
 			_, err := v.AfterSelectHooks.Do(ctx, exec, retrieved)
@@ -173,23 +173,23 @@ func (v *ViewQuery[T, Tslice]) One() (T, error) {
 	if err := v.hook(); err != nil {
 		return *new(T), err
 	}
-	return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))
+	return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))
 }
 
 // All matching rows
 func (v *ViewQuery[T, Tslice]) All() (Tslice, error) {
 	if err := v.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))
+	return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))
 }
 
 // Cursor to scan through the results
 func (v *ViewQuery[T, Tslice]) Cursor() (scan.ICursor[T], error) {
 	if err := v.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))
+	return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))
 }
 
 // Count the number of matching rows
diff --git a/dialect/sqlite/load.go b/dialect/sqlite/load.go
@@ -67,9 +67,9 @@ func Preload[T any, Ts ~[]T](rel orm.Relationship, cols []string, opts ...Preloa
 		var queryMods mods.QueryMods[*dialect.SelectQuery]
 
 		for i, side := range rel.Sides {
-			alias = fmt.Sprintf("%s_%d", side.To, internal.RandInt())
-			if settings.Alias != "" {
-				alias = settings.Alias
+			alias = settings.Alias
+			if settings.Alias == "" {
+				alias = fmt.Sprintf("%s_%d", side.To, internal.RandInt())
 			}
 			on := make([]bob.Expression, 0, len(side.FromColumns)+len(side.FromWhere)+len(side.ToWhere))
 			for i, fromCol := range side.FromColumns {
diff --git a/dialect/sqlite/table.go b/dialect/sqlite/table.go
@@ -360,7 +360,7 @@ func (t *TQuery[Q, T, Ts]) addReturning() {
 	}
 }
 
-func (t *TQuery[Q, T, Ts]) afterSelect(ctx context.Context, exec bob.Executor) bob.ExecOption[T] {
+func (t *TQuery[Q, T, Ts]) afterSelect(exec bob.Executor) bob.ExecOption[T] {
 	return func(es *bob.ExecSettings[T]) {
 		es.AfterSelect = func(ctx context.Context, retrieved []T) error {
 			_, err := t.view.AfterSelectHooks.Do(ctx, exec, retrieved)
@@ -393,7 +393,7 @@ func (t *TQuery[Q, T, Tslice]) One() (T, error) {
 	if err := t.hook(); err != nil {
 		return *new(T), err
 	}
-	return bob.One(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))
+	return bob.One(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))
 }
 
 // All matching rows
@@ -402,7 +402,7 @@ func (t *TQuery[Q, T, Tslice]) All() (Tslice, error) {
 	if err := t.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Allx[T, Tslice](t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))
+	return bob.Allx[T, Tslice](t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))
 }
 
 // Cursor to scan through the results
@@ -411,5 +411,5 @@ func (t *TQuery[Q, T, Tslice]) Cursor() (scan.ICursor[T], error) {
 	if err := t.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Cursor(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))
+	return bob.Cursor(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))
 }
diff --git a/dialect/sqlite/view.go b/dialect/sqlite/view.go
@@ -104,10 +104,10 @@ func (v *View[T, Tslice]) Prepare(ctx context.Context, exec bob.Preparer, queryM
 
 // Prepare a statement from an existing query that will be mapped to the view's type
 func (v *View[T, Tslice]) PrepareQuery(ctx context.Context, exec bob.Preparer, q bob.Query) (bob.QueryStmt[T, Tslice], error) {
-	return bob.PrepareQueryx[T, Tslice](ctx, exec, q, scan.StructMapper[T](), v.afterSelect(ctx, exec))
+	return bob.PrepareQueryx[T, Tslice](ctx, exec, q, scan.StructMapper[T](), v.afterSelect(exec))
 }
 
-func (v *View[T, Ts]) afterSelect(ctx context.Context, exec bob.Executor) bob.ExecOption[T] {
+func (v *View[T, Ts]) afterSelect(exec bob.Executor) bob.ExecOption[T] {
 	return func(es *bob.ExecSettings[T]) {
 		es.AfterSelect = func(ctx context.Context, retrieved []T) error {
 			_, err := v.AfterSelectHooks.Do(ctx, exec, retrieved)
@@ -173,23 +173,23 @@ func (v *ViewQuery[T, Tslice]) One() (T, error) {
 	if err := v.hook(); err != nil {
 		return *new(T), err
 	}
-	return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))
+	return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))
 }
 
 // All matching rows
 func (v *ViewQuery[T, Tslice]) All() (Tslice, error) {
 	if err := v.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))
+	return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))
 }
 
 // Cursor to scan through the results
 func (v *ViewQuery[T, Tslice]) Cursor() (scan.ICursor[T], error) {
 	if err := v.hook(); err != nil {
 		return nil, err
 	}
-	return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))
+	return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))
 }
 
 // Count the number of matching rows

Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,10 @@ func (v *View[T, Tslice]) Prepare(ctx context.Context, exec bob.Preparer, queryM`
`85`	`85`
`86`	`86`	`// Prepare a statement from an existing query that will be mapped to the view's type`
`87`	`87`	`func (v *View[T, Tslice]) PrepareQuery(ctx context.Context, exec bob.Preparer, q bob.Query) (bob.QueryStmt[T, Tslice], error) {`
`88`		`- return bob.PrepareQueryx[T, Tslice](ctx, exec, q, v.scanner, v.afterSelect(ctx, exec))`
	`88`	`+ return bob.PrepareQueryx[T, Tslice](ctx, exec, q, v.scanner, v.afterSelect(exec))`
`89`	`89`	`}`
`90`	`90`
`91`		`-func (v *View[T, Ts]) afterSelect(ctx context.Context, exec bob.Executor) bob.ExecOption[T] {`
	`91`	`+func (v *View[T, Ts]) afterSelect(exec bob.Executor) bob.ExecOption[T] {`
`92`	`92`	`return func(es *bob.ExecSettings[T]) {`
`93`	`93`	`es.AfterSelect = func(ctx context.Context, retrieved []T) error {`
`94`	`94`	`_, err := v.AfterSelectHooks.Do(ctx, exec, retrieved)`
`@@ -154,23 +154,23 @@ func (v *ViewQuery[T, Tslice]) One() (T, error) {`
`154`	`154`	`if err := v.hook(); err != nil {`
`155`	`155`	`return *new(T), err`
`156`	`156`	`}`
`157`		`- return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))`
	`157`	`+ return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`// All matching rows`
`161`	`161`	`func (v *ViewQuery[T, Tslice]) All() (Tslice, error) {`
`162`	`162`	`if err := v.hook(); err != nil {`
`163`	`163`	`return nil, err`
`164`	`164`	`}`
`165`		`- return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))`
	`165`	`+ return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`// Cursor to scan through the results`
`169`	`169`	`func (v *ViewQuery[T, Tslice]) Cursor() (scan.ICursor[T], error) {`
`170`	`170`	`if err := v.hook(); err != nil {`
`171`	`171`	`return nil, err`
`172`	`172`	`}`
`173`		`- return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))`
	`173`	`+ return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`// Count the number of matching rows`
Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ func (t *TableQuery[Q, T, Ts]) addReturning() {`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`
`360`		`-func (t *TableQuery[Q, T, Ts]) afterSelect(ctx context.Context, exec bob.Executor) bob.ExecOption[T] {`
	`360`	`+func (t *TableQuery[Q, T, Ts]) afterSelect(exec bob.Executor) bob.ExecOption[T] {`
`361`	`361`	`return func(es *bob.ExecSettings[T]) {`
`362`	`362`	`es.AfterSelect = func(ctx context.Context, retrieved []T) error {`
`363`	`363`	`_, err := t.view.AfterSelectHooks.Do(ctx, exec, retrieved)`
`@@ -390,7 +390,7 @@ func (t *TableQuery[Q, T, Tslice]) One() (T, error) {`
`390`	`390`	`if err := t.hook(); err != nil {`
`391`	`391`	`return *new(T), err`
`392`	`392`	`}`
`393`		`- return bob.One(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))`
	`393`	`+ return bob.One(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`// All matching rows`
`@@ -399,7 +399,7 @@ func (t *TableQuery[Q, T, Tslice]) All() (Tslice, error) {`
`399`	`399`	`if err := t.hook(); err != nil {`
`400`	`400`	`return nil, err`
`401`	`401`	`}`
`402`		`- return bob.Allx[T, Tslice](t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))`
	`402`	`+ return bob.Allx[T, Tslice](t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`// Cursor to scan through the results`
`@@ -408,5 +408,5 @@ func (t *TableQuery[Q, T, Tslice]) Cursor() (scan.ICursor[T], error) {`
`408`	`408`	`if err := t.hook(); err != nil {`
`409`	`409`	`return nil, err`
`410`	`410`	`}`
`411`		`- return bob.Cursor(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))`
	`411`	`+ return bob.Cursor(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))`
`412`	`412`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,10 @@ func (v *View[T, Tslice]) Prepare(ctx context.Context, exec bob.Preparer, queryM`
`104`	`104`
`105`	`105`	`// Prepare a statement from an existing query that will be mapped to the view's type`
`106`	`106`	`func (v *View[T, Tslice]) PrepareQuery(ctx context.Context, exec bob.Preparer, q bob.Query) (bob.QueryStmt[T, Tslice], error) {`
`107`		`- return bob.PrepareQueryx[T, Tslice](ctx, exec, q, v.scanner, v.afterSelect(ctx, exec))`
	`107`	`+ return bob.PrepareQueryx[T, Tslice](ctx, exec, q, v.scanner, v.afterSelect(exec))`
`108`	`108`	`}`
`109`	`109`
`110`		`-func (v *View[T, Ts]) afterSelect(ctx context.Context, exec bob.Executor) bob.ExecOption[T] {`
	`110`	`+func (v *View[T, Ts]) afterSelect(exec bob.Executor) bob.ExecOption[T] {`
`111`	`111`	`return func(es *bob.ExecSettings[T]) {`
`112`	`112`	`es.AfterSelect = func(ctx context.Context, retrieved []T) error {`
`113`	`113`	`_, err := v.AfterSelectHooks.Do(ctx, exec, retrieved)`
`@@ -173,23 +173,23 @@ func (v *ViewQuery[T, Tslice]) One() (T, error) {`
`173`	`173`	`if err := v.hook(); err != nil {`
`174`	`174`	`return *new(T), err`
`175`	`175`	`}`
`176`		`- return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))`
	`176`	`+ return bob.One(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`// All matching rows`
`180`	`180`	`func (v *ViewQuery[T, Tslice]) All() (Tslice, error) {`
`181`	`181`	`if err := v.hook(); err != nil {`
`182`	`182`	`return nil, err`
`183`	`183`	`}`
`184`		`- return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))`
	`184`	`+ return bob.Allx[T, Tslice](v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`// Cursor to scan through the results`
`188`	`188`	`func (v *ViewQuery[T, Tslice]) Cursor() (scan.ICursor[T], error) {`
`189`	`189`	`if err := v.hook(); err != nil {`
`190`	`190`	`return nil, err`
`191`	`191`	`}`
`192`		`- return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.ctx, v.exec))`
	`192`	`+ return bob.Cursor(v.ctx, v.exec, v, v.view.scanner, v.view.afterSelect(v.exec))`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`// Count the number of matching rows`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ func (t *TQuery[Q, T, Ts]) addReturning() {`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`
`363`		`-func (t *TQuery[Q, T, Ts]) afterSelect(ctx context.Context, exec bob.Executor) bob.ExecOption[T] {`
	`363`	`+func (t *TQuery[Q, T, Ts]) afterSelect(exec bob.Executor) bob.ExecOption[T] {`
`364`	`364`	`return func(es *bob.ExecSettings[T]) {`
`365`	`365`	`es.AfterSelect = func(ctx context.Context, retrieved []T) error {`
`366`	`366`	`_, err := t.view.AfterSelectHooks.Do(ctx, exec, retrieved)`
`@@ -393,7 +393,7 @@ func (t *TQuery[Q, T, Tslice]) One() (T, error) {`
`393`	`393`	`if err := t.hook(); err != nil {`
`394`	`394`	`return *new(T), err`
`395`	`395`	`}`
`396`		`- return bob.One(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))`
	`396`	`+ return bob.One(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`// All matching rows`
`@@ -402,7 +402,7 @@ func (t *TQuery[Q, T, Tslice]) All() (Tslice, error) {`
`402`	`402`	`if err := t.hook(); err != nil {`
`403`	`403`	`return nil, err`
`404`	`404`	`}`
`405`		`- return bob.Allx[T, Tslice](t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))`
	`405`	`+ return bob.Allx[T, Tslice](t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`// Cursor to scan through the results`
`@@ -411,5 +411,5 @@ func (t *TQuery[Q, T, Tslice]) Cursor() (scan.ICursor[T], error) {`
`411`	`411`	`if err := t.hook(); err != nil {`
`412`	`412`	`return nil, err`
`413`	`413`	`}`
`414`		`- return bob.Cursor(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.ctx, t.exec))`
	`414`	`+ return bob.Cursor(t.ctx, t.exec, t, t.view.scanner, t.afterSelect(t.exec))`
`415`	`415`	`}`