modify parser manager and add postgresql test

Author: xfali

parsing/dynamics.go

@@ -69,7 +69,7 @@ func (m *DynamicData) ReplaceWithMap(objParams map[string]interface{}) string {
 	return ret
 }
 
-func (m *DynamicData) ParseMetadata(driverName string, params ...interface{})(*sqlparser.Metadata, error) {
+func (m *DynamicData) ParseMetadata(driverName string, params ...interface{}) (*sqlparser.Metadata, error) {
 	paramMap := reflection.ParseParams(params...)
 	sqlStr := m.ReplaceWithMap(paramMap)
 	return sqlparser.ParseWithParamMap(driverName, sqlStr, paramMap)

parsing/template/parse.go

@@ -118,7 +118,7 @@ func (m *Manager) RegisterFile(file string) error {
 	return nil
 }
 
-func (m *Manager) FindSql(sqlId string) (*Parser, bool) {
+func (m *Manager) FindSqlParser(sqlId string) (*Parser, bool) {
 	m.lock.Lock()
 	defer m.lock.Unlock()
 

parsing/xml/manager.go

@@ -0,0 +1,91 @@
+// Copyright (C) 2019-2020, Xiongfa Li.
+// @author xiongfa.li
+// @version V1.0
+// Description: 
+
+package xml
+
+import (
+	"github.com/xfali/gobatis/errors"
+	"github.com/xfali/gobatis/logging"
+	"github.com/xfali/gobatis/parsing"
+	"github.com/xfali/gobatis/parsing/sqlparser"
+	"sync"
+)
+
+type Manager struct {
+	sqlMap map[string]*parsing.DynamicData
+	lock   sync.Mutex
+}
+
+func NewManager() *Manager {
+	return &Manager{
+		sqlMap: map[string]*parsing.DynamicData{},
+	}
+}
+
+func (m *Manager) RegisterData(data []byte) error {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+
+	mapper, err := Parse(data)
+	if err != nil {
+		logging.Warn("register mapper data failed: %s err: %v\n", string(data), err)
+		return err
+	}
+
+	return m.formatMapper(mapper)
+}
+
+func (m *Manager) RegisterFile(file string) error {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+
+	mapper, err := ParseFile(file)
+	if err != nil {
+		logging.Warn("register mapper file failed: %s err: %v\n", file, err)
+		return err
+	}
+
+	return m.formatMapper(mapper)
+}
+
+func (m *Manager) formatMapper(mapper *Mapper) error {
+	ret := mapper.Format()
+	for k, v := range ret {
+		if _, ok := m.sqlMap[k]; ok {
+			return errors.SQL_ID_DUPLICATES
+		} else {
+			m.sqlMap[k] = v
+		}
+	}
+	return nil
+}
+
+func (m *Manager) FindSqlParser(sqlId string) (sqlparser.SqlParser, bool) {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+
+	v, ok := m.sqlMap[sqlId]
+	return v, ok
+}
+
+func (m *Manager) RegisterSql(sqlId string, sql string) error {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+
+	if _, ok := m.sqlMap[sqlId]; ok {
+		return errors.SQL_ID_DUPLICATES
+	} else {
+		dd := &parsing.DynamicData{OriginData: sql}
+		m.sqlMap[sqlId] = dd
+	}
+	return nil
+}
+
+func (m *Manager) UnregisterSql(sqlId string) {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+
+	delete(m.sqlMap, sqlId)
+}

sqlmanager.go

@@ -9,94 +9,40 @@
 package gobatis
 
 import (
-	"github.com/xfali/gobatis/errors"
-	"github.com/xfali/gobatis/logging"
 	"github.com/xfali/gobatis/parsing"
 	"github.com/xfali/gobatis/parsing/sqlparser"
 	"github.com/xfali/gobatis/parsing/template"
 	"github.com/xfali/gobatis/parsing/xml"
-	"sync"
 )
 
-type dynamicSqlManager struct {
-	sqlMap map[string]*parsing.DynamicData
-	lock   sync.Mutex
-}
-
 type sqlManager struct {
-	dynamicSqlMgr  *dynamicSqlManager
+	dynamicSqlMgr  *xml.Manager
 	templateSqlMgr *template.Manager
 }
 
 var g_sql_mgr = sqlManager{
-	dynamicSqlMgr:  &dynamicSqlManager{sqlMap: map[string]*parsing.DynamicData{}},
+	dynamicSqlMgr:  xml.NewManager(),
 	templateSqlMgr: template.NewManager(),
 }
 
 func RegisterSql(sqlId string, sql string) error {
-	g_sql_mgr.dynamicSqlMgr.lock.Lock()
-	defer g_sql_mgr.dynamicSqlMgr.lock.Unlock()
-
-	if _, ok := g_sql_mgr.dynamicSqlMgr.sqlMap[sqlId]; ok {
-		return errors.SQL_ID_DUPLICATES
-	} else {
-		dd := &parsing.DynamicData{OriginData: sql}
-		g_sql_mgr.dynamicSqlMgr.sqlMap[sqlId] = dd
-	}
-	return nil
+	return g_sql_mgr.dynamicSqlMgr.RegisterSql(sqlId, sql)
 }
 
 func UnregisterSql(sqlId string) {
-	g_sql_mgr.dynamicSqlMgr.lock.Lock()
-	defer g_sql_mgr.dynamicSqlMgr.lock.Unlock()
-
-	delete(g_sql_mgr.dynamicSqlMgr.sqlMap, sqlId)
+	g_sql_mgr.dynamicSqlMgr.UnregisterSql(sqlId)
 }
 
 func RegisterMapperData(data []byte) error {
-	g_sql_mgr.dynamicSqlMgr.lock.Lock()
-	defer g_sql_mgr.dynamicSqlMgr.lock.Unlock()
-
-	mapper, err := xml.Parse(data)
-	if err != nil {
-		logging.Warn("register mapper data failed: %s err: %v\n", string(data), err)
-		return err
-	}
-
-	return formatMapper(mapper)
+	return g_sql_mgr.dynamicSqlMgr.RegisterData(data)
 }
 
 func RegisterMapperFile(file string) error {
-	g_sql_mgr.dynamicSqlMgr.lock.Lock()
-	defer g_sql_mgr.dynamicSqlMgr.lock.Unlock()
-
-	mapper, err := xml.ParseFile(file)
-	if err != nil {
-		logging.Warn("register mapper file failed: %s err: %v\n", file, err)
-		return err
-	}
-
-	return formatMapper(mapper)
+	return g_sql_mgr.dynamicSqlMgr.RegisterFile(file)
 }
 
-func formatMapper(mapper *xml.Mapper) error {
-	ret := mapper.Format()
-	for k, v := range ret {
-		if _, ok := g_sql_mgr.dynamicSqlMgr.sqlMap[k]; ok {
-			return errors.SQL_ID_DUPLICATES
-		} else {
-			g_sql_mgr.dynamicSqlMgr.sqlMap[k] = v
-		}
-	}
-	return nil
-}
-
-func FindDynamicSql(sqlId string) (sqlparser.SqlParser, bool) {
-	g_sql_mgr.dynamicSqlMgr.lock.Lock()
-	defer g_sql_mgr.dynamicSqlMgr.lock.Unlock()
-
-	v, ok := g_sql_mgr.dynamicSqlMgr.sqlMap[sqlId]
-	return v, ok
+func FindDynamicSqlParser(sqlId string) (sqlparser.SqlParser, bool) {
+	return g_sql_mgr.dynamicSqlMgr.FindSqlParser(sqlId)
 }
 
 func RegisterTemplateData(data []byte) error {
@@ -107,6 +53,19 @@ func RegisterTemplateFile(file string) error {
 	return g_sql_mgr.templateSqlMgr.RegisterFile(file)
 }
 
-func FindTemplateSql(sqlId string) (sqlparser.SqlParser, bool) {
-	return g_sql_mgr.templateSqlMgr.FindSql(sqlId)
+func FindTemplateSqlParser(sqlId string) (sqlparser.SqlParser, bool) {
+	return g_sql_mgr.templateSqlMgr.FindSqlParser(sqlId)
+}
+
+func FindSqlParser(sqlId string) sqlparser.SqlParser {
+	ret, ok := FindDynamicSqlParser(sqlId)
+	if !ok {
+		ret, ok = FindTemplateSqlParser(sqlId)
+	}
+	//FIXME: 当没有查找到sqlId对应的sql语句，则尝试使用sqlId直接操作数据库
+	//该设计可能需要设计一个更合理的方式
+	if !ok {
+		return &parsing.DynamicData{OriginData: sqlId}
+	}
+	return ret
 }

sqlrunner.go

@@ -13,7 +13,6 @@ import (
 	"github.com/xfali/gobatis/errors"
 	"github.com/xfali/gobatis/factory"
 	"github.com/xfali/gobatis/logging"
-	"github.com/xfali/gobatis/parsing"
 	"github.com/xfali/gobatis/parsing/sqlparser"
 	"github.com/xfali/gobatis/reflection"
 	"github.com/xfali/gobatis/session"
@@ -77,19 +76,6 @@ type DeleteRunner struct {
 	BaseRunner
 }
 
-func getSql(sqlId string) sqlparser.SqlParser {
-	ret, ok := FindDynamicSql(sqlId)
-	if !ok {
-		ret, ok = FindTemplateSql(sqlId)
-	}
-	//FIXME: 当没有查找到sqlId对应的sql语句，则尝试使用sqlId直接操作数据库
-	//该设计可能需要设计一个更合理的方式
-	if !ok {
-		return &parsing.DynamicData{OriginData: sqlId}
-	}
-	return ret
-}
-
 //使用一个session操作数据库
 func (this *SessionManager) NewSession() *Session {
 	return &Session{
@@ -129,19 +115,19 @@ func (this *Session) Tx(txFunc func(session *Session) error) {
 }
 
 func (this *Session) Select(sql string) Runner {
-	return this.createSelect(getSql(sql))
+	return this.createSelect(FindSqlParser(sql))
 }
 
 func (this *Session) Update(sql string) Runner {
-	return this.createUpdate(getSql(sql))
+	return this.createUpdate(FindSqlParser(sql))
 }
 
 func (this *Session) Delete(sql string) Runner {
-	return this.createDelete(getSql(sql))
+	return this.createDelete(FindSqlParser(sql))
 }
 
 func (this *Session) Insert(sql string) Runner {
-	return this.createInsert(getSql(sql))
+	return this.createInsert(FindSqlParser(sql))
 }
 
 func (this *BaseRunner) Param(params ...interface{}) Runner {

test/postgresql/postgresql.xml

@@ -0,0 +1,48 @@
+<mapper namespace="test_package.TestTable">
+    <sql id="columns_id">id,username,password</sql>
+
+    <select id="selectTestTable">
+        SELECT <include refid="columns_id"> </include> FROM test_table
+        <where>
+            <if test="{TestTable.id} != nil and {TestTable.id} != 0">AND id = #{TestTable.id} </if>
+            <if test="{TestTable.username} != nil">AND username = #{TestTable.username} </if>
+            <if test="{TestTable.password} != nil">AND password = #{TestTable.password} </if>
+        </where>
+    </select>
+
+    <select id="selectTestTableCount">
+        SELECT COUNT(*) FROM test_table
+        <where>
+            <if test="{TestTable.id} != nil and {TestTable.id} != 0">AND id = #{TestTable.id} </if>
+            <if test="{TestTable.username} != nil">AND username = #{TestTable.username} </if>
+            <if test="{TestTable.password} != nil">AND password = #{TestTable.password} </if>
+        </where>
+    </select>
+
+    <insert id="insertTestTable">
+        INSERT INTO test_table (id,username,password)
+        VALUES(
+        #{TestTable.id},
+        #{TestTable.username},
+        #{TestTable.password}
+        )
+    </insert>
+
+    <update id="updateTestTable">
+        UPDATE test_table
+        <set>
+            <if test="{TestTable.username} != nil"> username = #{TestTable.username} </if>
+            <if test="{TestTable.password} != nil"> password = #{TestTable.password} </if>
+        </set>
+        WHERE id = #{TestTable.id}
+    </update>
+
+    <delete id="deleteTestTable">
+        DELETE FROM test_table
+        <where>
+            <if test="{TestTable.id} != nil and {TestTable.id} != 0">AND id = #{TestTable.id} </if>
+            <if test="{TestTable.username} != nil">AND username = #{TestTable.username} </if>
+            <if test="{TestTable.password} != nil">AND password = #{TestTable.password} </if>
+        </where>
+    </delete>
+</mapper>

test/postgresql/session_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 )
 
-func TestSession(t *testing.T) {
+func TestSessionTpl(t *testing.T) {
 	gobatis.RegisterTemplateFile("./postgresql.tpl")
 	var param = TestTable{Id: 1, Username: "user", Password: "pw"}
 	t.Run("select", func(t *testing.T) {
@@ -47,3 +47,41 @@ func TestSession(t *testing.T) {
 		t.Log(ret)
 	})
 }
+
+func TestSessionXml(t *testing.T) {
+	gobatis.RegisterMapperFile("./postgresql.xml")
+	var param = TestTable{Id: 1, Username: "user", Password: "pw"}
+	t.Run("select", func(t *testing.T) {
+		mgr := gobatis.NewSessionManager(connect())
+		sess := mgr.NewSession()
+		var ret []TestTable
+		sess.Select("selectTestTable").Param(param).Result(&ret)
+		t.Log(ret)
+	})
+
+	t.Run("insert", func(t *testing.T) {
+		mgr := gobatis.NewSessionManager(connect())
+		sess := mgr.NewSession()
+		var ret int
+		err := sess.Insert("insertTestTable").Param(param).Result(&ret)
+		t.Log(err)
+		t.Log(ret)
+	})
+
+	t.Run("update", func(t *testing.T) {
+		mgr := gobatis.NewSessionManager(connect())
+		sess := mgr.NewSession()
+		var ret int
+		err := sess.Update("updateTestTable").Param(TestTable{Id: 1, Username: "user2", Password: "pw2"}).Result(&ret)
+		t.Log(err)
+		t.Log(ret)
+	})
+
+	t.Run("delete", func(t *testing.T) {
+		mgr := gobatis.NewSessionManager(connect())
+		sess := mgr.NewSession()
+		var ret int
+		sess.Delete("deleteTestTable").Param(TestTable{Id: 1}).Result(&ret)
+		t.Log(ret)
+	})
+}