diff --git a/README.md b/README.md index 1d3d419..1888bd8 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,12 @@ SELECT CLUSTER_COUNTKEYSINSLOT() SELECT DBSIZE() ``` +### HVALS + +```sql +SELECT HVALS('some-key') +``` + ### LLEN ```sql diff --git a/commands.md b/commands.md index 03d1a3b..d771539 100644 --- a/commands.md +++ b/commands.md @@ -121,7 +121,7 @@ | HSETNX | 🚧 | HRANDFIELD | 🚧 | HSTRLEN | 🚧 -| HVALS | 🚧 +| HVALS | ✅ [`HVALS`](https://github.com/augmentable-dev/reqlite/tree/main/internal/redis/hvals) | INCR | 🚧 | INCRBY | 🚧 | INCRBYFLOAT | 🚧 diff --git a/internal/redis/hvals/hvals.go b/internal/redis/hvals/hvals.go new file mode 100644 index 0000000..cb69591 --- /dev/null +++ b/internal/redis/hvals/hvals.go @@ -0,0 +1,35 @@ +package hvals + +import ( + "context" + "fmt" + + "github.com/go-redis/redis/v8" + "go.riyazali.net/sqlite" +) + +type hvals struct { + rdb *redis.Client +} + +func (f *hvals) Args() int { return -1 } +func (f *hvals) Deterministic() bool { return false } +func (f *hvals) Apply(ctx *sqlite.Context, values ...sqlite.Value) { + var key string + + if len(values) >= 1 { + key = values[0].Text() + } else { + ctx.ResultError(fmt.Errorf("must supply argument to redis hvals command (key)")) + return + } + + result := f.rdb.HVals(context.TODO(), key) + + ctx.ResultText(fmt.Sprintf("%+q", result.String())) +} + +// New returns a sqlite function for reading the contents of a file +func New(rdb *redis.Client) sqlite.Function { + return &hvals{rdb} +} diff --git a/internal/redis/hvals/hvals_test.go b/internal/redis/hvals/hvals_test.go new file mode 100644 index 0000000..7242242 --- /dev/null +++ b/internal/redis/hvals/hvals_test.go @@ -0,0 +1,46 @@ +package hvals_test + +import ( + "testing" + + "github.com/augmentable-dev/reqlite/internal/redis/hvals" + _ "github.com/augmentable-dev/reqlite/internal/sqlite" + "github.com/go-redis/redismock/v8" + "github.com/jmoiron/sqlx" + _ "github.com/mattn/go-sqlite3" + "go.riyazali.net/sqlite" +) + +func TestHVals(t *testing.T) { + rdb, mock := redismock.NewClientMock() + values := []string{"val1", "val2", "val3"} + sqlite.Register(func(api *sqlite.ExtensionApi) (sqlite.ErrorCode, error) { + if err := api.CreateFunction("hvals", hvals.New(rdb)); err != nil { + return sqlite.SQLITE_ERROR, err + } + return sqlite.SQLITE_OK, nil + }) + + mock.ExpectHVals("mykey").SetVal(values) + db, err := sqlx.Open("sqlite3", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + + row := db.QueryRow("SELECT hvals('mykey')") + err = row.Err() + if err != nil { + t.Fatal(err) + } + + var s string + err = row.Scan(&s) + if err != nil { + t.Fatal(err) + } + + if err := mock.ExpectationsWereMet(); err != nil { + t.Error(err) + } +} diff --git a/pkg/ext/ext.go b/pkg/ext/ext.go index 77850c5..5442ae3 100644 --- a/pkg/ext/ext.go +++ b/pkg/ext/ext.go @@ -17,6 +17,7 @@ import ( "github.com/augmentable-dev/reqlite/internal/redis/dump" "github.com/augmentable-dev/reqlite/internal/redis/echo" "github.com/augmentable-dev/reqlite/internal/redis/hgetall" + "github.com/augmentable-dev/reqlite/internal/redis/hvals" "github.com/augmentable-dev/reqlite/internal/redis/llen" "github.com/augmentable-dev/reqlite/internal/redis/lrange" "github.com/go-redis/redis/v8" @@ -97,6 +98,9 @@ func init() { if err := api.CreateFunction("echo", echo.New(rdb)); err != nil { return sqlite.SQLITE_ERROR, err } + if err := api.CreateFunction("hvals", hvals.New(rdb)); err != nil { + return sqlite.SQLITE_ERROR, err + } if err := api.CreateFunction("llen", llen.New(rdb)); err != nil { return sqlite.SQLITE_ERROR, err