Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sql: add array of JSON type to pre-constructed types #75550

Merged
merged 1 commit into from
Jan 26, 2022
Merged

sql: add array of JSON type to pre-constructed types #75550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/generated/sql/functions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,9 @@
</span></td></tr>
<tr><td><a name="cardinality"></a><code>cardinality(input: anyelement[]) &rarr; <a href="int.html">int</a></code></td><td><span class="funcdesc"><p>Calculates the number of elements contained in <code>input</code></p>
</span></td></tr>
<tr><td><a name="crdb_internal.merge_statement_stats"></a><code>crdb_internal.merge_statement_stats(input: anyelement[]) &rarr; jsonb</code></td><td><span class="funcdesc"><p>Merge an array of roachpb.StatementStatistics into a single JSONB object</p>
<tr><td><a name="crdb_internal.merge_statement_stats"></a><code>crdb_internal.merge_statement_stats(input: jsonb[]) &rarr; jsonb</code></td><td><span class="funcdesc"><p>Merge an array of roachpb.StatementStatistics into a single JSONB object</p>
</span></td></tr>
<tr><td><a name="crdb_internal.merge_transaction_stats"></a><code>crdb_internal.merge_transaction_stats(input: anyelement[]) &rarr; jsonb</code></td><td><span class="funcdesc"><p>Merge an array of roachpb.TransactionStatistics into a single JSONB object</p>
<tr><td><a name="crdb_internal.merge_transaction_stats"></a><code>crdb_internal.merge_transaction_stats(input: jsonb[]) &rarr; jsonb</code></td><td><span class="funcdesc"><p>Merge an array of roachpb.TransactionStatistics into a single JSONB object</p>
</span></td></tr>
<tr><td><a name="string_to_array"></a><code>string_to_array(str: <a href="string.html">string</a>, delimiter: <a href="string.html">string</a>) &rarr; <a href="string.html">string</a>[]</code></td><td><span class="funcdesc"><p>Split a string into components on a delimiter.</p>
</span></td></tr>
Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/sem/builtins/builtins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4079,7 +4079,7 @@ value if you rely on the HLC for accuracy.`,
),
"crdb_internal.merge_statement_stats": makeBuiltin(arrayProps(),
tree.Overload{
Types: tree.ArgTypes{{"input", types.AnyArray}},
Types: tree.ArgTypes{{"input", types.JSONArray}},
ReturnType: tree.FixedReturnType(types.Jsonb),
Fn: func(_ *tree.EvalContext, args tree.Datums) (tree.Datum, error) {
arr := tree.MustBeDArray(args[0])
Expand Down Expand Up @@ -4107,7 +4107,7 @@ value if you rely on the HLC for accuracy.`,
),
"crdb_internal.merge_transaction_stats": makeBuiltin(arrayProps(),
tree.Overload{
Types: tree.ArgTypes{{"input", types.AnyArray}},
Types: tree.ArgTypes{{"input", types.JSONArray}},
ReturnType: tree.FixedReturnType(types.Jsonb),
Fn: func(_ *tree.EvalContext, args tree.Datums) (tree.Datum, error) {
arr := tree.MustBeDArray(args[0])
Expand Down
4 changes: 4 additions & 0 deletions pkg/sql/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,10 @@ var (
AnyEnumArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: AnyEnum, Oid: oid.T_anyarray, Locale: &emptyLocale}}

// JSONArray is the type of an array value having JSON-typed elements.
JSONArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: Jsonb, Oid: oid.T__jsonb, Locale: &emptyLocale}}

// Int2Vector is a type-alias for an array of Int2 values with a different
// OID (T_int2vector instead of T__int2). It is a special VECTOR type used
// by Postgres in system tables. Int2vectors are 0-indexed, unlike normal arrays.
Expand Down