fix postgres and oracle fmt placeholder

ast/NodeConfigHolder.go

@@ -1,7 +1,13 @@
 package ast
 
+
 type NodeConfigHolder struct {
-	Proxy ExpressionEngine
+	Convert SqlArgTypeConvert
+	Proxy   ExpressionEngine
+}
+
+func (it *NodeConfigHolder) GetSqlArgTypeConvert() SqlArgTypeConvert {
+	return it.Convert
 }
 
 func (it *NodeConfigHolder) GetExpressionEngineProxy() ExpressionEngine {

ast/NodeString.go

@@ -25,7 +25,7 @@ func (it *NodeString) Eval(env map[string]interface{}, arg_array *[]interface{},
 	var data = it.value
 	var err error
 	if it.expressMap != nil {
-		data, err = Replace(it.expressMap, data, env, it.holder.GetExpressionEngineProxy(), arg_array, stmtConvert)
+		data, err = Replace(it.expressMap, data, it.holder.Convert, env, it.holder.GetExpressionEngineProxy(), arg_array, stmtConvert)
 		if err != nil {
 			return nil, err
 		}

ast/RegexReplaceArg.go

@@ -9,7 +9,7 @@ import (
 )
 
 //执行替换操作
-func Replace(findStrs []string, data string, arg map[string]interface{}, engine ExpressionEngine, arg_array *[]interface{}, indexConvert stmt.StmtIndexConvert) (string, error) {
+func Replace(findStrs []string, data string, typeConvert SqlArgTypeConvert, arg map[string]interface{}, engine ExpressionEngine, arg_array *[]interface{}, indexConvert stmt.StmtIndexConvert) (string, error) {
 	for index, findStr := range findStrs {
 
 		//find param arg
@@ -26,6 +26,7 @@ func Replace(findStrs []string, data string, arg map[string]interface{}, engine
 			*arg_array = append(*arg_array, evalData)
 		}
 		//replace index
+		indexConvert.Inc()
 		data = strings.Replace(data, "#{"+findStr+"}", indexConvert.Convert(index), -1)
 	}
 	return data, nil

stmt/MysqlStmtIndexConvertImpl.go

@@ -3,6 +3,14 @@ package stmt
 type MysqlStmtIndexConvertImpl struct {
 }
 
-func (it *MysqlStmtIndexConvertImpl) Convert(index int) string {
+func (it *MysqlStmtIndexConvertImpl) Convert() string {
 	return " ? "
 }
+
+func (it *MysqlStmtIndexConvertImpl)Inc()  {
+
+}
+
+func (it *MysqlStmtIndexConvertImpl)Get()int  {
+	return 0
+}

stmt/MysqlStmtIndexConvertImpl_test.go

@@ -4,7 +4,7 @@ import "testing"
 
 func TestMysqlStmtIndexConvertImpl_Convert(t *testing.T) {
 	var convert = MysqlStmtIndexConvertImpl{}
-	if " ? " != convert.Convert(0) {
+	if " ? " != convert.Convert() {
 		panic("TestMysqlStmtIndexConvertImpl_Convert fail")
 	}
 }

stmt/OracleStmtIndexConvertImpl.go

@@ -1,10 +1,27 @@
 package stmt
 
-import "fmt"
+import (
+	"fmt"
+	"sync"
+)
 
 type OracleStmtIndexConvertImpl struct {
+	sync.RWMutex
+	Counter int
 }
 
-func (it *OracleStmtIndexConvertImpl) Convert(index int) string {
-	return fmt.Sprint(" :val", index+1, " ")
+func (it *OracleStmtIndexConvertImpl) Convert() string {
+	return fmt.Sprint(" :val", it.Get(), " ")
+}
+
+func (it *OracleStmtIndexConvertImpl) Inc() {
+	it.Lock()
+	defer it.Unlock()
+	it.Counter++
+}
+
+func (it *OracleStmtIndexConvertImpl) Get() int {
+	it.RLock()
+	defer it.RUnlock()
+	return it.Counter
 }

stmt/OracleStmtIndexConvertImpl_test.go

@@ -3,8 +3,9 @@ package stmt
 import "testing"
 
 func TestOracleStmtIndexConvertImpl_Convert(t *testing.T) {
-	var convert = OracleStmtIndexConvertImpl{}
-	if " :val1 " != convert.Convert(0) {
+	var convert = &OracleStmtIndexConvertImpl{}
+	convert.Inc()
+	if " :val1 " != convert.Convert() {
 		panic("TestOracleStmtIndexConvertImpl_Convert fail")
 	}
 }

stmt/PostgreStmtIndexConvertImpl.go

@@ -1,10 +1,27 @@
 package stmt
 
-import "fmt"
+import (
+	"fmt"
+	"sync"
+)
 
 type PostgreStmtIndexConvertImpl struct {
+	sync.RWMutex
+	Counter int
 }
 
-func (it *PostgreStmtIndexConvertImpl) Convert(index int) string {
-	return fmt.Sprint(" $", index+1, " ")
+func (p *PostgreStmtIndexConvertImpl) Inc() {
+	p.Lock()
+	defer p.Unlock()
+	p.Counter++
+}
+
+func (p *PostgreStmtIndexConvertImpl) Get() int {
+	p.RLock()
+	defer p.RUnlock()
+	return p.Counter
+}
+
+func (p *PostgreStmtIndexConvertImpl) Convert() string {
+	return fmt.Sprint(" $", p.Get(), " ")
 }

stmt/PostgreStmtIndexConvertImpl_test.go

@@ -3,8 +3,10 @@ package stmt
 import "testing"
 
 func TestPostgreStmtIndexConvertImpl_Convert(t *testing.T) {
-	var convert = PostgreStmtIndexConvertImpl{}
-	if " $1 " != convert.Convert(0) {
+	var convert = &PostgreStmtIndexConvertImpl{}
+	convert.Inc()
+	convert.Inc()
+	if " $2 " != convert.Convert() {
 		panic("TestPostgreStmtIndexConvertImpl_Convert fail")
 	}
 }

stmt/StmtIndexConvert.go

@@ -5,5 +5,7 @@ package stmt
 // oracle : input 0 ->   :val1
 // sqlite: input 0 ->   " ? "
 type StmtIndexConvert interface {
-	Convert(index int) string
+	Convert() string
+	Inc()
+	Get()int
 }

stmt/StmtIndexConvertFactory.go

@@ -1,16 +1,23 @@
 package stmt
 
-import "fmt"
+import (
+	"fmt"
+	"sync"
+)
 
 // build a stmt convert
 func BuildStmtConvert(driverType string) (StmtIndexConvert, error) {
 	switch driverType {
 	case "mysql", "mymysql", "mssql", "sqlite3":
 		return &MysqlStmtIndexConvertImpl{}, nil
 	case "postgres":
-		return &PostgreStmtIndexConvertImpl{}, nil
+		return &PostgreStmtIndexConvertImpl{
+			sync.RWMutex{},
+			0,
+		}, nil
 	case "oci8":
-		return &OracleStmtIndexConvertImpl{}, nil
+		return &OracleStmtIndexConvertImpl{sync.RWMutex{},
+			0}, nil
 	default:
 		panic(fmt.Sprint("[GoMybatis] un support dbName:", driverType, " only support: ", "mysql,", "mymysql,", "mssql,", "sqlite3,", "postgres,", "oci8"))
 	}