fix NoContextSupport error when insert/update data

typical-go · Mar 2, 2021 · d092b13 · d092b13
1 parent 93cce42
commit d092b13
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/api/rest-client/mymusic.http b/api/rest-client/mymusic.http
@@ -1,21 +1,21 @@
 
 ### Find Books
 
-http://localhost:8089/mymusic/songs?sort=artist
+http://localhost:8089/songs?sort=artist
 
 ### Find Books (Pagination)
 
-http://localhost:8089/mymusic/songs?offset=2&limit=2
+http://localhost:8089/songs?offset=2&limit=2
 
 
 ### Find One Book (Invalid ID)
 
-http://localhost:8089/mymusic/songs/0
+http://localhost:8089/songs/0
 
 
 ### Insert Book
 
-POST http://localhost:8089/mymusic/songs
+POST http://localhost:8089/songs
 content-type: application/json
 
 {
@@ -25,12 +25,12 @@ content-type: application/json
 
 ### Find One Book
 
-http://localhost:8089/mymusic/songs/6
+http://localhost:8089/songs/6
 
 
 ### Update Book
 
-PUT http://localhost:8089/mymusic/songs/6
+PUT http://localhost:8089/songs/6
 content-type: application/json
 
 {
@@ -41,7 +41,7 @@ content-type: application/json
 
 ### Patch Book
 
-PATCH http://localhost:8089/mymusic/songs/6
+PATCH http://localhost:8089/songs/6
 content-type: application/json
 
 {
@@ -50,4 +50,4 @@ content-type: application/json
 
 ### Delete Book
 
-DELETE http://localhost:8089/mymusic/songs/6
+DELETE http://localhost:8089/songs/6
diff --git a/pkg/dbtxn/dbtxn.go b/pkg/dbtxn/dbtxn.go
@@ -25,11 +25,11 @@ type (
  // UseHandler responsible to handle transaction
  UseHandler struct {
  *Context
- sq.BaseRunner
+ sq.StdSqlCtx
  }
  // Tx is interface for *db.Tx
  Tx interface {
- sq.BaseRunner
+ sq.StdSqlCtx
  Rollback() error
  Commit() error
  }
@@ -55,15 +55,15 @@ func Use(ctx context.Context, db *sql.DB) (*UseHandler, error) {
 
  c := Find(ctx)
  if c == nil { // NOTE: not transactional
- return &UseHandler{BaseRunner: db}, nil
+ return &UseHandler{StdSqlCtx: db}, nil
  }
 
  tx, err := c.Begin(ctx, db)
  if err != nil {
  return nil, err
  }
 
- return &UseHandler{BaseRunner: tx, Context: c}, nil
+ return &UseHandler{StdSqlCtx: tx, Context: c}, nil
 }
 
 // Find transaction context
@@ -88,7 +88,7 @@ func Error(ctx context.Context) error {
 //
 
 // Begin transaction
-func (c *Context) Begin(ctx context.Context, db *sql.DB) (sq.BaseRunner, error) {
+func (c *Context) Begin(ctx context.Context, db *sql.DB) (sq.StdSqlCtx, error) {
  tx, ok := c.TxMap[db]
  if ok {
  return tx, nil

diff --git a/pkg/dbtxn/dbtxn_test.go b/pkg/dbtxn/dbtxn_test.go
@@ -57,7 +57,7 @@ func TestUse(t *testing.T) {
  TestName: "non transactional",
  DB: &sql.DB{},
  Ctx: context.Background(),
- Expected: &dbtxn.UseHandler{BaseRunner: &sql.DB{}},
+ Expected: &dbtxn.UseHandler{StdSqlCtx: &sql.DB{}},
  },
  {
  TestName: "begin error",
@@ -91,7 +91,7 @@ func TestUse_success(t *testing.T) {
 
  require.NoError(t, err)
  require.Equal(t, map[*sql.DB]dbtxn.Tx{
- db: handler.BaseRunner.(dbtxn.Tx),
+ db: handler.StdSqlCtx.(dbtxn.Tx),
  }, handler.Context.TxMap)
 }
 

diff --git a/tools/typical-build/typical-build.go b/tools/typical-build/typical-build.go
@@ -11,7 +11,6 @@ import (
  "github.com/typical-go/typical-rest-server/pkg/dbtool/pgtool"
  "github.com/typical-go/typical-rest-server/pkg/typcfg"
  "github.com/typical-go/typical-rest-server/pkg/typdocker"
- "github.com/typical-go/typical-rest-server/pkg/typrepo"
 )
 
 var descriptor = typgo.Descriptor{
@@ -25,7 +24,7 @@ var descriptor = typgo.Descriptor{
  Sources: []string{"internal"},
  Annotators: []typast.Annotator{
  &typapp.CtorAnnotation{},
- &typrepo.EntityAnnotation{},
+ // &typrepo.EntityAnnotation{},
  &typcfg.EnvconfigAnnotation{DotEnv: ".env", UsageDoc: "USAGE.md"},
  },
  },