ci: gorm-upstream — drop ^ anchor, capture PIPESTATUS,

survive zero-match grep; fix linter

Author: arthurpro

.github/workflows/ci.yml

@@ -272,20 +272,39 @@ jobs:
       - name: Run gorm upstream test suite
         run: |
           cd "$WORK_DIR/gorm/tests"
+          # tee duplicates output to a file we parse for PASS/FAIL counts
+          # below. Two pitfalls we work around here:
+          #   1. GitHub Actions prefixes every line with a UTC timestamp,
+          #      even in the file written by tee — so we cannot anchor our
+          #      grep with `^--- PASS:`. We use an unanchored match.
+          #   2. `go test`'s exit code is masked by tee's (always 0). We
+          #      capture it via PIPESTATUS before the next command resets
+          #      $?, and disable errexit around the pipeline so a
+          #      legitimate test-fail doesn't abort our reporter.
+          set +e
           go test -count=1 -timeout 5m -v ./... 2>&1 | tee /tmp/gorm-upstream.log
+          rc=${PIPESTATUS[0]}
+          set -e
+          # `grep -c` exits 1 on zero matches; `|| true` keeps the
+          # outer script alive so we can report the actual counts.
+          PASS=$(grep -c -- '--- PASS:' /tmp/gorm-upstream.log || true)
+          FAIL=$(grep -c -- '--- FAIL:' /tmp/gorm-upstream.log || true)
+          SKIP=$(grep -c -- '--- SKIP:' /tmp/gorm-upstream.log || true)
           echo "--- summary ---"
-          PASS=$(grep -cE '^--- PASS:' /tmp/gorm-upstream.log)
-          FAIL=$(grep -cE '^--- FAIL:' /tmp/gorm-upstream.log)
-          SKIP=$(grep -cE '^--- SKIP:' /tmp/gorm-upstream.log)
-          echo "PASS=$PASS FAIL=$FAIL SKIP=$SKIP"
-          # Floor matches docs/gorm-upstream.md (386 PASS / 0 FAIL on
-          # 2026-05-26). If gorm adds tests, bump the floor; if it removes
-          # tests, this catches a silent regression.
+          echo "PASS=$PASS FAIL=$FAIL SKIP=$SKIP go-test-exit=$rc"
+          if [ "$rc" -ne 0 ]; then
+              echo "::error::go test exited with $rc"
+              exit "$rc"
+          fi
           if [ "$FAIL" -ne 0 ]; then
               echo "::error::gorm upstream suite reports $FAIL failures"
               exit 1
           fi
-          if [ "$PASS" -lt 380 ]; then
-              echo "::error::gorm upstream PASS count regressed: got $PASS, expected >= 380"
+          # PASS count includes sub-test lines (which are indented in the
+          # file too) — for gorm v1.31.1 the total is ~15000. Floor at
+          # 10000 to catch a "no tests ran at all" regression without
+          # being brittle on minor gorm bumps.
+          if [ "$PASS" -lt 10000 ]; then
+              echo "::error::gorm upstream PASS count regressed: got $PASS, expected >= 10000"
               exit 1
           fi

README.md

@@ -447,6 +447,26 @@ Migrator path we care about for our dialector.
 
 Run them with `just test` (or `go test ./...`).
 
