u

ory · May 30, 2023 · b9fb700 · b9fb700
1 parent 922fb04
commit b9fb700
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/persistence/sql/batch/create.go b/persistence/sql/batch/create.go
@@ -42,7 +42,7 @@ type (
 	}
 )
 
-func buildInsertQueryArgs[T any](ctx context.Context, dialect string, mapper *reflectx.Mapper, quoter quoter, models []*T) (insertQueryArgs, error) {
+func buildInsertQueryArgs[T any](ctx context.Context, dialect string, mapper *reflectx.Mapper, quoter quoter, models []*T) insertQueryArgs {
 	var (
 		v     T
 		model = pop.NewModel(v, ctx)
@@ -106,7 +106,7 @@ func buildInsertQueryArgs[T any](ctx context.Context, dialect string, mapper *re
 		ColumnsDecl:  strings.Join(quotedColumns, ", "),
 		Columns:      columns,
 		Placeholders: strings.Join(placeholders, ",\n"),
-	}, nil
+	}
 }
 
 func buildInsertQueryValues[T any](dialect string, mapper *reflectx.Mapper, columns []string, models []*T, nowFunc func() time.Time) (values []any, err error) {
@@ -184,11 +184,7 @@ func Create[T any](ctx context.Context, p *TracerConnection, models []*T) (err e
 		return errors.Errorf("store is not a quoter: %T", conn.Store)
 	}
 
-	queryArgs, err := buildInsertQueryArgs(ctx, conn.Dialect.Name(), conn.TX.Mapper, quoter, models)
-	if err != nil {
-		return err
-	}
-
+	queryArgs := buildInsertQueryArgs(ctx, conn.Dialect.Name(), conn.TX.Mapper, quoter, models)
 	values, err := buildInsertQueryValues(conn.Dialect.Name(), conn.TX.Mapper, queryArgs.Columns, models, func() time.Time { return time.Now().UTC().Truncate(time.Microsecond) })
 	if err != nil {
 		return err

diff --git a/persistence/sql/batch/create_test.go b/persistence/sql/batch/create_test.go
@@ -54,8 +54,7 @@ func Test_buildInsertQueryArgs(t *testing.T) {
 	t.Run("case=testModel", func(t *testing.T) {
 		models := makeModels[testModel]()
 		mapper := reflectx.NewMapper("db")
-		args, err := buildInsertQueryArgs(ctx, "other", mapper, testQuoter{}, models)
-		require.NoError(t, err)
+		args := buildInsertQueryArgs(ctx, "other", mapper, testQuoter{}, models)
 		snapshotx.SnapshotT(t, args)
 
 		query := fmt.Sprintf("INSERT INTO %s (%s) VALUES\n%s", args.TableName, args.ColumnsDecl, args.Placeholders)
@@ -75,24 +74,21 @@ func Test_buildInsertQueryArgs(t *testing.T) {
 	t.Run("case=Identities", func(t *testing.T) {
 		models := makeModels[identity.Identity]()
 		mapper := reflectx.NewMapper("db")
-		args, err := buildInsertQueryArgs(ctx, "other", mapper, testQuoter{}, models)
-		require.NoError(t, err)
+		args := buildInsertQueryArgs(ctx, "other", mapper, testQuoter{}, models)
 		snapshotx.SnapshotT(t, args)
 	})
 
 	t.Run("case=RecoveryAddress", func(t *testing.T) {
 		models := makeModels[identity.RecoveryAddress]()
 		mapper := reflectx.NewMapper("db")
-		args, err := buildInsertQueryArgs(ctx, "other", mapper, testQuoter{}, models)
-		require.NoError(t, err)
+		args := buildInsertQueryArgs(ctx, "other", mapper, testQuoter{}, models)
 		snapshotx.SnapshotT(t, args)
 	})
 
 	t.Run("case=RecoveryAddress", func(t *testing.T) {
 		models := makeModels[identity.RecoveryAddress]()
 		mapper := reflectx.NewMapper("db")
-		args, err := buildInsertQueryArgs(ctx, "other", mapper, testQuoter{}, models)
-		require.NoError(t, err)
+		args := buildInsertQueryArgs(ctx, "other", mapper, testQuoter{}, models)
 		snapshotx.SnapshotT(t, args)
 	})
 
@@ -104,8 +100,7 @@ func Test_buildInsertQueryArgs(t *testing.T) {
 			}
 		}
 		mapper := reflectx.NewMapper("db")
-		args, err := buildInsertQueryArgs(ctx, "cockroach", mapper, testQuoter{}, models)
-		require.NoError(t, err)
+		args := buildInsertQueryArgs(ctx, "cockroach", mapper, testQuoter{}, models)
 		snapshotx.SnapshotT(t, args)
 	})
 }