Skip to content

Commit 30bcd20

Browse files
craig[bot]mohitsethia
andcommitted
Merge #144180
144180: fix: ttl job description doesnot quote key column r=rafiss a=mohitsethia fixes: #142986 Co-authored-by: Mohit Sethia <[email protected]>
2 parents 89e3036 + 795db86 commit 30bcd20

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pkg/sql/ttl/ttlschedule/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ go_library(
1717
"//pkg/sql/catalog/catpb",
1818
"//pkg/sql/catalog/descs",
1919
"//pkg/sql/isql",
20+
"//pkg/sql/lexbase",
2021
"//pkg/sql/pgwire/pgcode",
2122
"//pkg/sql/pgwire/pgerror",
2223
"//pkg/sql/sem/tree",

pkg/sql/ttl/ttlschedule/ttlschedule.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package ttlschedule
77

88
import (
9+
"bytes"
910
"context"
1011
"fmt"
1112

@@ -20,6 +21,7 @@ import (
2021
"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
2122
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descs"
2223
"github.com/cockroachdb/cockroach/pkg/sql/isql"
24+
"github.com/cockroachdb/cockroach/pkg/sql/lexbase"
2325
"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
2426
"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
2527
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
@@ -222,7 +224,13 @@ func makeTTLJobDescription(
222224
) string {
223225
relationName := tn.FQString()
224226
pkIndex := tableDesc.GetPrimaryIndex().IndexDesc()
225-
pkColNames := pkIndex.KeyColumnNames
227+
pkColNames := make([]string, 0, len(pkIndex.KeyColumnNames))
228+
var buf bytes.Buffer
229+
for _, name := range pkIndex.KeyColumnNames {
230+
lexbase.EncodeRestrictedSQLIdent(&buf, name, lexbase.EncNoFlags)
231+
pkColNames = append(pkColNames, buf.String())
232+
buf.Reset()
233+
}
226234
pkColDirs := pkIndex.KeyColumnDirections
227235
rowLevelTTL := tableDesc.GetRowLevelTTL()
228236
ttlExpirationExpr := rowLevelTTL.GetTTLExpr()

0 commit comments

Comments
 (0)