Skip to content

Commit

Permalink
Merge pull request cockroachdb#99308 from cockroachdb/blathers/backpo…
Browse files Browse the repository at this point in the history
…rt-release-22.1-99231

release-22.1: sql: fix partitioned table format in statement bundle schema.sql
  • Loading branch information
mgartner authored Apr 17, 2023
2 parents 0dfb657 + c29ae83 commit 20d13d9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/sql/delegate/show_table.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ SELECT
WHEN NOT has_partitions
THEN NULL
ELSE
e'\n-- Warning: Partitioned table with no zone configurations.'
e'\n-- Warning: Partitioned table with no zone configurations.\n'
END
) AS create_statement
FROM
Expand Down
3 changes: 2 additions & 1 deletion pkg/sql/partition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ func TestRemovePartitioningOSS(t *testing.T) {
) PARTITION BY RANGE (k) (
PARTITION p1 VALUES FROM (1) TO (2)
)
-- Warning: Partitioned table with no zone configurations.`
-- Warning: Partitioned table with no zone configurations.
`
if a := sqlDB.QueryStr(t, "SHOW CREATE t.kv")[0][1]; exp != a {
t.Fatalf("expected:\n%s\n\ngot:\n%s\n\n", exp, a)
}
Expand Down

0 comments on commit 20d13d9

Please sign in to comment.