diff --git a/README.md b/README.md index 1d3d419..fe4d64c 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,12 @@ SELECT CLUSTER_COUNTKEYSINSLOT() SELECT DBSIZE() ``` +### HGET + +```sql +SELECT HGET('some-key','some-field') +``` + ### LLEN ```sql diff --git a/commands.md b/commands.md index 03d1a3b..698eecb 100644 --- a/commands.md +++ b/commands.md @@ -109,7 +109,7 @@ | HDEL | 🚧 | HELLO | 🚧 | HEXISTS | 🚧 -| HGET | 🚧 +| HGET | ✅ [`HGET`](https://github.com/augmentable-dev/reqlite/tree/main/internal/redis/hget) | HGETALL | ✅ [`HGETALL`](https://github.com/augmentable-dev/reqlite/tree/main/internal/redis/hgetall) | HINCRBY | 🚧 | HINCRBYFLOAT | 🚧 diff --git a/internal/redis/hget/hget.go b/internal/redis/hget/hget.go new file mode 100644 index 0000000..a0c0cba --- /dev/null +++ b/internal/redis/hget/hget.go @@ -0,0 +1,39 @@ +package hget + +import ( + "context" + "fmt" + + "github.com/go-redis/redis/v8" + "go.riyazali.net/sqlite" +) + +type hget struct { + rdb *redis.Client +} + +func (f *hget) Args() int { return -1 } +func (f *hget) Deterministic() bool { return false } +func (f *hget) Apply(ctx *sqlite.Context, values ...sqlite.Value) { + var ( + key string + field string + ) + + if len(values) >= 2 { + key = values[0].Text() + field = values[1].Text() + } else { + ctx.ResultError(fmt.Errorf("must supply argument to redis hget command (key,field) ")) + return + } + + result := f.rdb.HGet(context.TODO(), key, field) + + ctx.ResultText(fmt.Sprintf("%+q", result)) +} + +// New returns a sqlite function for reading the contents of a file +func New(rdb *redis.Client) sqlite.Function { + return &hget{rdb} +} diff --git a/internal/redis/hget/hget_test.go b/internal/redis/hget/hget_test.go new file mode 100644 index 0000000..315bac5 --- /dev/null +++ b/internal/redis/hget/hget_test.go @@ -0,0 +1,46 @@ +package hget_test + +import ( + "testing" + + "github.com/augmentable-dev/reqlite/internal/redis/hget" + _ "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 TestHGet(t *testing.T) { + rdb, mock := redismock.NewClientMock() + + sqlite.Register(func(api *sqlite.ExtensionApi) (sqlite.ErrorCode, error) { + if err := api.CreateFunction("hget", hget.New(rdb)); err != nil { + return sqlite.SQLITE_ERROR, err + } + return sqlite.SQLITE_OK, nil + }) + + mock.ExpectHGet("mykey", "myfield").SetVal("yabadabadooee") + db, err := sqlx.Open("sqlite3", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + + row := db.QueryRow("SELECT hget('mykey','myfield')") + 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..131eb51 100644 --- a/pkg/ext/ext.go +++ b/pkg/ext/ext.go @@ -16,6 +16,7 @@ import ( "github.com/augmentable-dev/reqlite/internal/redis/dbsize" "github.com/augmentable-dev/reqlite/internal/redis/dump" "github.com/augmentable-dev/reqlite/internal/redis/echo" + "github.com/augmentable-dev/reqlite/internal/redis/hget" "github.com/augmentable-dev/reqlite/internal/redis/hgetall" "github.com/augmentable-dev/reqlite/internal/redis/llen" "github.com/augmentable-dev/reqlite/internal/redis/lrange" @@ -98,6 +99,10 @@ func init() { return sqlite.SQLITE_ERROR, err } + if err := api.CreateFunction("hget", hget.New(rdb)); err != nil { + return sqlite.SQLITE_ERROR, err + } + if err := api.CreateFunction("llen", llen.New(rdb)); err != nil { return sqlite.SQLITE_ERROR, err }