sqlx: move ConstraintFailed and TypedError to Dialect

Author: nalgeon

internal/rhash/tx.go

@@ -428,7 +428,7 @@ func (tx *Tx) set(key string, field string, value any) error {
 	var keyID int
 	err = tx.tx.QueryRow(tx.sql.set1, args...).Scan(&keyID)
 	if err != nil {
-		return sqlx.TypedError(err)
+		return tx.dialect.TypedError(err)
 	}
 	_, err = tx.tx.Exec(tx.sql.set2, keyID, field, valueb)
 	return err

internal/rlist/tx.go

@@ -321,7 +321,7 @@ func (tx *Tx) insert(key string, pivot, elem any, query string) (int, error) {
 	args = []any{keyID, pivotb, keyID, keyID, elemb, keyID}
 	_, err = tx.tx.Exec(query, args...)
 	if err != nil {
-		if sqlx.ConstraintFailed(err, "not null", "rlist", "pos") {
+		if tx.dialect.ConstraintFailed(err, "not null", "rlist", "pos") {
 			return -1, core.ErrNotFound
 		}
 		return 0, err
@@ -356,7 +356,7 @@ func (tx *Tx) push(key string, elem any, query string) (int, error) {
 	var keyID, n int
 	err = tx.tx.QueryRow(tx.sql.push, args...).Scan(&keyID, &n)
 	if err != nil {
-		return 0, sqlx.TypedError(err)
+		return 0, tx.dialect.TypedError(err)
 	}
 
 	// Insert the element.

internal/rset/tx.go

@@ -66,7 +66,7 @@ func (tx *Tx) Add(key string, elems ...any) (int, error) {
 	var keyID int
 	err = tx.tx.QueryRow(tx.sql.add1, key, time.Now().UnixMilli()).Scan(&keyID)
 	if err != nil {
-		return 0, sqlx.TypedError(err)
+		return 0, tx.dialect.TypedError(err)
 	}
 
 	// Add the elements.
@@ -448,7 +448,7 @@ func (tx *Tx) createKey(key string, now int64) (int, error) {
 	var keyID int
 	err := tx.tx.QueryRow(tx.sql.add1, key, now).Scan(&keyID)
 	if err != nil {
-		return 0, sqlx.TypedError(err)
+		return 0, tx.dialect.TypedError(err)
 	}
 	return keyID, nil
 }

internal/rstring/tx.go

@@ -205,7 +205,7 @@ func (tx *Tx) set(key string, value any, at time.Time) error {
 	args := []any{key, etime, time.Now().UnixMilli()}
 	_, err = tx.tx.Exec(tx.sql.set1, args...)
 	if err != nil {
-		return sqlx.TypedError(err)
+		return tx.dialect.TypedError(err)
 	}
 
 	args = []any{key, valueb}
@@ -224,7 +224,7 @@ func (tx *Tx) update(key string, value any) error {
 
 	_, err = tx.tx.Exec(tx.sql.update1, key, time.Now().UnixMilli())
 	if err != nil {
-		return sqlx.TypedError(err)
+		return tx.dialect.TypedError(err)
 	}
 	_, err = tx.tx.Exec(tx.sql.update2, key, valueb)
 	return err

internal/rzset/inter.go

@@ -137,7 +137,7 @@ func (c InterCmd) store(tx *Tx) (int, error) {
 	var destID int
 	err = tx.tx.QueryRow(tx.sql.add1, c.dest, now).Scan(&destID)
 	if err != nil {
-		return 0, sqlx.TypedError(err)
+		return 0, tx.dialect.TypedError(err)
 	}
 
 	// Intersect the source sets and store the result.

internal/rzset/tx.go

@@ -202,7 +202,7 @@ func (tx *Tx) Incr(key string, elem any, delta float64) (float64, error) {
 	var keyID int
 	err = tx.tx.QueryRow(tx.sql.add1, args...).Scan(&keyID)
 	if err != nil {
-		return 0, sqlx.TypedError(err)
+		return 0, tx.dialect.TypedError(err)
 	}
 
 	var score float64
@@ -331,7 +331,7 @@ func (tx *Tx) add(key string, elem any, score float64) error {
 	var keyID int
 	err = tx.tx.QueryRow(tx.sql.add1, args...).Scan(&keyID)
 	if err != nil {
-		return sqlx.TypedError(err)
+		return tx.dialect.TypedError(err)
 	}
 	_, err = tx.tx.Exec(tx.sql.add2, keyID, elemb, score)
 	return err

internal/rzset/union.go

@@ -136,7 +136,7 @@ func (c UnionCmd) store(tx *Tx) (int, error) {
 	var destID int
 	err = tx.tx.QueryRow(tx.sql.add1, c.dest, now).Scan(&destID)
 	if err != nil {
-		return 0, sqlx.TypedError(err)
+		return 0, tx.dialect.TypedError(err)
 	}
 
 	// Union the source sets and store the result.

internal/sqlx/dialect.go

@@ -4,6 +4,8 @@ import (
 	"errors"
 	"strconv"
 	"strings"
+
+	"github.com/nalgeon/redka/internal/core"
 )
 
 // SQL dialect.
@@ -17,6 +19,24 @@ const (
 
 var ErrDialect = errors.New("unknown SQL dialect")
 
+// ConstraintFailed checks if the error is due to
+// a constraint violation on a column.
+// Error examples:
+//   - sqlite3.Error (NOT NULL constraint failed: rkey.type)
+//   - *pq.Error (pq: null value in column "type" of relation "rkey" violates not-null constraint)
+func (d Dialect) ConstraintFailed(err error, constraint, table string, column string) bool {
+	var message string
+	switch d {
+	case DialectPostgres:
+		message = `"` + column + `" of relation "` + table +
+			`" violates ` + strings.ReplaceAll(constraint, " ", "-") + ` constraint`
+	case DialectSqlite:
+		message = constraint + " constraint failed: " + table + "." + column
+	}
+	errStr := strings.ToLower(err.Error())
+	return strings.Contains(errStr, message)
+}
+
 // Enumerate replaces ? placeholders with $1, $2, ... $n.
 func (d Dialect) Enumerate(query string) string {
 	if d == DialectSqlite {
@@ -70,3 +90,16 @@ func (d Dialect) LimitAll() string {
 	}
 	return "limit all"
 }
+
+// Returns ErrKeyType if the error is due to a not-null
+// constraint violation on rkey.type.
+// Otherwise, returns the original error.
+func (d Dialect) TypedError(err error) error {
+	if err == nil {
+		return nil
+	}
+	if d.ConstraintFailed(err, "not null", "rkey", "type") {
+		return core.ErrKeyType
+	}
+	return err
+}

internal/sqlx/sql.go

@@ -5,8 +5,6 @@ package sqlx
 import (
 	"database/sql"
 	"strings"
-
-	"github.com/nalgeon/redka/internal/core"
 )
 
 // Sorting direction.
@@ -81,27 +79,3 @@ func Select[T any](db Tx, query string, args []any,
 
 	return vals, err
 }
-
-// Returns typed errors for some specific cases.
-func TypedError(err error) error {
-	if err == nil {
-		return nil
-	}
-	if ConstraintFailed(err, "not null", "rkey", "type") {
-		return core.ErrKeyType
-	}
-	return err
-}
-
-// ConstraintFailed checks if the error is due to
-// a constraint violation on a column.
-// Error examples:
-//   - sqlite3.Error (NOT NULL constraint failed: rkey.type)
-//   - *pq.Error (pq: null value in column "type" of relation "rkey" violates not-null constraint)
-func ConstraintFailed(err error, constraint, table string, column string) bool {
-	sqliteMsg := constraint + " constraint failed: " + table + "." + column
-	postgresMsg := `"` + column + `" of relation "` + table +
-		`" violates ` + strings.ReplaceAll(constraint, " ", "-") + ` constraint`
-	errStr := strings.ToLower(err.Error())
-	return strings.Contains(errStr, sqliteMsg) || strings.Contains(errStr, postgresMsg)
-}