修改原session.Qeury()API

engine.go

@@ -1262,14 +1262,14 @@ func (engine *Engine) Exec(sql string, args ...interface{}) (sql.Result, error)
 func (engine *Engine) Query(sql string, paramStr ...interface{}) (resultsSlice []map[string][]byte, err error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.Query(sql, paramStr...)
+	return session.query(sql, paramStr...)
 }
 
 // Exec a raw sql and return records as []map[string][]byte
 func (engine *Engine) Query2(sql string, paramStr ...interface{}) (resultsSlice []map[string]string, err error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.Query2(sql, paramStr...)
+	return session.query2(sql, paramStr...)
 }
 
 //func XMLString(v interface{}, IndentXML bool) (string, error) {

engineplus.go

@@ -39,20 +39,20 @@ func (engine *Engine) GetFirst(bean interface{}) ResultBean {
 func (engine *Engine) QueryAll(sql string, paramStr ...interface{}) (resultsSlice []map[string]interface{}, err error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.QueryAll(sql, paramStr...)
+	return session.queryAll(sql, paramStr...)
 }
 
 // Exec a raw sql and return records as []map[string]interface{}
 func (engine *Engine) QueryAllByMap(sql string, paramMap interface{}) (resultsSlice []map[string]interface{}, err error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.QueryAllByMap(sql, paramMap)
+	return session.queryAllByMap(sql, paramMap)
 }
 
 func (engine *Engine) QueryAllByMapToJsonString(sql string, paramMap interface{}) (string, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	results, err := session.QueryAllByMap(sql, paramMap)
+	results, err := session.queryAllByMap(sql, paramMap)
 	if err != nil {
 		return "", err
 	}
@@ -62,7 +62,7 @@ func (engine *Engine) QueryAllByMapToJsonString(sql string, paramMap interface{}
 func (engine *Engine) QueryAllByMapToJsonStringWithDateFormat(dateFormat string, sql string, paramMap interface{}) (string, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	results, err := session.QueryAllByMapWithDateFormat(dateFormat, sql, paramMap)
+	results, err := session.queryAllByMapWithDateFormat(dateFormat, sql, paramMap)
 	if err != nil {
 		return "", err
 	}
@@ -72,7 +72,7 @@ func (engine *Engine) QueryAllByMapToJsonStringWithDateFormat(dateFormat string,
 func (engine *Engine) QueryAllToJsonString(sql string, paramStr ...interface{}) (string, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	results, err := session.QueryAll(sql, paramStr...)
+	results, err := session.queryAll(sql, paramStr...)
 	if err != nil {
 		return "", err
 	}
@@ -82,17 +82,17 @@ func (engine *Engine) QueryAllToJsonString(sql string, paramStr ...interface{})
 func (engine *Engine) QueryAllToJsonStringWithDateFormat(dateFormat string, sql string, paramStr ...interface{}) (string, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	results, err := session.QueryAllWithDateFormat(dateFormat, sql, paramStr...)
+	results, err := session.queryAllWithDateFormat(dateFormat, sql, paramStr...)
 	if err != nil {
 		return "", err
 	}
 	return JSONString(results, true)
 }
 
-func (engine *Engine) QueryAllToXmlString(sql string, paramStr ...interface{}) (string, error) {
+func (engine *Engine) queryAllToXmlString(sql string, paramStr ...interface{}) (string, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	resultSlice, err := session.QueryAll(sql, paramStr...)
+	resultSlice, err := session.queryAll(sql, paramStr...)
 	if err != nil {
 		return "", err
 	}
@@ -104,10 +104,10 @@ func (engine *Engine) QueryAllToXmlString(sql string, paramStr ...interface{}) (
 	return string(results), nil
 }
 
-func (engine *Engine) QueryAllToXmlIndentString(sql string, prefix string, indent string, paramStr ...interface{}) (string, error) {
+func (engine *Engine) queryAllToXmlIndentString(sql string, prefix string, indent string, paramStr ...interface{}) (string, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	resultSlice, err := session.QueryAll(sql, paramStr...)
+	resultSlice, err := session.queryAll(sql, paramStr...)
 	if err != nil {
 		return "", err
 	}
@@ -118,10 +118,10 @@ func (engine *Engine) QueryAllToXmlIndentString(sql string, prefix string, inden
 	return string(results), nil
 }
 
-func (engine *Engine) QueryAllToXmlStringWithDateFormat(dateFormat string, sql string, paramStr ...interface{}) (string, error) {
+func (engine *Engine) queryAllToXmlStringWithDateFormat(dateFormat string, sql string, paramStr ...interface{}) (string, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	resultSlice, err := session.QueryAll(sql, paramStr...)
+	resultSlice, err := session.queryAll(sql, paramStr...)
 	if err != nil {
 		return "", err
 	}
@@ -135,7 +135,7 @@ func (engine *Engine) QueryAllToXmlStringWithDateFormat(dateFormat string, sql s
 func (engine *Engine) QueryAllToXmlIndentStringWithDateFormat(dateFormat string, sql string, prefix string, indent string, paramStr ...interface{}) (string, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	resultSlice, err := session.QueryAll(sql, paramStr...)
+	resultSlice, err := session.queryAll(sql, paramStr...)
 	if err != nil {
 		return "", err
 	}

session.go

@@ -2080,7 +2080,7 @@ func (session *Session) innerQuery(db *core.DB, sqlStr string, params ...interfa
 }
 
 // Exec a raw sql and return records as []map[string][]byte
-func (session *Session) Query(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string][]byte, err error) {
+func (session *Session) query1(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string][]byte, err error) {
 	defer session.resetStatement()
 	if session.IsAutoClose {
 		defer session.Close()
@@ -2092,7 +2092,7 @@ func (session *Session) Query(sqlStr string, paramStr ...interface{}) (resultsSl
 // =============================
 // for string
 // =============================
-func (session *Session) Query2(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string]string, err error) {
+func (session *Session) query2(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string]string, err error) {
 	session.queryPreprocess(&sqlStr, paramStr...)
 
 	if session.IsAutoCommit {

sessionplus.go

@@ -134,36 +134,36 @@ func (resultMap ResultMap) XmlIndent(prefix string, indent string, recordTag str
 }
 
 // Exec a raw sql and return records as []map[string]interface{}
-func (session *Session) FindAll() ResultMap {
+func (session *Session) Query() ResultMap {
 	sql := session.Statement.RawSQL
 	params := session.Statement.RawParams
-	result, err := session.QueryAll(sql, params...)
+	result, err := session.queryAll(sql, params...)
 	r := ResultMap{Result: result, Error: err}
 	return r
 }
 
 // Exec a raw sql and return records as []map[string]interface{}
-func (session *Session) FindAllWithDateFormat(dateFormat string) ResultMap {
+func (session *Session) QueryWithDateFormat(dateFormat string) ResultMap {
 	sql := session.Statement.RawSQL
 	params := session.Statement.RawParams
-	result, err := session.QueryAllWithDateFormat(dateFormat, sql, params...)
+	result, err := session.queryAllWithDateFormat(dateFormat, sql, params...)
 	r := ResultMap{Result: result, Error: err}
 	return r
 }
 
 // Exec a raw sql and return records as []map[string]interface{}
-func (session *Session) FindAllByParamMap() ResultMap {
+func (session *Session) QueryByParamMap() ResultMap {
 	sql := session.Statement.RawSQL
 	params := session.Statement.RawParams
-	result, err := session.QueryAllByMap(sql, params[0])
+	result, err := session.queryAllByMap(sql, params[0])
 	r := ResultMap{Result: result, Error: err}
 	return r
 }
 
-func (session *Session) FindAllByParamMapWithDateFormat(dateFormat string) ResultMap {
+func (session *Session) QueryByParamMapWithDateFormat(dateFormat string) ResultMap {
 	sql := session.Statement.RawSQL
 	params := session.Statement.RawParams
-	results, err := session.QueryAllByMapWithDateFormat(dateFormat, sql, params[0])
+	results, err := session.queryAllByMapWithDateFormat(dateFormat, sql, params[0])
 	r := ResultMap{Result: results, Error: err}
 	return r
 }
@@ -171,7 +171,7 @@ func (session *Session) FindAllByParamMapWithDateFormat(dateFormat string) Resul
 // =============================
 // for Object
 // =============================
-func (session *Session) QueryAll(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string]interface{}, err error) {
+func (session *Session) queryAll(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string]interface{}, err error) {
 	session.queryPreprocess(&sqlStr, paramStr...)
 
 	if session.IsAutoCommit {
@@ -180,7 +180,7 @@ func (session *Session) QueryAll(sqlStr string, paramStr ...interface{}) (result
 	return txQuery3(session.Tx, sqlStr, paramStr...)
 }
 
-func (session *Session) QueryAllByMap(sqlStr string, paramMap interface{}) (resultsSlice []map[string]interface{}, err error) {
+func (session *Session) queryAllByMap(sqlStr string, paramMap interface{}) (resultsSlice []map[string]interface{}, err error) {
 	sqlStr1, param, _ := core.MapToSlice(sqlStr, paramMap)
 
 	session.queryPreprocess(&sqlStr1, param...)
@@ -191,7 +191,7 @@ func (session *Session) QueryAllByMap(sqlStr string, paramMap interface{}) (resu
 	return txQuery3(session.Tx, sqlStr1, param...)
 }
 
-func (session *Session) QueryAllByMapWithDateFormat(dateFormat string, sqlStr string, paramMap interface{}) (resultsSlice []map[string]interface{}, err error) {
+func (session *Session) queryAllByMapWithDateFormat(dateFormat string, sqlStr string, paramMap interface{}) (resultsSlice []map[string]interface{}, err error) {
 	sqlStr1, param, _ := core.MapToSlice(sqlStr, paramMap)
 	session.queryPreprocess(&sqlStr1, param...)
 
@@ -201,7 +201,7 @@ func (session *Session) QueryAllByMapWithDateFormat(dateFormat string, sqlStr st
 	return txQuery3WithDateFormat(session.Tx, dateFormat, sqlStr1, param...)
 }
 
-func (session *Session) QueryAllWithDateFormat(dateFormat string, sqlStr string, paramStr ...interface{}) (resultsSlice []map[string]interface{}, err error) {
+func (session *Session) queryAllWithDateFormat(dateFormat string, sqlStr string, paramStr ...interface{}) (resultsSlice []map[string]interface{}, err error) {
 	session.queryPreprocess(&sqlStr, paramStr...)
 
 	if session.IsAutoCommit {
@@ -210,16 +210,16 @@ func (session *Session) QueryAllWithDateFormat(dateFormat string, sqlStr string,
 	return txQuery3WithDateFormat(session.Tx, dateFormat, sqlStr, paramStr...)
 }
 
-func (session *Session) QueryAllToJsonString(sql string, paramStr ...interface{}) (string, error) {
-	results, err := session.QueryAll(sql, paramStr...)
+func (session *Session) queryAllToJsonString(sql string, paramStr ...interface{}) (string, error) {
+	results, err := session.queryAll(sql, paramStr...)
 	if err != nil {
 		return "", err
 	}
 	return JSONString(results, true)
 }
 
-func (session *Session) QueryAllToXmlString(sql string, paramStr ...interface{}) (string, error) {
-	resultMap, err := session.QueryAll(sql, paramStr...)
+func (session *Session) queryAllToXmlString(sql string, paramStr ...interface{}) (string, error) {
+	resultMap, err := session.queryAll(sql, paramStr...)
 
 	if err != nil {
 		return "", err
@@ -231,8 +231,8 @@ func (session *Session) QueryAllToXmlString(sql string, paramStr ...interface{})
 	return string(results), nil
 }
 
-func (session *Session) QueryAllToXmlIndentString(sql string, prefix string, indent string, paramStr ...interface{}) (string, error) {
-	resultSlice, err := session.QueryAll(sql, paramStr...)
+func (session *Session) queryAllToXmlIndentString(sql string, prefix string, indent string, paramStr ...interface{}) (string, error) {
+	resultSlice, err := session.queryAll(sql, paramStr...)
 	if err != nil {
 		return "", err
 	}
@@ -243,8 +243,8 @@ func (session *Session) QueryAllToXmlIndentString(sql string, prefix string, ind
 	return string(results), nil
 }
 
-func (session *Session) QueryAllToXmlStringWithDateFormat(dateFormat string, sql string, paramStr ...interface{}) (string, error) {
-	resultSlice, err := session.QueryAll(sql, paramStr...)
+func (session *Session) queryAllToXmlStringWithDateFormat(dateFormat string, sql string, paramStr ...interface{}) (string, error) {
+	resultSlice, err := session.queryAll(sql, paramStr...)
 	if err != nil {
 		return "", err
 	}
@@ -255,8 +255,8 @@ func (session *Session) QueryAllToXmlStringWithDateFormat(dateFormat string, sql
 	return string(results), nil
 }
 
-func (session *Session) QueryAllToXmlIndentStringWithDateFormat(dateFormat string, sql string, prefix string, indent string, paramStr ...interface{}) (string, error) {
-	resultSlice, err := session.QueryAll(sql, paramStr...)
+func (session *Session) queryAllToXmlIndentStringWithDateFormat(dateFormat string, sql string, prefix string, indent string, paramStr ...interface{}) (string, error) {
+	resultSlice, err := session.queryAll(sql, paramStr...)
 	if err != nil {
 		return "", err
 	}
@@ -268,24 +268,24 @@ func (session *Session) QueryAllToXmlIndentStringWithDateFormat(dateFormat strin
 	return string(results), nil
 }
 
-func (session *Session) QueryAllByMapToJsonString(sql string, paramMap interface{}) (string, error) {
-	results, err := session.QueryAllByMap(sql, paramMap)
+func (session *Session) queryAllByMapToJsonString(sql string, paramMap interface{}) (string, error) {
+	results, err := session.queryAllByMap(sql, paramMap)
 	if err != nil {
 		return "", err
 	}
 	return JSONString(results, true)
 }
 
-func (session *Session) QueryAllByMapToJsonStringWithDateFormat(dateFormat string, sql string, paramMap interface{}) (string, error) {
-	results, err := session.QueryAllByMapWithDateFormat(dateFormat, sql, paramMap)
+func (session *Session) queryAllByMapToJsonStringWithDateFormat(dateFormat string, sql string, paramMap interface{}) (string, error) {
+	results, err := session.queryAllByMapWithDateFormat(dateFormat, sql, paramMap)
 	if err != nil {
 		return "", err
 	}
 	return JSONString(results, true)
 }
 
-func (session *Session) QueryAllToJsonStringWithDateFormat(dateFormat string, sql string, paramStr ...interface{}) (string, error) {
-	results, err := session.QueryAllWithDateFormat(dateFormat, sql, paramStr...)
+func (session *Session) queryAllToJsonStringWithDateFormat(dateFormat string, sql string, paramStr ...interface{}) (string, error) {
+	results, err := session.queryAllWithDateFormat(dateFormat, sql, paramStr...)
 	if err != nil {
 		return "", err
 	}

test/xorm_test.go

@@ -90,7 +90,7 @@ func Test_GetFirst_XmlIndent(t *testing.T) {
 }
 
 func Test_FindAll_Json(t *testing.T) {
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).FindAll().Json()
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).Query().Json()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -98,7 +98,7 @@ func Test_FindAll_Json(t *testing.T) {
 }
 
 func Test_FindAll_ID(t *testing.T) {
-	rows := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).FindAll()
+	rows := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).Query()
 	if rows.Error != nil {
 		t.Fatal(rows.Error)
 	}
@@ -106,7 +106,7 @@ func Test_FindAll_ID(t *testing.T) {
 }
 
 func Test_FindAll_Xml(t *testing.T) {
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).FindAll().Xml()
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).Query().Xml()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -114,7 +114,7 @@ func Test_FindAll_Xml(t *testing.T) {
 }
 
 func Test_FindAll_XmlIndent(t *testing.T) {
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).FindAll().XmlIndent("", "  ", "article")
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).Query().XmlIndent("", "  ", "article")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -122,7 +122,7 @@ func Test_FindAll_XmlIndent(t *testing.T) {
 }
 
 func Test_FindAllWithDateFormat_Json(t *testing.T) {
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).FindAllWithDateFormat("20060102").Json()
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).QueryWithDateFormat("20060102").Json()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -130,7 +130,7 @@ func Test_FindAllWithDateFormat_Json(t *testing.T) {
 }
 
 func Test_FindAllWithDateFormat_Xml(t *testing.T) {
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).FindAllWithDateFormat("20060102").Xml()
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?", 2).QueryWithDateFormat("20060102").Xml()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -138,7 +138,7 @@ func Test_FindAllWithDateFormat_Xml(t *testing.T) {
 }
 
 func Test_FindAllWithDateFormat_XmlIndent(t *testing.T) {
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id in (?,?)", 2, 5).FindAllWithDateFormat("20060102").XmlIndent("", "  ", "article")
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id in (?,?)", 2, 5).QueryWithDateFormat("20060102").XmlIndent("", "  ", "article")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -147,7 +147,7 @@ func Test_FindAllWithDateFormat_XmlIndent(t *testing.T) {
 
 func Test_FindAllByParamMap_Json(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 4, "userid": 1}
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?id and userid=?userid", &paramMap).FindAllByParamMap().Json()
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?id and userid=?userid", &paramMap).QueryByParamMap().Json()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -156,7 +156,7 @@ func Test_FindAllByParamMap_Json(t *testing.T) {
 
 func Test_FindAllByParamMap_Xml(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 6, "userid": 1}
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?id and userid=?userid", &paramMap).FindAllByParamMap().Xml()
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?id and userid=?userid", &paramMap).QueryByParamMap().Xml()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -165,7 +165,7 @@ func Test_FindAllByParamMap_Xml(t *testing.T) {
 
 func Test_FindAllByParamMap_XmlIndent(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 6, "userid": 1}
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?id and userid=?userid", &paramMap).FindAllByParamMap().XmlIndent("", "  ", "article")
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?id and userid=?userid", &paramMap).QueryByParamMap().XmlIndent("", "  ", "article")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -174,7 +174,7 @@ func Test_FindAllByParamMap_XmlIndent(t *testing.T) {
 
 func Test_FindAllByParamMapWithDateFormat_XmlIndent(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 5, "userid": 1}
-	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?id and userid=?userid", &paramMap).FindAllByParamMapWithDateFormat("2006/01/02").XmlIndent("", "  ", "article")
+	rows, err := db.Sql("select id,title,createdatetime,content from article where id = ?id and userid=?userid", &paramMap).QueryByParamMapWithDateFormat("2006/01/02").XmlIndent("", "  ", "article")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -183,7 +183,7 @@ func Test_FindAllByParamMapWithDateFormat_XmlIndent(t *testing.T) {
 
 func Test_SqlMapClient_FindAllByParamMap_Json(t *testing.T) {
 	paramMap := map[string]interface{}{"1": 2, "2": 5}
-	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).FindAllByParamMap().Json()
+	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).QueryByParamMap().Json()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -192,7 +192,7 @@ func Test_SqlMapClient_FindAllByParamMap_Json(t *testing.T) {
 
 func Test_SqlMapClient_FindAllByParamMapWithDateFormat_Json(t *testing.T) {
 	paramMap := map[string]interface{}{"1": 2, "2": 5}
-	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).FindAllByParamMapWithDateFormat("2006-01-02 15:04").Json()
+	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).QueryByParamMapWithDateFormat("2006-01-02 15:04").Json()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -201,7 +201,7 @@ func Test_SqlMapClient_FindAllByParamMapWithDateFormat_Json(t *testing.T) {
 
 func Test_SqlMapClient_FindAllByParamMap_Xml(t *testing.T) {
 	paramMap := map[string]interface{}{"1": 2, "2": 5}
-	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).FindAllByParamMap().Xml()
+	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).QueryByParamMap().Xml()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -210,7 +210,7 @@ func Test_SqlMapClient_FindAllByParamMap_Xml(t *testing.T) {
 
 func Test_SqlMapClient_FindAllByParamMapWithDateFormat_Xml(t *testing.T) {
 	paramMap := map[string]interface{}{"1": 2, "2": 5}
-	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).FindAllByParamMapWithDateFormat("2006-01-02 15:04").Xml()
+	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).QueryByParamMapWithDateFormat("2006-01-02 15:04").Xml()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -219,7 +219,7 @@ func Test_SqlMapClient_FindAllByParamMapWithDateFormat_Xml(t *testing.T) {
 
 func Test_SqlMapClient_FindAllByParamMap_XmlIndent(t *testing.T) {
 	paramMap := map[string]interface{}{"1": 2, "2": 5}
-	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).FindAllByParamMap().XmlIndent("", "  ", "article")
+	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).QueryByParamMap().XmlIndent("", "  ", "article")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -228,7 +228,7 @@ func Test_SqlMapClient_FindAllByParamMap_XmlIndent(t *testing.T) {
 
 func Test_SqlMapClient_FindAllByParamMapWithDateFormat_XmlIndent(t *testing.T) {
 	paramMap := map[string]interface{}{"1": 2, "2": 5}
-	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).FindAllByParamMapWithDateFormat("2006-01-02 15:04").XmlIndent("", "  ", "article")
+	rows, err := db.SqlMapClient("selectAllArticle", &paramMap).QueryByParamMapWithDateFormat("2006-01-02 15:04").XmlIndent("", "  ", "article")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -237,7 +237,7 @@ func Test_SqlMapClient_FindAllByParamMapWithDateFormat_XmlIndent(t *testing.T) {
 
 func Test_SqlTemplateClient_FindAllByParamMap_Json(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 2, "userid": 3, "count": 1}
-	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).FindAllByParamMap().Json()
+	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).QueryByParamMap().Json()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -246,7 +246,7 @@ func Test_SqlTemplateClient_FindAllByParamMap_Json(t *testing.T) {
 
 func Test_SqlTemplateClient_FindAllByParamMapWithDateFormat_Json(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 2, "userid": 3, "count": 1}
-	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).FindAllByParamMapWithDateFormat("01/02/2006").Json()
+	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).QueryByParamMapWithDateFormat("01/02/2006").Json()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -255,7 +255,7 @@ func Test_SqlTemplateClient_FindAllByParamMapWithDateFormat_Json(t *testing.T) {
 
 func Test_SqlTemplateClient_FindAllByParamMap_Xml(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 2, "userid": 3, "count": 2}
-	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).FindAllByParamMap().Xml()
+	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).QueryByParamMap().Xml()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -264,7 +264,7 @@ func Test_SqlTemplateClient_FindAllByParamMap_Xml(t *testing.T) {
 
 func Test_SqlTemplateClient_FindAllByParamMapWithDateFormat_Xml(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 2, "userid": 3, "count": 2}
-	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).FindAllByParamMapWithDateFormat("01/02/2006").Xml()
+	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).QueryByParamMapWithDateFormat("01/02/2006").Xml()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -273,7 +273,7 @@ func Test_SqlTemplateClient_FindAllByParamMapWithDateFormat_Xml(t *testing.T) {
 
 func Test_SqlTemplateClient_FindAllByParamMap_XmlIndent(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 2, "userid": 3, "count": 2}
-	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).FindAllByParamMap().XmlIndent("", "  ", "article")
+	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).QueryByParamMap().XmlIndent("", "  ", "article")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -282,7 +282,7 @@ func Test_SqlTemplateClient_FindAllByParamMap_XmlIndent(t *testing.T) {
 
 func Test_SqlTemplateClient_FindAllByParamMapWithDateFormat_XmlIndent(t *testing.T) {
 	paramMap := map[string]interface{}{"id": 2, "userid": 3, "count": 2}
-	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).FindAllByParamMapWithDateFormat("01/02/2006").XmlIndent("", "  ", "article")
+	rows, err := db.SqlTemplateClient("select.example.stpl", paramMap).QueryByParamMapWithDateFormat("01/02/2006").XmlIndent("", "  ", "article")
 	if err != nil {
 		t.Fatal(err)
 	}