diff --git a/pkg/sql/backfill.go b/pkg/sql/backfill.go index 6eda5deddd32..90d3ac4bd66f 100644 --- a/pkg/sql/backfill.go +++ b/pkg/sql/backfill.go @@ -841,7 +841,7 @@ func (sc *SchemaChanger) validateInvertedIndexes( col := idx.ColumnNames[0] row, err := evalCtx.InternalExecutor.QueryRow(ctx, "verify-inverted-idx-count", txn, fmt.Sprintf( - `SELECT coalesce(sum_int(crdb_internal.json_num_index_entries(%s)), 0) FROM [%d AS t]`, + `SELECT coalesce(sum_int(crdb_internal.json_num_index_entries(%q)), 0) FROM [%d AS t]`, col, tableDesc.ID, ), ) diff --git a/pkg/sql/logictest/testdata/logic_test/inverted_index b/pkg/sql/logictest/testdata/logic_test/inverted_index index 1c9ecc4ab1fa..c563013a7157 100644 --- a/pkg/sql/logictest/testdata/logic_test/inverted_index +++ b/pkg/sql/logictest/testdata/logic_test/inverted_index @@ -28,9 +28,10 @@ statement ok CREATE TABLE c ( id INT PRIMARY KEY, foo JSON, - bar JSON, + "bAr" JSON, + "qUuX" JSON, INVERTED INDEX (foo), - INVERTED INDEX (bar) + INVERTED INDEX ("bAr") ) query TT @@ -39,13 +40,19 @@ SHOW CREATE TABLE c c CREATE TABLE c ( id INT8 NOT NULL, foo JSONB NULL, - bar JSONB NULL, + "bAr" JSONB NULL, + "qUuX" JSONB NULL, CONSTRAINT "primary" PRIMARY KEY (id ASC), INVERTED INDEX c_foo_idx (foo), - INVERTED INDEX c_bar_idx (bar), - FAMILY "primary" (id, foo, bar) + INVERTED INDEX "c_bAr_idx" ("bAr"), + FAMILY "primary" (id, foo, "bAr", "qUuX") ) +# Regression test for #42944: make sure that mixed-case columns can be +# inverted indexed. +statement ok +CREATE INVERTED INDEX ON c("qUuX") + statement error indexing more than one column with an inverted index is not supported CREATE TABLE d ( id INT PRIMARY KEY,