Skip to content

Commit

Permalink
sql: replace references to cockroachdb#8318 by cockroachdb#27792
Browse files Browse the repository at this point in the history
Release note: None
  • Loading branch information
knz committed Nov 22, 2018
1 parent 96f03c9 commit 80bd022
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions pkg/sql/parser/parse_test.go
Expand Up @@ -2675,7 +2675,7 @@ func TestUnimplementedSyntax(t *testing.T) {
{`CREATE INDEX a ON b(c[d])`, 9682, ``},
{`CREATE INDEX a ON b(foo(c))`, 9682, ``},

{`INSERT INTO foo(a, a.b) VALUES (1,2)`, 8318, ``},
{`INSERT INTO foo(a, a.b) VALUES (1,2)`, 27792, ``},
{`INSERT INTO foo VALUES (1,2) ON CONFLICT ON CONSTRAINT a DO NOTHING`, 0, `on conflict on constraint`},

{`SELECT * FROM ab, LATERAL (SELECT * FROM kv)`, 24560, `select`},
Expand Down Expand Up @@ -2722,12 +2722,12 @@ func TestUnimplementedSyntax(t *testing.T) {

{`WITH RECURSIVE a AS (TABLE b) SELECT c`, 21085, ``},

{`UPDATE foo SET (a, a.b) = (1, 2)`, 8318, ``},
{`UPDATE foo SET a.b = 1`, 8318, ``},
{`UPDATE foo SET (a, a.b) = (1, 2)`, 27792, ``},
{`UPDATE foo SET a.b = 1`, 27792, ``},
{`UPDATE foo SET x = y FROM a, b`, 7841, ``},
{`UPDATE Foo SET x.y = z`, 8318, ``},
{`UPDATE Foo SET x.y = z`, 27792, ``},

{`UPSERT INTO foo(a, a.b) VALUES (1,2)`, 8318, ``},
{`UPSERT INTO foo(a, a.b) VALUES (1,2)`, 27792, ``},
}
for _, d := range testData {
_, err := parser.Parse(d.sql)
Expand Down
8 changes: 4 additions & 4 deletions pkg/sql/parser/sql.y
Expand Up @@ -5312,10 +5312,10 @@ insert_column_list:
// position. The rule below can be extended to support a sequence of
// field subscript or array indexing operators to designate a part of
// a field, when partial updates are to be supported. This likely will
// be needed together with support for compound types (#8318).
// be needed together with support for composite types (#27792).
insert_column_item:
column_name
| column_name '.' error { return unimplementedWithIssue(sqllex, 8318) }
| column_name '.' error { return unimplementedWithIssue(sqllex, 27792) }
on_conflict:
ON CONFLICT opt_conf_expr DO UPDATE SET set_clause_list where_clause
Expand Down Expand Up @@ -5407,7 +5407,7 @@ single_set_clause:
{
$$.val = &tree.UpdateExpr{Names: tree.NameList{tree.Name($1)}, Expr: $3.expr()}
}
| column_name '.' error { return unimplementedWithIssue(sqllex, 8318) }
| column_name '.' error { return unimplementedWithIssue(sqllex, 27792) }
multiple_set_clause:
'(' insert_column_list ')' '=' in_expr
Expand Down Expand Up @@ -7397,7 +7397,7 @@ c_expr:
// Currently we support array indexing (see c_expr above).
//
// TODO(knz/jordan): this is the rule that can be extended to support
// compound types (#8318) with e.g.:
// composite types (#27792) with e.g.:
//
// | '(' a_expr ')' field_access_ops
//
Expand Down

0 comments on commit 80bd022

Please sign in to comment.