Skip to content

Commit 27d9a87

Browse files
committed
Fixed comments
Signed-off-by: nithinkdb <nithin.krishnamurthi@databricks.com>
1 parent 1f59d21 commit 27d9a87

3 files changed

Lines changed: 17 additions & 15 deletions

File tree

connection.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ func (c *conn) pollOperation(ctx context.Context, opHandle *cli_service.TOperati
394394

395395
func (c *conn) CheckNamedValue(nv *driver.NamedValue) error {
396396
var err error
397-
if dbsqlParam, ok := nv.Value.(DbSqlParam); ok {
397+
if dbsqlParam, ok := nv.Value.(DBSqlParam); ok {
398398
nv.Name = dbsqlParam.Name
399399
dbsqlParam.Value, err = driver.DefaultParameterConverter.ConvertValue(dbsqlParam.Value)
400400
return err

parameter_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@ import (
1212

1313
func TestParameter_Inference(t *testing.T) {
1414
t.Run("Should infer types correctly", func(t *testing.T) {
15-
values := [5]driver.NamedValue{{Name: "", Value: float32(5.1)}, {Name: "", Value: time.Now()}, {Name: "", Value: int64(5)}, {Name: "", Value: true}, {Name: "", Value: DbSqlParam{Value: "6.2", Type: Decimal}}}
15+
values := [5]driver.NamedValue{{Name: "", Value: float32(5.1)}, {Name: "", Value: time.Now()}, {Name: "", Value: int64(5)}, {Name: "", Value: true}, {Name: "", Value: DBSqlParam{Value: "6.2", Type: Decimal}}}
1616
parameters := convertNamedValuesToSparkParams(values[:])
1717
assert.Equal(t, strconv.FormatFloat(float64(5.1), 'f', -1, 64), *parameters[0].Value.StringValue)
1818
assert.NotNil(t, parameters[1].Value.StringValue)
1919
assert.Equal(t, string("TIMESTAMP"), *parameters[1].Type)
2020
assert.Equal(t, &cli_service.TSparkParameterValue{StringValue: strPtr("5")}, parameters[2].Value)
2121
assert.Equal(t, string("true"), *parameters[3].Value.StringValue)
22+
assert.Equal(t, string("DECIMAL"), *parameters[4].Type)
2223
assert.Equal(t, string("6.2"), *parameters[4].Value.StringValue)
2324
})
2425
}
2526
func TestParameters_Names(t *testing.T) {
2627
t.Run("Should infer types correctly", func(t *testing.T) {
27-
values := [2]driver.NamedValue{{Name: "1", Value: int(26)}, {Name: "2", Value: DbSqlParam{Type: Decimal, Value: "6.2"}}}
28+
values := [2]driver.NamedValue{{Name: "1", Value: int(26)}, {Name: "", Value: DBSqlParam{Name: "2", Type: Decimal, Value: "6.2"}}}
2829
parameters := convertNamedValuesToSparkParams(values[:])
2930
assert.Equal(t, string("1"), *parameters[0].Name)
3031
assert.Equal(t, cli_service.TSparkParameterValue{StringValue: strPtr("26")}, *parameters[0].Value)

parameters.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/databricks/databricks-sql-go/internal/cli_service"
1010
)
1111

12-
type DbSqlParam struct {
12+
type DBSqlParam struct {
1313
Name string
1414
Type SqlType
1515
Value any
@@ -25,9 +25,9 @@ const (
2525
Decimal
2626
Double
2727
Integer
28-
Bigint
29-
Smallint
30-
Tinyint
28+
BigInt
29+
SmallInt
30+
TinyInt
3131
Boolean
3232
IntervalMonth
3333
IntervalDay
@@ -49,11 +49,11 @@ func (s SqlType) String() string {
4949
return "DOUBLE"
5050
case Integer:
5151
return "INTEGER"
52-
case Bigint:
52+
case BigInt:
5353
return "BIGINT"
54-
case Smallint:
54+
case SmallInt:
5555
return "SMALLINT"
56-
case Tinyint:
56+
case TinyInt:
5757
return "TINYINT"
5858
case Boolean:
5959
return "BOOLEAN"
@@ -65,19 +65,19 @@ func (s SqlType) String() string {
6565
return "unknown"
6666
}
6767

68-
func valuesToDBSQLParams(namedValues []driver.NamedValue) []DbSqlParam {
69-
var params []DbSqlParam
68+
func valuesToDBSQLParams(namedValues []driver.NamedValue) []DBSqlParam {
69+
var params []DBSqlParam
7070
for i := range namedValues {
7171
namedValue := namedValues[i]
72-
param := *new(DbSqlParam)
72+
param := *new(DBSqlParam)
7373
param.Name = namedValue.Name
7474
param.Value = namedValue.Value
7575
params = append(params, param)
7676
}
7777
return params
7878
}
7979

80-
func inferTypes(params []DbSqlParam) {
80+
func inferTypes(params []DBSqlParam) {
8181
for i := range params {
8282
param := &params[i]
8383
switch value := param.Value.(type) {
@@ -123,7 +123,8 @@ func inferTypes(params []DbSqlParam) {
123123
case time.Time:
124124
param.Value = value.String()
125125
param.Type = Timestamp
126-
case DbSqlParam:
126+
case DBSqlParam:
127+
param.Name = value.Name
127128
param.Value = value.Value
128129
param.Type = value.Type
129130
default:

0 commit comments

Comments
 (0)