removed all reference on persist for types defined in commons.go

tcncloud · Oct 28, 2020 · 651069e · 651069e
1 parent 4aaa595
commit 651069e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/generator/rpc_snippets.go b/generator/rpc_snippets.go
@@ -111,7 +111,7 @@ func (this *Impl_{{.Service}}) {{.Method}}(stream {{.Service}}_{{.Method}}Server
     return nil
 }
 
-func (this *Impl_{{.Service}}) {{.Method}}Tx(stream {{.Service}}_{{.Method}}Server, tx persist.PersistTx) error {
+func (this *Impl_{{.Service}}) {{.Method}}Tx(stream {{.Service}}_{{.Method}}Server, tx lib.PersistTx) error {
     query := this.QUERIES.{{camelCase .Query}}(stream.Context(), tx)
     var first *{{.Request}}
     for {
@@ -333,7 +333,7 @@ func (this *Impl_{{.Service}}) {{.Method}}(req *{{.Request}}, stream {{.Service}
     return nil
 }
 
-func (this *Impl_{{.Service}}) {{.Method}}Tx(req *{{.Request}}, stream {{.Service}}_{{.Method}}Server, tx persist.PersistTx) error {
+func (this *Impl_{{.Service}}) {{.Method}}Tx(req *{{.Request}}, stream {{.Service}}_{{.Method}}Server, tx lib.PersistTx) error {
     ctx := stream.Context()
     query := this.QUERIES.{{camelCase .Query}}(ctx, tx)
 

diff --git a/generator/service.go b/generator/service.go
@@ -937,7 +937,7 @@ func WriteIters(p *Printer, s *Service) (outErr error) {
                 if hasSecond {
                     amount = "multiple"
                 }
-                return &Row_`, sName, `_`, camelQ(q), `{err: persist.NotFound{Msg: fmt.Sprintf("expected exactly 1 result from query '`, camelQ(q), `' found %s", amount)}}
+                return &Row_`, sName, `_`, camelQ(q), `{err: lib.NotFound{Msg: fmt.Sprintf("expected exactly 1 result from query '`, camelQ(q), `' found %s", amount)}}
             }
             return first
         }
@@ -1616,6 +1616,7 @@ func WritePackageLevelDeclarations(p *Printer, files *FileList) error {
 	}
 	if hasSQL {
 		p.Q(`
+			// tom
 			type ignoreTx struct {
 				r lib.Runnable
 			}
@@ -1672,6 +1673,7 @@ func WritePackageLevelDeclarations(p *Printer, files *FileList) error {
 		`)
 	} else if hasSpanner {
 		p.Q(`
+		// doesn't work
 			type Result interface {
 				LastInsertId() (int64, error)
 				RowsAffected() (int64, error)