adapt to test server 0.1.0

Signed-off-by: Andre Furlan <[email protected]>

Author: andrefurlan-db

.github/workflows/go.yml

@@ -20,56 +20,24 @@ jobs:
         with:
           version: v1.48
 
-  integration:
+  build-and-test:
+    name: Test and Build
     permissions:
       contents: read
       packages: read
-    name: Integration Tests
     strategy:
       matrix:
         go-version: [1.19.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     services:
       test-server:
-        options: --user "appuser"
         credentials:
           username: ${{ github.repository }}
           password: ${{ secrets.GITHUB_TOKEN }}
-        image: ghcr.io/databricks/databricks/databricks-thrift-test-server:main
+        image: ghcr.io/databricks/databricks/databricks-thrift-test-server:0.1.0
         ports:
           - 8087:8087
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-
-      - name: Set up Go Toolchain
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ matrix.go-version }}
-
-      - name: Cache Go artifacts
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/go/pkg/mod
-            ~/.cache/go-build
-          key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-${{ matrix.go-version }}-
-
-
-      - name: run integration tests
-        run: make test-integration
-
-  build-and-test:
-    name: Test and Build
-    strategy:
-      matrix:
-        go-version: [1.19.x]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
@@ -103,10 +71,15 @@ jobs:
           fi
           go get -v -t -d ./...
 
+      - name: Build
+        run: make linux
+
       - name: Test
         run: make test
         env:
           CGO_ENABLED: 0
 
-      - name: Build
-        run: make linux
+      - name: run integration tests
+        run: make test-integration
+        env:
+          CGO_ENABLED: 0

connector.go

@@ -20,23 +20,19 @@ type connector struct {
 }
 
 func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {
-	var catalogName *cli_service.TIdentifier
-	var schemaName *cli_service.TIdentifier
+	var initialNamespace *cli_service.TNamespace
 	if c.cfg.Catalog != "" {
-		catalogName = cli_service.TIdentifierPtr(cli_service.TIdentifier(c.cfg.Catalog))
+		initialNamespace.CatalogName = cli_service.TIdentifierPtr(cli_service.TIdentifier(c.cfg.Catalog))
 	}
 	if c.cfg.Schema != "" {
-		schemaName = cli_service.TIdentifierPtr(cli_service.TIdentifier(c.cfg.Schema))
+		initialNamespace.SchemaName = cli_service.TIdentifierPtr(cli_service.TIdentifier(c.cfg.Schema))
 	}
 
 	// we need to ensure that open session will eventually end
 	session, err := c.client.OpenSession(ctx, &cli_service.TOpenSessionReq{
-		ClientProtocol: c.cfg.ThriftProtocolVersion,
-		Configuration:  make(map[string]string),
-		InitialNamespace: &cli_service.TNamespace{
-			CatalogName: catalogName,
-			SchemaName:  schemaName,
-		},
+		ClientProtocol:         c.cfg.ThriftProtocolVersion,
+		Configuration:          make(map[string]string),
+		InitialNamespace:       initialNamespace,
 		CanUseMultipleCatalogs: &c.cfg.CanUseMultipleCatalogs,
 	})
 

integration_tests/integration_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	dbsql "github.com/databricks/databricks-sql-go"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -16,14 +17,59 @@ func TestIntegrationPing(t *testing.T) {
 	connector, err := dbsql.NewConnector(
 		dbsql.WithServerHostname("localhost"),
 		dbsql.WithPort(8087),
+		dbsql.WithHTTPPath("session"), //test case name
+		dbsql.WithMaxRows(100),
 	)
 	require.NoError(t, err)
 	db := sql.OpenDB(connector)
 	defer db.Close()
 
-	t.Run("it can ping", func(t *testing.T) {
-		if err := db.PingContext(context.Background()); err != nil {
-			require.NoError(t, err)
+	t.Run("it can query multiple result pages", func(t *testing.T) {
+		rows, err1 := db.QueryContext(context.Background(), `select * from default.diamonds limit 250`)
+		require.Nil(t, err1)
+		require.NotNil(t, rows)
+		defer rows.Close()
+		type row struct {
+			_c0     int
+			carat   float64
+			cut     string
+			color   string
+			clarity string
+			depth   sql.NullFloat64
+			table   sql.NullFloat64
+			price   int
+			x       float64
+			y       float64
+			z       float64
 		}
+		expectedColumnNames := []string{"_c0", "carat", "cut", "color", "clarity", "depth", "table", "price", "x", "y", "z"}
+		expectedDatabaseType := []string{"INT", "DOUBLE", "STRING", "STRING", "STRING", "DOUBLE", "DOUBLE", "INT", "DOUBLE", "DOUBLE", "DOUBLE"}
+		expectedNullable := []bool{false, false, false, false, false, false, false, false, false, false, false}
+
+		cols, err := rows.Columns()
+		require.NoError(t, err)
+		require.Equal(t, expectedColumnNames, cols)
+
+		types, err := rows.ColumnTypes()
+		require.NoError(t, err)
+
+		for i, v := range types {
+			assert.Equal(t, expectedColumnNames[i], v.Name())
+			assert.Equal(t, expectedDatabaseType[i], v.DatabaseTypeName())
+			nullable, ok := v.Nullable()
+			assert.False(t, ok)
+			assert.Equal(t, expectedNullable[i], nullable)
+		}
+		var allrows []row
+		for rows.Next() {
+			// After row 10 this will cause one fetch call, as 10 rows (maxRows config) will come from the first execute statement call.
+			r := row{}
+			err := rows.Scan(&r._c0, &r.carat, &r.cut, &r.color, &r.clarity, &r.depth, &r.table, &r.price, &r.x, &r.y, &r.z)
+			assert.Nil(t, err)
+			allrows = append(allrows, r)
+		}
+		assert.Equal(t, 250, len(allrows))
+		assert.Nil(t, rows.Err())
+
 	})
 }