fix docker-compose up sql run error

common/utils.go

@@ -12,7 +12,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"time"
 
@@ -80,10 +79,13 @@ func MustGetwd() string {
 	return wd
 }
 
-// GetCallerCodeDir 获取调用该函数的caller源代码的目录，主要用于测试时，查找相关文件
+// GetSqlDir 获取调用该函数的caller源代码的目录，主要用于测试时，查找相关文件
-func GetCallerCodeDir() string {
+func GetSqlDir() string {
-	_, file, _, _ := runtime.Caller(1)
+	wd := MustGetwd()
-	return filepath.Dir(file)
+	if filepath.Base(wd) == "test" {
+		wd = filepath.Dir(wd) + "/sqls"
+	}
+	return wd
 }
 
 func RecoverPanic(err *error) {

common/utils_test.go

@@ -42,7 +42,7 @@ func TestFuncs(t *testing.T) {
 	wd := MustGetwd()
 	assert.NotEqual(t, "", wd)
 
-	dir1 := GetCallerCodeDir()
+	dir1 := GetSqlDir()
 	assert.Equal(t, true, strings.HasSuffix(dir1, "common"))
 
 }

dtmsvr/storage/sql.go

@@ -16,12 +16,14 @@ type SqlStore struct {
 }
 
 func (s *SqlStore) Ping() error {
-	dbr := dbGet().Exec("select 1")
+	db, err := dtmimp.StandaloneDB(config.Store.GetDBConf())
-	return dbr.Error
+	dtmimp.E2P(err)
+	_, err = db.Exec("select 1")
+	return err
 }
 
 func (s *SqlStore) PopulateData(skipDrop bool) {
-	file := fmt.Sprintf("%s/storage.%s.sql", common.GetCallerCodeDir(), config.Store.Driver)
+	file := fmt.Sprintf("%s/dtmsvr.storage.%s.sql", common.GetSqlDir(), config.Store.Driver)
 	common.RunSQLScript(config.Store.GetDBConf(), file, skipDrop)
 }
 

examples/data.go

@@ -34,9 +34,9 @@ func resetXaData() {
 // PopulateDB populate example mysql data
 func PopulateDB(skipDrop bool) {
 	resetXaData()
-	file := fmt.Sprintf("%s/examples.%s.sql", common.GetCallerCodeDir(), config.ExamplesDB.Driver)
+	file := fmt.Sprintf("%s/examples.%s.sql", common.GetSqlDir(), config.ExamplesDB.Driver)
 	common.RunSQLScript(config.ExamplesDB, file, skipDrop)
-	file = fmt.Sprintf("%s/../dtmcli/barrier.%s.sql", common.GetCallerCodeDir(), config.ExamplesDB.Driver)
+	file = fmt.Sprintf("%s/dtmcli.barrier.%s.sql", common.GetSqlDir(), config.ExamplesDB.Driver)
 	common.RunSQLScript(config.ExamplesDB, file, skipDrop)
 }
 

helper/Dockerfile-release

@@ -10,6 +10,7 @@ RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-s -w" ap
 
 FROM --platform=$TARGETPLATFORM alpine:3.14
 COPY --from=builder /app/dtm/main /app/dtm/
+COPY --from=builder /app/dtm/sqls/*.sql /app/dtm/sqls/
 ENV IS_DOCKER=1
 WORKDIR /app/dtm
 CMD ["/app/dtm/main", "dtmsvr"]

helper/compose.store.yml

@@ -14,6 +14,17 @@ services:
       ]
     ports:
       - '3306:3306'
+  postgres:
+    image: 'postgres:13'
+    command: postgres --max_prepared_transactions=1000
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+    environment:
+      POSTGRES_PASSWORD: mysecretpassword
+
+    ports:
+      - '5432:5432'
   redis:
     image: 'redis'
     volumes: