Updates

Author: djthorpe

pkg/pgqueue/pgqueue.go

@@ -68,11 +68,12 @@ func New(ctx context.Context, conn pg.PoolConn, opt ...Opt) (*Client, error) {
 ////////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
-func (client *Client) CreateQueue(ctx context.Context, meta schema.Queue) error {
+func (client *Client) CreateQueue(ctx context.Context, meta schema.Queue) (*schema.Queue, error) {
+	var queue schema.Queue
 	if err := client.conn.Tx(ctx, func(conn pg.Conn) error {
-		return client.conn.Insert(ctx, meta)
+		return client.conn.Insert(ctx, &queue, meta)
 	}); err != nil {
-		return err
+		return nil, err
 	}
-	return nil
+	return &queue, nil
 }

pkg/pgqueue/schema/queue.go

@@ -205,7 +205,7 @@ func (q Queue) Insert(bind *pg.Bind) (string, error) {
 }
 
 // Patch
-func (q Queue) Patch(bind *pg.Bind) error {
+func (q Queue) Update(bind *pg.Bind) error {
 	var patch []string
 
 	// Queue name

plugin/pg/task.go

@@ -12,7 +12,7 @@ import (
 // TYPES
 
 type pgpool struct {
-	conn pg.PoolConn
+	pg.PoolConn
 }
 
 var _ server.Task = (*pgpool)(nil)
@@ -21,7 +21,7 @@ var _ server.Task = (*pgpool)(nil)
 // LIFECYCLE
 
 func taskWithConn(conn pg.PoolConn) *pgpool {
-	return &pgpool{conn: conn}
+	return &pgpool{conn}
 }
 
 ////////////////////////////////////////////////////////////////////////////////

plugin/pgqueue/config_test.go

@@ -5,6 +5,8 @@ import (
 	"testing"
 
 	// Packages
+	"github.com/mutablelogic/go-server"
+	"github.com/mutablelogic/go-server/plugin/pg"
 	pgqueue "github.com/mutablelogic/go-server/plugin/pgqueue"
 	assert "github.com/stretchr/testify/assert"
 )
@@ -18,9 +20,12 @@ func Test_config_001(t *testing.T) {
 
 func Test_config_002(t *testing.T) {
 	assert := assert.New(t)
-	config := pgqueue.Config{}
-	task, err := config.New(context.TODO())
+	pg, err := pg.Config{}.New(context.TODO())
 	if assert.NoError(err) {
-		assert.NotNil(task)
+		assert.NotNil(pg)
+		pgqueue, err := pgqueue.Config{Pool: pg.(server.PG)}.New(context.TODO())
+		if assert.NoError(err) {
+			assert.NotNil(pgqueue)
+		}
 	}
 }