fix: CreateIdentityProvider without id (#2352)

store/db/mysql/idp.go

@@ -22,15 +22,16 @@ func (d *DB) CreateIdentityProvider(ctx context.Context, create *store.IdentityP
 		return nil, errors.Errorf("unsupported idp type %s", string(create.Type))
 	}
 
-	stmt := "INSERT INTO `idp` (`name`, `type`, `identifier_filter`, `config`) VALUES (?, ?, ?, ?)"
+	placeholders := []string{"?", "?", "?", "?"}
-	result, err := d.db.ExecContext(
+	fields := []string{"`name`", "`type`", "`identifier_filter`", "`config`"}
-		ctx,
+	args := []any{create.Name, create.Type, create.IdentifierFilter, string(configBytes)}
-		stmt,
+
-		create.Name,
+	if create.ID != 0 {
-		create.Type,
+		fields, placeholders, args = append(fields, "`id`"), append(placeholders, "?"), append(args, create.ID)
-		create.IdentifierFilter,
+	}
-		string(configBytes),
+
-	)
+	stmt := "INSERT INTO `idp` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholders, ", ") + ")"
+	result, err := d.db.ExecContext(ctx, stmt, args...)
 	if err != nil {
 		return nil, err
 	}

store/db/sqlite/idp.go

@@ -23,26 +23,16 @@ func (d *DB) CreateIdentityProvider(ctx context.Context, create *store.IdentityP
 		return nil, errors.Errorf("unsupported idp type %s", string(create.Type))
 	}
 
-	stmt := `
+	placeholders := []string{"?", "?", "?", "?"}
-		INSERT INTO idp (
+	fields := []string{"`name`", "`type`", "`identifier_filter`", "`config`"}
-			name,
+	args := []any{create.Name, create.Type, create.IdentifierFilter, string(configBytes)}
-			type,
+
-			identifier_filter,
+	if create.ID != 0 {
-			config
+		fields, placeholders, args = append(fields, "`id`"), append(placeholders, "?"), append(args, create.ID)
-		)
+	}
-		VALUES (?, ?, ?, ?)
+
-		RETURNING id
+	stmt := "INSERT INTO `idp` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholders, ", ") + ") RETURNING `id`"
-	`
+	if err := d.db.QueryRowContext(ctx, stmt, args...).Scan(&create.ID); err != nil {
-	if err := d.db.QueryRowContext(
-		ctx,
-		stmt,
-		create.Name,
-		create.Type,
-		create.IdentifierFilter,
-		string(configBytes),
-	).Scan(
-		&create.ID,
-	); err != nil {
 		return nil, err
 	}