chore: improve code lines (#28)

Co-authored-by: Rick <[email protected]>

Author: LinuxSuRen

e2e/compose.yaml

@@ -40,9 +40,16 @@ services:
       interval: 3s
       timeout: 60s
       retries: 10
-      start_period: 3s
     ports:
       - "3306:3306"
 
+  tdengine:
+    image: tdengine/tdengine:3.3.5.8
+    environment:
+      TAOS_ROOT_PASSWORD: "root"
+    ports:
+      - "6030:6030"       # REST API port
+      - "6031:6031"       # client port
+      - "6041:6041"       # cluster port
 volumes:
   cache:

pkg/server.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2023-2024 API Testing Authors.
+Copyright 2023-2025 API Testing Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -55,6 +55,9 @@ func createDB(user, password, address, database, driver string) (db *gorm.DB, er
 	var dsn string
 	switch driver {
 	case "mysql", "":
+		if !strings.Contains(address, ":") {
+			address = fmt.Sprintf("%s:%d", address, 3306)
+		}
 		dsn = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true", user, password, address, database)
 		dialector = mysql.Open(dsn)
 	case "sqlite":
@@ -93,8 +96,8 @@ func createDB(user, password, address, database, driver string) (db *gorm.DB, er
 	return
 }
 
-var dbCache map[string]*gorm.DB = make(map[string]*gorm.DB)
-var dbNameCache map[string]string = make(map[string]string)
+var dbCache = make(map[string]*gorm.DB)
+var dbNameCache = make(map[string]string)
 
 func (s *dbserver) getClientWithDatabase(ctx context.Context, dbName string) (db *gorm.DB, err error) {
 	store := remote.GetStoreFromContext(ctx)
@@ -191,19 +194,6 @@ func (s *dbserver) GetTestSuite(ctx context.Context, suite *remote.TestSuite) (r
 	return
 }
 
-func (s *dbserver) GetHistoryTestSuite(ctx context.Context, suite *remote.HistoryTestSuite) (reply *remote.HistoryTestSuite, err error) {
-	query := &HistoryTestResult{}
-	var db *gorm.DB
-	if db, err = s.getClient(ctx); err != nil {
-		return
-	}
-
-	if err = db.Find(&query, nameQuery, suite.HistorySuiteName).Error; err == nil {
-		reply = ConvertToGRPCHistoryTestSuite(query)
-	}
-	return
-}
-
 func (s *dbserver) UpdateTestSuite(ctx context.Context, suite *remote.TestSuite) (reply *remote.TestSuite, err error) {
 	reply = &remote.TestSuite{}
 	input := ConvertToDBTestSuite(suite)

pkg/server_test.go

@@ -323,3 +323,18 @@ func TestSQLite(t *testing.T) {
 		assert.NoError(t, err)
 	})
 }
+
+func TestTdEngine(t *testing.T) {
+	remoteServer := NewRemoteServer(10)
+	assert.NotNil(t, remoteServer)
+	defaultCtx := remote.WithIncomingStoreContext(context.TODO(), &atest.Store{
+		URL:      "127.0.0.1:6041",
+		Username: "root",
+		Password: "taosdata",
+		Properties: map[string]string{
+			"driver": "tdengine",
+		},
+	})
+	_, err := remoteServer.Query(defaultCtx, &server.DataQuery{})
+	assert.Error(t, err)
+}