chore: return columns order info (#35)

* chore: return columns order info

* upgrade ubuntu from 20.04 to 22.04

---------

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

Author: LinuxSuRen

.github/workflows/build.yaml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   Test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -24,7 +24,7 @@ jobs:
           bash <(curl -Ls https://coverage.codacy.com/get.sh) final
 
   Build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -38,14 +38,14 @@ jobs:
           args: release --clean --snapshot
 
   BuildImage:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/[email protected]
       - name: Image
         run: make build-image
 
   RunE2E:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/[email protected]
       - name: Run e2e

.github/workflows/release-drafter.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   UpdateReleaseDraft:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         env:

.github/workflows/release.yaml

@@ -15,7 +15,7 @@ env:
 
 jobs:
   Test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -34,7 +34,7 @@ jobs:
           bash <(curl -Ls https://coverage.codacy.com/get.sh) final
 
   goreleaser:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: github.ref != 'refs/heads/master'
     steps:
       - name: Checkout
@@ -70,7 +70,7 @@ jobs:
           oras push ${{ env.REGISTRY_ALIYUN }}/linuxsuren/atest-ext-store-orm:${TAG#v} */*
 
   image:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/[email protected]

pkg/data_query.go

@@ -18,6 +18,7 @@ package pkg
 import (
 	"context"
 	"database/sql"
+	"encoding/json"
 	"fmt"
 	"log"
 	"reflect"
@@ -80,7 +81,7 @@ func (s *dbserver) Query(ctx context.Context, query *server.DataQuery) (result *
 
 	wg.Add(1)
 	go func() {
-		wg.Done()
+		defer wg.Done()
 		result.Meta.Labels = dbQuery.GetLabels(ctx, query.Sql)
 		result.Meta.Labels = append(result.Meta.Labels, &server.Pair{
 			Key:   "_native_sql",
@@ -93,6 +94,9 @@ func (s *dbserver) Query(ctx context.Context, query *server.DataQuery) (result *
 	if dataResult, err = sqlQuery(ctx, query.Sql, db); err == nil {
 		result.Items = dataResult.Items
 		result.Meta.Duration = time.Since(now).String()
+
+		wg.Wait()
+		result.Meta.Labels = append(result.Meta.Labels, dataResult.Meta.Labels...)
 	}
 	return
 }
@@ -128,6 +132,13 @@ func sqlQuery(ctx context.Context, sql string, db *gorm.DB) (result *server.Data
 		return
 	}
 
+	if columnsData, colsErr := json.Marshal(columns); colsErr == nil {
+		result.Meta.Labels = append(result.Meta.Labels, &server.Pair{
+			Key:   "_columns",
+			Value: string(columnsData),
+		})
+	}
+
 	for rows.Next() {
 		// Create a slice of interface{}'s to represent each column,
 		// and a second slice to contain pointers to each item in the columns slice.