v1.8.13

Author: stfnmllr

RELEASENOTES.md

@@ -5,6 +5,10 @@ Release Notes
 
 ### Minor revisions
 
+#### v1.8.13
+- updated dependencies
+- source code cleanups
+
 #### v1.8.12
 - updated dependencies
 

driver/connection.go

@@ -22,6 +22,7 @@ import (
 	"github.com/SAP/go-hdb/driver/dial"
 	p "github.com/SAP/go-hdb/driver/internal/protocol"
 	"github.com/SAP/go-hdb/driver/internal/protocol/auth"
+	"github.com/SAP/go-hdb/driver/internal/protocol/encoding"
 	hdbreflect "github.com/SAP/go-hdb/driver/internal/reflect"
 	"github.com/SAP/go-hdb/driver/unicode/cesu8"
 	"golang.org/x/text/transform"
@@ -195,10 +196,10 @@ type conn struct {
 
 	serverOptions *p.ConnectOptions
 	hdbVersion    *Version
-	fieldTypeCtx  *p.FieldTypeCtx
 
-	pr *p.Reader
-	pw *p.Writer
+	dec *encoding.Decoder
+	pr  *p.Reader
+	pw  *p.Writer
 }
 
 // isAuthError returns true in case of X509 certificate validation errrors or hdb authentication errors, else otherwise.
@@ -301,14 +302,18 @@ func newConn(ctx context.Context, host string, metrics *metrics, attrs *connAttr
 
 	protTrace := protTrace.Load()
 
+	enc := encoding.NewEncoder(rw.Writer, attrs._cesu8Encoder)
+	dec := encoding.NewDecoder(rw.Reader, attrs._cesu8Decoder)
+
 	c := &conn{
 		attrs:     attrs,
 		collector: collector,
 		dbConn:    dbConn,
 		sqlTrace:  sqlTrace.Load(),
 		logger:    logger,
-		pw:        p.NewWriter(rw.Writer, protTrace, logger, attrs._cesu8Encoder, attrs._sessionVariables), // write upstream
-		pr:        p.NewDBReader(rw.Reader, protTrace, logger, attrs._cesu8Decoder),                        // read downstream
+		dec:       dec,
+		pw:        p.NewWriter(rw.Writer, enc, protTrace, logger, attrs._cesu8Encoder, attrs._sessionVariables), // write upstream
+		pr:        p.NewDBReader(dec, protTrace, logger),                                                        // read downstream
 		sessionID: defaultSessionID,
 	}
 
@@ -367,7 +372,8 @@ func (c *conn) initSession(ctx context.Context, attrs *connAttrs, authHnd *p.Aut
 	}
 
 	c.hdbVersion = parseVersion(c.versionString())
-	c.fieldTypeCtx = p.NewFieldTypeCtx(c.serverOptions.DataFormatVersion2OrZero(), attrs._emptyDateAsNull)
+	c.dec.SetAlphanumDfv1(c.serverOptions.DataFormatVersion2OrZero() == p.DfvLevel1)
+	c.dec.SetEmptyDateAsNull(attrs._emptyDateAsNull)
 
 	if attrs._defaultSchema != "" {
 		if _, err := c.ExecContext(ctx, strings.Join([]string{setDefaultSchema, Identifier(attrs._defaultSchema).String()}, " "), nil); err != nil {
@@ -812,7 +818,7 @@ func (c *conn) queryDirect(ctx context.Context, query string, commit bool) (driv
 	}
 
 	qr := &queryResult{conn: c}
-	meta := &p.ResultMetadata{FieldTypeCtx: c.fieldTypeCtx}
+	meta := &p.ResultMetadata{}
 	resSet := &p.Resultset{}
 
 	if err := c.pr.IterateParts(ctx, func(kind p.PartKind, attrs p.PartAttributes, read func(part p.Part)) {
@@ -869,8 +875,8 @@ func (c *conn) prepare(ctx context.Context, query string) (*prepareResult, error
 	}
 
 	pr := &prepareResult{}
-	resMeta := &p.ResultMetadata{FieldTypeCtx: c.fieldTypeCtx}
-	prmMeta := &p.ParameterMetadata{FieldTypeCtx: c.fieldTypeCtx}
+	resMeta := &p.ResultMetadata{}
+	prmMeta := &p.ParameterMetadata{}
 
 	if err := c.pr.IterateParts(ctx, func(kind p.PartKind, attrs p.PartAttributes, read func(part p.Part)) {
 		switch kind {
@@ -986,7 +992,7 @@ func (c *conn) execCall(ctx context.Context, outputFields []*p.ParameterField) (
 	rows := &p.RowsAffected{}
 	var ids []p.LocatorID
 	outPrms := &p.OutputParameters{}
-	meta := &p.ResultMetadata{FieldTypeCtx: c.fieldTypeCtx}
+	meta := &p.ResultMetadata{}
 	resSet := &p.Resultset{}
 	lobReply := &p.WriteLobReply{}
 	var numRow int64

driver/datatype_test.go

@@ -51,7 +51,7 @@ func (dtt *dttNeg) insert(t *testing.T, db *sql.DB, tableName Identifier) {
 		if _, err := stmt.Exec(in, i); err == nil { // error expected
 			t.Fatalf("type: %s - %d - error expected", dtt._columnType.TypeName(), i)
 		} else {
-			t.Logf("type: %s - %d - %s - %T", dtt._columnType.TypeName(), i, err, err)
+			t.Logf("type: %[1]s - %[2]d - %[3]T - %[3]s", dtt._columnType.TypeName(), i, err)
 		}
 	}
 }

driver/driver.go

@@ -10,7 +10,7 @@ import (
 )
 
 // DriverVersion is the version number of the hdb driver.
-const DriverVersion = "1.8.12"
+const DriverVersion = "1.8.13"
 
 // DriverName is the driver name to use with sql.Open for hdb databases.
 const DriverName = "hdb"

driver/internal/protocol/auth/auth.go

@@ -9,7 +9,6 @@ import (
 	"slices"
 
 	"github.com/SAP/go-hdb/driver/internal/protocol/encoding"
-	"github.com/SAP/go-hdb/driver/unicode/cesu8"
 )
 
 /*
@@ -175,10 +174,8 @@ func (p *Prms) Size() int {
 	size := encoding.SmallintFieldSize // no of parameters (2 bytes)
 	for _, e := range p.prms {
 		switch e := e.(type) {
-		case []byte:
-			size += encoding.VarFieldSize(len(e))
-		case string:
-			size += encoding.VarFieldSize(cesu8.StringSize(e))
+		case []byte, string:
+			size += encoding.VarFieldSize(e)
 		case *Prms:
 			subSize := subPrmsSize(e.Size())
 			size += (int(subSize) + subSize.fieldSize())