support ordinal parameters

Author: mashiike

conn.go

@@ -53,16 +53,8 @@ func (conn *redshiftDataConn) Begin() (driver.Tx, error) {
 
 func (conn *redshiftDataConn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
 	params := &redshiftdata.ExecuteStatementInput{
-		Sql: nullif(query),
-	}
-	if len(args) > 0 {
-		params.Parameters = make([]types.SqlParameter, 0, len(args))
-		for _, arg := range args {
-			params.Parameters = append(params.Parameters, types.SqlParameter{
-				Name:  aws.String(arg.Name),
-				Value: aws.String(fmt.Sprintf("%v", arg.Value)),
-			})
-		}
+		Sql:        nullif(query),
+		Parameters: convertArgsToParameters(args),
 	}
 	p, output, err := conn.executeStatement(ctx, params)
 	if err != nil {
@@ -74,16 +66,8 @@ func (conn *redshiftDataConn) QueryContext(ctx context.Context, query string, ar
 
 func (conn *redshiftDataConn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
 	params := &redshiftdata.ExecuteStatementInput{
-		Sql: nullif(query),
-	}
-	if len(args) > 0 {
-		params.Parameters = make([]types.SqlParameter, 0, len(args))
-		for _, arg := range args {
-			params.Parameters = append(params.Parameters, types.SqlParameter{
-				Name:  aws.String(arg.Name),
-				Value: aws.String(fmt.Sprintf("%v", arg.Value)),
-			})
-		}
+		Sql:        nullif(query),
+		Parameters: convertArgsToParameters(args),
 	}
 	_, output, err := conn.executeStatement(ctx, params)
 	if err != nil {
@@ -92,6 +76,20 @@ func (conn *redshiftDataConn) ExecContext(ctx context.Context, query string, arg
 	return newResult(output), nil
 }
 
+func convertArgsToParameters(args []driver.NamedValue) []types.SqlParameter {
+	if len(args) == 0 {
+		return nil
+	}
+	params := make([]types.SqlParameter, 0, len(args))
+	for _, arg := range args {
+		params = append(params, types.SqlParameter{
+			Name:  aws.String(coalesce(nullif(arg.Name), aws.String(fmt.Sprintf("%d", arg.Ordinal)))),
+			Value: aws.String(fmt.Sprintf("%v", arg.Value)),
+		})
+	}
+	return params
+}
+
 func (conn *redshiftDataConn) executeStatement(ctx context.Context, params *redshiftdata.ExecuteStatementInput) (*redshiftdata.GetStatementResultPaginator, *redshiftdata.DescribeStatementOutput, error) {
 	debugLogger.Printf("query: %s", coalesce(params.Sql))
 	params.ClusterIdentifier = conn.cfg.ClusterIdentifier

driver_test.go

@@ -98,6 +98,25 @@ func TestTimestampQuery(t *testing.T) {
 	})
 }
 
+func TestOrdinalParameterQuery(t *testing.T) {
+	runTestsWithDB(t, dsn, func(t *testing.T, db *sql.DB) {
+		restore := requireNoErrorLog(t)
+		defer restore()
+		query := `SELECT usesysid, usename FROM pg_user WHERE usename = :1`
+		rows, err := db.QueryContext(context.Background(), query, "rdsdb")
+		require.NoError(t, err)
+		defer func() {
+			require.NoError(t, rows.Close())
+		}()
+		require.True(t, rows.Next())
+		var userID int64
+		var userName string
+		require.NoError(t, rows.Scan(&userID, &userName))
+		require.Equal(t, int64(1), userID)
+		require.Equal(t, "rdsdb", userName)
+	})
+}
+
 func TestSimpleExec(t *testing.T) {
 	runTestsWithDB(t, dsn, func(t *testing.T, db *sql.DB) {
 		restore := requireNoErrorLog(t)

utils.go

@@ -7,9 +7,11 @@ func nullif(str string) *string {
 	return &str
 }
 
-func coalesce(str *string) string {
-	if str == nil {
-		return ""
+func coalesce(strs ...*string) string {
+	for _, str := range strs {
+		if str != nil {
+			return *str
+		}
 	}
-	return *str
+	return ""
 }