Explorar o código

同时支持简单事务模型和嵌套事务模型,兼容原版xorm简单事务

xormplus %!s(int64=8) %!d(string=hai) anos
pai
achega
75654da50d
Modificáronse 8 ficheiros con 97 adicións e 97 borrados
  1. 9 9
      engine.go
  2. 1 1
      session.go
  3. 2 2
      session_raw.go
  4. 3 3
      session_tx.go
  5. 18 18
      session_tx_plus.go
  6. 20 20
      sql_executor.go
  7. 20 20
      sqlmaps_executor.go
  8. 24 24
      sqltemplates_executor.go

+ 9 - 9
engine.go

@@ -1363,16 +1363,16 @@ func (engine *Engine) dropAll() error {
 	session := engine.NewSession()
 	defer session.Close()
 
-	err := session.begin()
+	err := session.Begin()
 	if err != nil {
 		return err
 	}
 	err = session.dropAll()
 	if err != nil {
-		session.rollback()
+		session.Rollback()
 		return err
 	}
-	return session.commit()
+	return session.Commit()
 }
 
 // CreateTables create tabls according bean
@@ -1380,7 +1380,7 @@ func (engine *Engine) CreateTables(beans ...interface{}) error {
 	session := engine.NewSession()
 	defer session.Close()
 
-	err := session.begin()
+	err := session.Begin()
 	if err != nil {
 		return err
 	}
@@ -1388,11 +1388,11 @@ func (engine *Engine) CreateTables(beans ...interface{}) error {
 	for _, bean := range beans {
 		err = session.CreateTable(bean)
 		if err != nil {
-			session.rollback()
+			session.Rollback()
 			return err
 		}
 	}
-	return session.commit()
+	return session.Commit()
 }
 
 // DropTables drop specify tables
@@ -1400,7 +1400,7 @@ func (engine *Engine) DropTables(beans ...interface{}) error {
 	session := engine.NewSession()
 	defer session.Close()
 
-	err := session.begin()
+	err := session.Begin()
 	if err != nil {
 		return err
 	}
@@ -1408,11 +1408,11 @@ func (engine *Engine) DropTables(beans ...interface{}) error {
 	for _, bean := range beans {
 		err = session.DropTable(bean)
 		if err != nil {
-			session.rollback()
+			session.Rollback()
 			return err
 		}
 	}
-	return session.commit()
+	return session.Commit()
 }
 
 func (engine *Engine) createAll() error {

+ 1 - 1
session.go

@@ -95,7 +95,7 @@ func (session *Session) Close() {
 		// When Close be called, if session is a transaction and do not call
 		// Commit or Rollback, then call Rollback.
 		if session.Tx != nil && !session.IsCommitedOrRollbacked {
-			session.rollback()
+			session.Rollback()
 		}
 		session.Tx = nil
 		session.stmtCache = nil

+ 2 - 2
session_raw.go

@@ -122,9 +122,9 @@ func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, er
 		if session.IsAutoCommit {
 			// FIXME: oci8 can not auto commit (github.com/mattn/go-oci8)
 			if session.Engine.dialect.DBType() == core.ORACLE {
-				session.begin()
+				session.Begin()
 				r, err := session.Tx.Exec(sqlStr, args...)
-				session.commit()
+				session.Commit()
 				return r, err
 			}
 			return session.innerExec(sqlStr, args...)

+ 3 - 3
session_tx.go

@@ -5,7 +5,7 @@
 package xorm
 
 // Begin a transaction
-func (session *Session) begin() error {
+func (session *Session) Begin() error {
 	if session.IsAutoCommit {
 		tx, err := session.DB().Begin()
 		if err != nil {
@@ -20,7 +20,7 @@ func (session *Session) begin() error {
 }
 
 // Rollback When using transaction, you can rollback if any error
-func (session *Session) rollback() error {
+func (session *Session) Rollback() error {
 	if !session.IsAutoCommit && !session.IsCommitedOrRollbacked {
 		session.saveLastSQL(session.Engine.dialect.RollBackStr())
 		session.IsCommitedOrRollbacked = true
@@ -30,7 +30,7 @@ func (session *Session) rollback() error {
 }
 
 // Commit When using transaction, Commit will commit all operations.
-func (session *Session) commit() error {
+func (session *Session) Commit() error {
 	if !session.IsAutoCommit && !session.IsCommitedOrRollbacked {
 		session.saveLastSQL("COMMIT")
 		session.IsCommitedOrRollbacked = true

+ 18 - 18
session_tx_plus.go

@@ -65,7 +65,7 @@ func (transaction *Transaction) WaitForDo(doFunc func(params ...interface{}), pa
 	}
 }
 
-func (session *Session) Begin(transactionDefinition ...int) (*Transaction, error) {
+func (session *Session) BeginTrans(transactionDefinition ...int) (*Transaction, error) {
 	var tx *Transaction
 	if len(transactionDefinition) == 0 {
 		tx = session.transaction(PROPAGATION_REQUIRED)
@@ -73,7 +73,7 @@ func (session *Session) Begin(transactionDefinition ...int) (*Transaction, error
 		tx = session.transaction(transactionDefinition[0])
 	}
 
-	err := tx.Begin()
+	err := tx.BeginTrans()
 	if err != nil {
 		return nil, err
 	}
@@ -88,11 +88,11 @@ func (session *Session) transaction(transactionDefinition int) *Transaction {
 }
 
 // Begin a transaction
-func (transaction *Transaction) Begin() error {
+func (transaction *Transaction) BeginTrans() error {
 	switch transaction.transactionDefinition {
 	case PROPAGATION_REQUIRED:
 		if !transaction.IsExistingTransaction() {
-			if err := transaction.txSession.begin(); err != nil {
+			if err := transaction.txSession.Begin(); err != nil {
 				return err
 			}
 		} else {
@@ -125,7 +125,7 @@ func (transaction *Transaction) Begin() error {
 		return nil
 	case PROPAGATION_REQUIRES_NEW:
 		transaction.txSession = transaction.txSession.Engine.NewSession()
-		if err := transaction.txSession.begin(); err != nil {
+		if err := transaction.txSession.Begin(); err != nil {
 			return err
 		}
 		transaction.isNested = false
@@ -144,7 +144,7 @@ func (transaction *Transaction) Begin() error {
 		return nil
 	case PROPAGATION_NESTED:
 		if !transaction.IsExistingTransaction() {
-			if err := transaction.txSession.begin(); err != nil {
+			if err := transaction.txSession.Begin(); err != nil {
 				return err
 			}
 		} else {
@@ -172,14 +172,14 @@ func (transaction *Transaction) Begin() error {
 }
 
 // Commit When using transaction, Commit will commit all operations.
-func (transaction *Transaction) Commit() error {
+func (transaction *Transaction) CommitTrans() error {
 	switch transaction.transactionDefinition {
 	case PROPAGATION_REQUIRED:
 		if !transaction.IsExistingTransaction() {
 			return ErrNotInTransaction
 		}
 		if !transaction.isNested {
-			err := transaction.txSession.commit()
+			err := transaction.txSession.Commit()
 			if err != nil {
 				return err
 			}
@@ -188,7 +188,7 @@ func (transaction *Transaction) Commit() error {
 	case PROPAGATION_SUPPORTS:
 		if transaction.IsExistingTransaction() {
 			if !transaction.isNested {
-				err := transaction.txSession.commit()
+				err := transaction.txSession.Commit()
 				if err != nil {
 					return err
 				}
@@ -200,7 +200,7 @@ func (transaction *Transaction) Commit() error {
 			return ErrNotInTransaction
 		}
 		if !transaction.isNested {
-			err := transaction.txSession.commit()
+			err := transaction.txSession.Commit()
 			if err != nil {
 				return err
 			}
@@ -211,7 +211,7 @@ func (transaction *Transaction) Commit() error {
 			return ErrNotInTransaction
 		}
 		if !transaction.isNested {
-			err := transaction.txSession.commit()
+			err := transaction.txSession.Commit()
 			if err != nil {
 				return err
 			}
@@ -233,7 +233,7 @@ func (transaction *Transaction) Commit() error {
 		}
 
 		if !transaction.isNested {
-			err := transaction.txSession.commit()
+			err := transaction.txSession.Commit()
 			if err != nil {
 				return err
 			}
@@ -250,14 +250,14 @@ func (transaction *Transaction) Commit() error {
 }
 
 // Rollback When using transaction, you can rollback if any error
-func (transaction *Transaction) Rollback() error {
+func (transaction *Transaction) RollbackTrans() error {
 	switch transaction.transactionDefinition {
 	case PROPAGATION_REQUIRED:
 		if !transaction.IsExistingTransaction() {
 			return ErrNotInTransaction
 		}
 		if transaction.savePointID == "" {
-			err := transaction.txSession.rollback()
+			err := transaction.txSession.Rollback()
 			if err != nil {
 				return err
 			}
@@ -269,7 +269,7 @@ func (transaction *Transaction) Rollback() error {
 	case PROPAGATION_SUPPORTS:
 		if transaction.IsExistingTransaction() {
 			if transaction.savePointID == "" {
-				err := transaction.txSession.rollback()
+				err := transaction.txSession.Rollback()
 				if err != nil {
 					return err
 				}
@@ -284,7 +284,7 @@ func (transaction *Transaction) Rollback() error {
 			return ErrNotInTransaction
 		}
 		if transaction.savePointID == "" {
-			err := transaction.txSession.rollback()
+			err := transaction.txSession.Rollback()
 			if err != nil {
 				return err
 			}
@@ -297,7 +297,7 @@ func (transaction *Transaction) Rollback() error {
 		if !transaction.IsExistingTransaction() {
 			return ErrNotInTransaction
 		}
-		err := transaction.txSession.rollback()
+		err := transaction.txSession.Rollback()
 		if err != nil {
 			return err
 		}
@@ -327,7 +327,7 @@ func (transaction *Transaction) Rollback() error {
 			}
 			return nil
 		} else {
-			err := transaction.txSession.rollback()
+			err := transaction.txSession.Rollback()
 			if err != nil {
 				return err
 			}

+ 20 - 20
sql_executor.go

@@ -29,7 +29,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 	sqlModel := 1
 
 	if sqlsExecutor.session.IsSqlFunc == true {
-		err := sqlsExecutor.session.begin()
+		err := sqlsExecutor.session.Begin()
 		if err != nil {
 			return nil, nil, err
 		}
@@ -88,7 +88,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				sqlsExecutor.session.Engine.RemoveSql(key)
 			default:
 				if sqlsExecutor.session.IsSqlFunc == true {
-					err1 := sqlsExecutor.session.rollback()
+					err1 := sqlsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -102,7 +102,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 		if sqlModel == 1 {
 			if model_1_results.Error != nil {
 				if sqlsExecutor.session.IsSqlFunc == true {
-					err1 := sqlsExecutor.session.rollback()
+					err1 := sqlsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -116,7 +116,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 		} else if sqlModel == 2 {
 			if err != nil {
 				if sqlsExecutor.session.IsSqlFunc == true {
-					err1 := sqlsExecutor.session.rollback()
+					err1 := sqlsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -166,7 +166,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -179,7 +179,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -197,7 +197,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -221,7 +221,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 			default:
 				if sqlsExecutor.session.IsSqlFunc == true {
-					err1 := sqlsExecutor.session.rollback()
+					err1 := sqlsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -262,7 +262,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -275,7 +275,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -293,7 +293,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -312,7 +312,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 		}
 
 		if sqlsExecutor.session.IsSqlFunc == true {
-			err1 := sqlsExecutor.session.commit()
+			err1 := sqlsExecutor.session.Commit()
 			if err1 != nil {
 				return nil, nil, err1
 			}
@@ -347,7 +347,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -360,7 +360,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -379,7 +379,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					if err != nil {
 
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -402,7 +402,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 			default:
 				if sqlsExecutor.session.IsSqlFunc == true {
-					err1 := sqlsExecutor.session.rollback()
+					err1 := sqlsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -448,7 +448,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -461,7 +461,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -479,7 +479,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlsExecutor.session.IsSqlFunc == true {
-							err1 := sqlsExecutor.session.rollback()
+							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -498,7 +498,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 		}
 
 		if sqlsExecutor.session.IsSqlFunc == true {
-			err1 := sqlsExecutor.session.commit()
+			err1 := sqlsExecutor.session.Commit()
 			if err1 != nil {
 				return nil, nil, err1
 			}

+ 20 - 20
sqlmaps_executor.go

@@ -29,7 +29,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 	sqlModel := 1
 
 	if sqlMapsExecutor.session.IsSqlFunc == true {
-		err := sqlMapsExecutor.session.begin()
+		err := sqlMapsExecutor.session.Begin()
 		if err != nil {
 			return nil, nil, err
 		}
@@ -85,7 +85,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 			default:
 				if sqlMapsExecutor.session.IsSqlFunc == true {
-					err1 := sqlMapsExecutor.session.rollback()
+					err1 := sqlMapsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -99,7 +99,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 		if sqlModel == 1 {
 			if model_1_results.Error != nil {
 				if sqlMapsExecutor.session.IsSqlFunc == true {
-					err1 := sqlMapsExecutor.session.rollback()
+					err1 := sqlMapsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -112,7 +112,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 		} else if sqlModel == 2 {
 			if err != nil {
 				if sqlMapsExecutor.session.IsSqlFunc == true {
-					err1 := sqlMapsExecutor.session.rollback()
+					err1 := sqlMapsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -163,7 +163,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -176,7 +176,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -194,7 +194,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -218,7 +218,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 			default:
 				if sqlMapsExecutor.session.IsSqlFunc == true {
-					err1 := sqlMapsExecutor.session.rollback()
+					err1 := sqlMapsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -258,7 +258,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -271,7 +271,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -289,7 +289,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -308,7 +308,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 		}
 
 		if sqlMapsExecutor.session.IsSqlFunc == true {
-			err1 := sqlMapsExecutor.session.commit()
+			err1 := sqlMapsExecutor.session.Commit()
 			if err1 != nil {
 				return nil, nil, err1
 			}
@@ -342,7 +342,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -355,7 +355,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -373,7 +373,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -397,7 +397,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 			default:
 				if sqlMapsExecutor.session.IsSqlFunc == true {
-					err1 := sqlMapsExecutor.session.rollback()
+					err1 := sqlMapsExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -437,7 +437,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -450,7 +450,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -468,7 +468,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlMapsExecutor.session.IsSqlFunc == true {
-							err1 := sqlMapsExecutor.session.rollback()
+							err1 := sqlMapsExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -486,7 +486,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 		}
 
 		if sqlMapsExecutor.session.IsSqlFunc == true {
-			err1 := sqlMapsExecutor.session.commit()
+			err1 := sqlMapsExecutor.session.Commit()
 			if err1 != nil {
 				return nil, nil, err1
 			}

+ 24 - 24
sqltemplates_executor.go

@@ -30,7 +30,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 	sqlModel := 1
 
 	if sqlTemplatesExecutor.session.IsSqlFunc == true {
-		err := sqlTemplatesExecutor.session.begin()
+		err := sqlTemplatesExecutor.session.Begin()
 		if err != nil {
 			return nil, nil, err
 		}
@@ -43,7 +43,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 			sqlStr, err = sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(nil)
 			if err != nil {
 				if sqlTemplatesExecutor.session.IsSqlFunc == true {
-					err1 := sqlTemplatesExecutor.session.rollback()
+					err1 := sqlTemplatesExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -71,7 +71,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				sqlStr, err = sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap[0])
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFunc == true {
-						err1 := sqlTemplatesExecutor.session.rollback()
+						err1 := sqlTemplatesExecutor.session.Rollback()
 						if err1 != nil {
 							return nil, nil, err1
 						}
@@ -98,7 +98,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				sqlStr, err = sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap)
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFunc == true {
-						err1 := sqlTemplatesExecutor.session.rollback()
+						err1 := sqlTemplatesExecutor.session.Rollback()
 						if err1 != nil {
 							return nil, nil, err1
 						}
@@ -166,7 +166,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkeysSlice[i]).Execute(nil)
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFunc == true {
-						err1 := sqlTemplatesExecutor.session.rollback()
+						err1 := sqlTemplatesExecutor.session.Rollback()
 						if err1 != nil {
 							return nil, nil, err1
 						}
@@ -190,7 +190,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -203,7 +203,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -221,7 +221,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -246,7 +246,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 			default:
 				if sqlTemplatesExecutor.session.IsSqlFunc == true {
-					err1 := sqlTemplatesExecutor.session.rollback()
+					err1 := sqlTemplatesExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -258,7 +258,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkeysSlice[i]).Execute(parmaSlice[i])
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFunc == true {
-						err1 := sqlTemplatesExecutor.session.rollback()
+						err1 := sqlTemplatesExecutor.session.Rollback()
 						if err1 != nil {
 							return nil, nil, err1
 						}
@@ -295,7 +295,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -308,7 +308,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -326,7 +326,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -345,7 +345,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 		}
 
 		if sqlTemplatesExecutor.session.IsSqlFunc == true {
-			err1 := sqlTemplatesExecutor.session.commit()
+			err1 := sqlTemplatesExecutor.session.Commit()
 			if err1 != nil {
 				return nil, nil, err1
 			}
@@ -365,7 +365,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkeysMap[k]).Execute(nil)
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFunc == true {
-						err1 := sqlTemplatesExecutor.session.rollback()
+						err1 := sqlTemplatesExecutor.session.Rollback()
 						if err1 != nil {
 							return nil, nil, err1
 						}
@@ -389,7 +389,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -402,7 +402,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -420,7 +420,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -445,7 +445,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 			default:
 				if sqlTemplatesExecutor.session.IsSqlFunc == true {
-					err1 := sqlTemplatesExecutor.session.rollback()
+					err1 := sqlTemplatesExecutor.session.Rollback()
 					if err1 != nil {
 						return nil, nil, err1
 					}
@@ -457,7 +457,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkeysMap[k]).Execute(parmasMap[k])
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFunc == true {
-						err1 := sqlTemplatesExecutor.session.rollback()
+						err1 := sqlTemplatesExecutor.session.Rollback()
 						if err1 != nil {
 							return nil, nil, err1
 						}
@@ -494,7 +494,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -507,7 +507,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				} else if sqlModel == 2 {
 					if err != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -525,7 +525,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 						if sqlTemplatesExecutor.session.IsSqlFunc == true {
-							err1 := sqlTemplatesExecutor.session.rollback()
+							err1 := sqlTemplatesExecutor.session.Rollback()
 							if err1 != nil {
 								return nil, nil, err1
 							}
@@ -544,7 +544,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 		}
 
 		if sqlTemplatesExecutor.session.IsSqlFunc == true {
-			err1 := sqlTemplatesExecutor.session.commit()
+			err1 := sqlTemplatesExecutor.session.Commit()
 			if err1 != nil {
 				return nil, nil, err1
 			}