+## Sponsors
+
+This project is supported by:
+
+- **[ssh2incus](https://ssh2incus.com)** — an open-source SSH server
+  that connects directly to [Incus](https://linuxcontainers.org/incus/)
+  containers and virtual machines. Runs on the Incus host and routes
+  incoming SSH connections to the right instance via the Incus API,
+  so individual instances don't need their own SSH server.
+
+- **[MobyDeck](https://github.com/mobydeck)** — a GitHub organization
+  publishing open-source developer tools and infrastructure
+  utilities across Go, C, TypeScript, shell, and Ruby. Projects
+  include the SSH-for-Incus gateway above, container credential
+  management, privilege-management system utilities, and status-page
+  automation.
+
+If your company benefits from this driver and you'd like to be listed
+here, open an issue.
+
 ## License
 
 Apache 2.0. See [LICENSE](LICENSE) and [NOTICE](NOTICE).

fts/gorm/callbacks.go

@@ -185,7 +185,7 @@ func columnValues(mm *modelMeta, row reflect.Value) ([]any, error) {
 	out := make([]any, len(mm.Fields))
 	for i, f := range mm.Fields {
 		v := row.FieldByIndex(f.FieldIndex)
-		for v.Kind() == reflect.Ptr {
+		for v.Kind() == reflect.Pointer {
 			if v.IsNil() {
 				return nil, fmt.Errorf("ftsgorm: %s field is nil pointer", f.FieldName)
 			}
@@ -217,7 +217,7 @@ func isSoftDeleted(_ *modelMeta, row reflect.Value) bool {
 
 // iterateRows normalizes db.Statement.ReflectValue into a flat list.
 func iterateRows(v reflect.Value) []reflect.Value {
-	for v.Kind() == reflect.Ptr || v.Kind() == reflect.Interface {
+	for v.Kind() == reflect.Pointer || v.Kind() == reflect.Interface {
 		v = v.Elem()
 	}
 	switch v.Kind() {
@@ -227,7 +227,7 @@ func iterateRows(v reflect.Value) []reflect.Value {
 		out := make([]reflect.Value, 0, v.Len())
 		for i := 0; i < v.Len(); i++ {
 			elem := v.Index(i)
-			for elem.Kind() == reflect.Ptr {
+			for elem.Kind() == reflect.Pointer {
 				elem = elem.Elem()
 			}
 			if elem.Kind() == reflect.Struct {

fts/gorm/plugin.go

@@ -180,7 +180,7 @@ func pluginFrom(db *gorm.DB) (*plugin, error) {
 func indirectType(t reflect.Type) reflect.Type {
 	for {
 		switch t.Kind() {
-		case reflect.Ptr, reflect.Slice, reflect.Array:
+		case reflect.Pointer, reflect.Slice, reflect.Array:
 			t = t.Elem()
 		default:
 			return t

fts/gorm/search.go

@@ -96,7 +96,7 @@ func Search[T any](ctx context.Context, db *gorm.DB, q fts.Query, opts ...Option
 		return nil, err
 	}
 	if len(mm.Fields) == 0 {
-		return nil, fmt.Errorf("ftsgorm: Search: %T has no fields tagged with fts5:", zero)
+		return nil, fmt.Errorf("ftsgorm: Search: %T has no fields tagged with fts5", zero)
 	}
 
 	var o options
@@ -106,8 +106,8 @@ func Search[T any](ctx context.Context, db *gorm.DB, q fts.Query, opts ...Option
 
 	if mm.Mode == ModeContentless && (o.snippet != nil || o.hilite != nil) {
 		return nil, fmt.Errorf(
-			"ftsgorm: %s uses contentless mode; snippet() and highlight() are unavailable. "+
-				"Remove WithSnippet/WithHighlight or switch the model to external (default) or in-table mode.",
+			"ftsgorm: %s uses contentless mode; snippet() and highlight() are unavailable — "+
+				"remove WithSnippet/WithHighlight or switch the model to external (default) or in-table mode",
 			mm.Table)
 	}
 
@@ -258,7 +258,7 @@ func columnIndex(mm *modelMeta, name string) int {
 // helper of the same name.
 func pkAsInt64(f *schema.Field, row reflect.Value) (int64, bool) {
 	v := row.FieldByIndex(f.StructField.Index)
-	for v.Kind() == reflect.Ptr {
+	for v.Kind() == reflect.Pointer {
 		if v.IsNil() {
 			return 0, false
 		}

vec/gorm/callbacks.go

@@ -193,7 +193,7 @@ func (p *plugin) afterDelete(db *gorm.DB) {
 // struct or a slice of structs depending on the call form) into a flat
 // []reflect.Value addressing each row.
 func iterateRows(v reflect.Value) []reflect.Value {
-	for v.Kind() == reflect.Ptr || v.Kind() == reflect.Interface {
+	for v.Kind() == reflect.Pointer || v.Kind() == reflect.Interface {
 		v = v.Elem()
 	}
 	switch v.Kind() {
@@ -203,7 +203,7 @@ func iterateRows(v reflect.Value) []reflect.Value {
 		out := make([]reflect.Value, 0, v.Len())
 		for i := 0; i < v.Len(); i++ {
 			elem := v.Index(i)
-			for elem.Kind() == reflect.Ptr {
+			for elem.Kind() == reflect.Pointer {
 				elem = elem.Elem()
 			}
 			if elem.Kind() == reflect.Struct {
@@ -220,7 +220,7 @@ func iterateRows(v reflect.Value) []reflect.Value {
 // because we already error in registerSchema on non-single PK setups).
 func pkAsInt64(f *schema.Field, row reflect.Value) (int64, bool) {
 	v := row.FieldByIndex(f.StructField.Index)
-	for v.Kind() == reflect.Ptr {
+	for v.Kind() == reflect.Pointer {
 		if v.IsNil() {
 			return 0, false
 		}
@@ -238,7 +238,7 @@ func pkAsInt64(f *schema.Field, row reflect.Value) (int64, bool) {
 // embeddingFrom reads a []float32 (or compatible) field off a row.
 func embeddingFrom(row reflect.Value, index []int) ([]float32, bool) {
 	v := row.FieldByIndex(index)
-	for v.Kind() == reflect.Ptr {
+	for v.Kind() == reflect.Pointer {
 		if v.IsNil() {
 			return nil, false
 		}
@@ -253,13 +253,3 @@ func embeddingFrom(row reflect.Value, index []int) ([]float32, bool) {
 	}
 	return out, true
 }
-
-// rowids extracts the rowid column from a slice of vec.Item; used as the
-// IN-clause for the post-BatchInsert UPDATE that sets deleted=0.
-func rowids(items []vec.Item) []int64 {
-	out := make([]int64, len(items))
-	for i, it := range items {
-		out[i] = it.Rowid
-	}
-	return out
-}

vec/gorm/knn.go

@@ -77,7 +77,7 @@ func KNN[T any](
 	}
 	if len(mm.Fields) == 0 {
 		return nil, fmt.Errorf(
-			"vecgorm: KNN: %T has no fields tagged with vec:",
+			"vecgorm: KNN: %T has no fields tagged with vec",
 			zero)
 	}
 	if len(mm.Fields) > 1 {

vec/gorm/plugin.go

@@ -201,7 +201,7 @@ func pluginFrom(db *gorm.DB) (*plugin, error) {
 func indirectType(t reflect.Type) reflect.Type {
 	for {
 		switch t.Kind() {
-		case reflect.Ptr, reflect.Slice, reflect.Array:
+		case reflect.Pointer, reflect.Slice, reflect.Array:
 			t = t.Elem()
 		default:
 			return t

vec/gorm/tag.go

@@ -167,9 +167,9 @@ func preflightTags(rt reflect.Type) error {
 		if !hasGormIgnore(gormTag) {
 			return fmt.Errorf(
 				"vecgorm: %s.%s has a vec:\"...\" tag but is missing gorm:\"-\" "+
-					"and is not declared as vecgorm.Embedding. Either change the "+
+					"and is not declared as vecgorm.Embedding — either change the "+
 					"field type to vecgorm.Embedding (preferred) or add gorm:\"-\" "+
-					"so gorm's schema parser doesn't reject the unknown []float32 type.",
+					"so gorm's schema parser doesn't reject the unknown []float32 type",
 				rt.Name(), f.Name)
 		}
 	}
@@ -181,12 +181,10 @@ func preflightTags(rt reflect.Type) error {
 // schema parsing.
 func hasGormDataType(t reflect.Type) bool {
 	type dataTyper interface{ GormDataType() string }
-	if reflect.Zero(t).Interface().(any) != nil {
-		if _, ok := reflect.Zero(t).Interface().(dataTyper); ok {
-			return true
-		}
+	if _, ok := reflect.Zero(t).Interface().(dataTyper); ok {
+		return true
 	}
-	if t.Kind() != reflect.Ptr {
+	if t.Kind() != reflect.Pointer {
 		pt := reflect.PointerTo(t)
 		if _, ok := reflect.Zero(pt).Interface().(dataTyper); ok {
 			return true