From 04e342bb36067349a6a52ad7c6d8fb5d167382d5 Mon Sep 17 00:00:00 2001
From: Philip Lykke Carlsen <plcplc@gmail.com>
Date: Mon, 22 Jan 2024 15:05:31 +0100
Subject: [PATCH] Support variables of array type (#263)

### What

This PR extends the support for query variables to include arrays.

### How

We need to go a bit out of our way to be able to translate JSON arrays
to Postgres arrays, since there is no single builtin function that does
this.

As an example taken from the tests, a variable of type
array-of-`organization` gets translated to the below SQL:

```
(
  SELECT
    array_agg(
      jsonb_populate_record(cast(null as organization), "%0_arr"."elem")
    ) AS "elem"
  FROM
    jsonb_array_elements(("%0_%variables_table"."%variables" -> $2)) AS "%0_arr"("elem")
)

```

Which, being a single-element set-returning expression, can feature both
in a `FROM` clause and in a select-list or other expression.

---------

Co-authored-by: Gil Mizrahi <gil@hasura.io>
---
 crates/query-engine/sql/src/sql/ast.rs        |   6 +
 crates/query-engine/sql/src/sql/convert.rs    |  20 +++
 .../src/translation/query/filtering.rs        |   1 +
 .../src/translation/query/native_queries.rs   |  10 ++
 .../src/translation/query/values.rs           | 132 +++++++++++++-----
 .../select_array_variable/request.json        |  27 ++++
 .../select_array_variable/tables.json         |  27 ++++
 .../request.json                              | 107 ++++++++++++++
 .../tables.json                               |  86 ++++++++++++
 .../tests__select_array_variable.snap         |  43 ++++++
 ...s__select_array_variable_nested_types.snap |  66 +++++++++
 .../query-engine/translation/tests/tests.rs   |  12 ++
 .../databases-tests/src/aurora/query_tests.rs |  12 ++
 ...y_tests__basic__select_array_variable.snap |  20 +++
 ...c__select_array_variable_nested_types.snap |  26 ++++
 .../databases-tests/src/citus/query_tests.rs  |  12 ++
 ...tests__explain__select_where_variable.snap |  13 +-
 ...y_tests__basic__select_array_variable.snap |  20 +++
 ...c__select_array_variable_nested_types.snap |  26 ++++
 ...schema_tests__schema_test__get_schema.snap | 108 ++++++++++++++
 .../src/cockroach/query_tests.rs              |  13 ++
 ...tests__explain__select_where_variable.snap |  13 +-
 ...y_tests__basic__select_array_variable.snap |  20 +++
 ...schema_tests__schema_test__get_schema.snap |  35 +++++
 .../src/postgres/query_tests.rs               |  12 ++
 ...in__native_queries__embedded_variable.snap |  45 +++---
 ...ts__explain__select_where_no_variable.snap |  13 +-
 ...tests__explain__select_where_variable.snap |  13 +-
 ...y_tests__basic__select_array_variable.snap |  20 +++
 ...c__select_array_variable_nested_types.snap |  26 ++++
 ...schema_tests__schema_test__get_schema.snap | 108 ++++++++++++++
 .../src/yugabyte/query_tests.rs               |  12 ++
 ...y_tests__basic__select_array_variable.snap |  20 +++
 ...c__select_array_variable_nested_types.snap |  26 ++++
 .../goldenfiles/select_array_variable.json    |  27 ++++
 .../select_array_variable_nested_types.json   | 107 ++++++++++++++
 .../v2-chinook-deployment-template.json       |  96 +++++++++++++
 static/citus/v2-chinook-deployment.json       |  96 +++++++++++++
 static/cockroach/v2-chinook-deployment.json   |  26 ++++
 static/composite-types-complex.sql            |  13 ++
 static/postgres/v2-chinook-deployment.json    |  96 +++++++++++++
 static/yugabyte/v2-chinook-deployment.json    |  96 +++++++++++++
 42 files changed, 1604 insertions(+), 103 deletions(-)
 create mode 100644 crates/query-engine/translation/tests/goldenfiles/select_array_variable/request.json
 create mode 100644 crates/query-engine/translation/tests/goldenfiles/select_array_variable/tables.json
 create mode 100644 crates/query-engine/translation/tests/goldenfiles/select_array_variable_nested_types/request.json
 create mode 100644 crates/query-engine/translation/tests/goldenfiles/select_array_variable_nested_types/tables.json
 create mode 100644 crates/query-engine/translation/tests/snapshots/tests__select_array_variable.snap
 create mode 100644 crates/query-engine/translation/tests/snapshots/tests__select_array_variable_nested_types.snap
 create mode 100644 crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__basic__select_array_variable.snap
 create mode 100644 crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__basic__select_array_variable_nested_types.snap
 create mode 100644 crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__basic__select_array_variable.snap
 create mode 100644 crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__basic__select_array_variable_nested_types.snap
 create mode 100644 crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__basic__select_array_variable.snap
 create mode 100644 crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__basic__select_array_variable.snap
 create mode 100644 crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__basic__select_array_variable_nested_types.snap
 create mode 100644 crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__basic__select_array_variable.snap
 create mode 100644 crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__basic__select_array_variable_nested_types.snap
 create mode 100644 crates/tests/tests-common/goldenfiles/select_array_variable.json
 create mode 100644 crates/tests/tests-common/goldenfiles/select_array_variable_nested_types.json

diff --git a/crates/query-engine/sql/src/sql/ast.rs b/crates/query-engine/sql/src/sql/ast.rs
index 6e45ecdf7..f28574ecb 100644
--- a/crates/query-engine/sql/src/sql/ast.rs
+++ b/crates/query-engine/sql/src/sql/ast.rs
@@ -103,6 +103,11 @@ pub enum From {
         alias: TableAlias,
         columns: Vec<(ColumnAlias, ScalarType)>,
     },
+    JsonbArrayElements {
+        expression: Expression,
+        alias: TableAlias,
+        column: ColumnAlias,
+    },
 }
 
 /// A JOIN clause
@@ -234,6 +239,7 @@ pub enum Expression {
     /// A COUNT clause
     Count(CountType),
     ArrayConstructor(Vec<Expression>),
+    CorrelatedSubSelect(Box<Select>),
 }
 
 /// An unary operator
diff --git a/crates/query-engine/sql/src/sql/convert.rs b/crates/query-engine/sql/src/sql/convert.rs
index 35eb2e45f..5f9a1af7c 100644
--- a/crates/query-engine/sql/src/sql/convert.rs
+++ b/crates/query-engine/sql/src/sql/convert.rs
@@ -222,6 +222,21 @@ impl From {
                 }
                 sql.append_syntax(")");
             }
+            From::JsonbArrayElements {
+                expression,
+                alias,
+                column,
+            } => {
+                sql.append_syntax("jsonb_array_elements");
+                sql.append_syntax("(");
+                expression.to_sql(sql);
+                sql.append_syntax(")");
+                sql.append_syntax(" AS ");
+                alias.to_sql(sql);
+                sql.append_syntax("(");
+                column.to_sql(sql);
+                sql.append_syntax(")");
+            }
         }
     }
 }
@@ -407,6 +422,11 @@ impl Expression {
                 }
                 sql.append_syntax("]");
             }
+            Expression::CorrelatedSubSelect(select) => {
+                sql.append_syntax("(");
+                select.to_sql(sql);
+                sql.append_syntax(")");
+            }
         }
     }
 }
diff --git a/crates/query-engine/translation/src/translation/query/filtering.rs b/crates/query-engine/translation/src/translation/query/filtering.rs
index 3f0c485e2..8f0b0437c 100644
--- a/crates/query-engine/translation/src/translation/query/filtering.rs
+++ b/crates/query-engine/translation/src/translation/query/filtering.rs
@@ -380,6 +380,7 @@ fn translate_comparison_value(
         )),
         models::ComparisonValue::Variable { name: var } => Ok((
             values::translate_variable(
+                state,
                 env.get_variables_table()?,
                 var.clone(),
                 &database::Type::ScalarType(typ.clone()),
diff --git a/crates/query-engine/translation/src/translation/query/native_queries.rs b/crates/query-engine/translation/src/translation/query/native_queries.rs
index 61ec18f02..c7d9f11ff 100644
--- a/crates/query-engine/translation/src/translation/query/native_queries.rs
+++ b/crates/query-engine/translation/src/translation/query/native_queries.rs
@@ -38,6 +38,16 @@ pub fn translate(env: &Env, state: State) -> Result<Vec<sql::ast::CommonTableExp
                             models::Argument::Variable { name } => match &variables_table {
                                 Err(err) => Err(err.clone()),
                                 Ok(variables_table) => Ok(values::translate_variable(
+                                    // We need a 'State' value when translating variables in order
+                                    // to be able to generate fresh names for bound relational
+                                    // expressions.
+                                    // However, we cannot readily re-use the 'state' argument we're
+                                    // given, since that is an "owned" value which is "moved" in
+                                    // the course of iterating over the native queries accumulated
+                                    // within.
+                                    // Ideally we should resolve this by tracking native queries
+                                    // separately from the fresh table name counter.
+                                    &mut State::new(),
                                     variables_table.clone(),
                                     name.clone(),
                                     &typ,
diff --git a/crates/query-engine/translation/src/translation/query/values.rs b/crates/query-engine/translation/src/translation/query/values.rs
index 38d168583..5d806ea3f 100644
--- a/crates/query-engine/translation/src/translation/query/values.rs
+++ b/crates/query-engine/translation/src/translation/query/values.rs
@@ -1,8 +1,8 @@
 //! Handle the translation of literal values.
 
-use crate::translation::error::Error;
+use crate::translation::{error::Error, helpers::State};
 use query_engine_metadata::metadata::database;
-use query_engine_sql::sql;
+use query_engine_sql::sql::{self, ast::ColumnReference, helpers::simple_select};
 use sql::ast::{Expression, Value};
 
 /// Convert a JSON value into a SQL value.
@@ -84,48 +84,108 @@ fn type_to_ast_scalar_type(typ: &database::Type) -> sql::ast::ScalarType {
 
 /// Convert a variable into a SQL value.
 pub fn translate_variable(
+    state: &mut State,
     variables_table: sql::ast::TableReference,
     variable: String,
     r#type: &database::Type,
 ) -> sql::ast::Expression {
-    let variables_reference =
-        Expression::ColumnReference(sql::ast::ColumnReference::AliasedColumn {
-            table: variables_table,
-            column: sql::helpers::make_column_alias(sql::helpers::VARIABLES_FIELD.to_string()),
-        });
+    let variables_reference = Expression::ColumnReference(ColumnReference::AliasedColumn {
+        table: variables_table,
+        column: sql::helpers::make_column_alias(sql::helpers::VARIABLES_FIELD.to_string()),
+    });
 
+    // We use the binop '->' to project (as jsonb) the value of a variable from the data column of
+    // the variable table.
+    let projected_variable_exp = sql::ast::Expression::BinaryOperation {
+        left: Box::new(variables_reference),
+        operator: sql::ast::BinaryOperator("->".to_string()),
+        right: Box::new(sql::ast::Expression::Value(sql::ast::Value::String(
+            variable.clone(),
+        ))),
+    };
+
+    translate_projected_variable(state, r#type, projected_variable_exp)
+}
+
+/// Produce a SQL expression that translates an expression of Postgres type 'jsonb' into a given
+/// type.
+///
+/// For scalar types and object types this is a simple operation, since we can rely on builtin
+/// functions.
+///
+/// Arrays are more complex since there isn't a builtin function that handles array
+/// types.
+pub fn translate_projected_variable(
+    state: &mut State,
+    r#type: &database::Type,
+    exp: sql::ast::Expression,
+) -> sql::ast::Expression {
     match r#type {
-        database::Type::CompositeType(_type_name) => {
-            let exp = sql::ast::Expression::BinaryOperation {
-                left: Box::new(variables_reference),
-                operator: sql::ast::BinaryOperator("->".to_string()),
-                right: Box::new(sql::ast::Expression::Value(sql::ast::Value::String(
-                    variable.clone(),
-                ))),
+        database::Type::CompositeType(_type_name) => sql::ast::Expression::FunctionCall {
+            function: sql::ast::Function::JsonbPopulateRecord,
+            args: vec![
+                sql::ast::Expression::Cast {
+                    expression: Box::new(sql::ast::Expression::Value(sql::ast::Value::Null)),
+                    r#type: type_to_ast_scalar_type(r#type),
+                },
+                exp,
+            ],
+        },
+        // We translate projection of array types into the following sql:
+        // ```
+        // ( SELECT
+        //     array_agg(
+        //       jsonb_populate_record(cast(null as <type>), "array"."element")
+        //     ) AS "element"
+        //   FROM
+        //    jsonb_array_elements((<variable_table> -> <label>)) AS "array"("element")
+        // )
+        // ```
+        database::Type::ArrayType(type_name) => {
+            let array_table = state.make_table_alias("array".to_string());
+            let element_column = sql::ast::ColumnAlias {
+                name: "element".to_string(),
             };
-            sql::ast::Expression::FunctionCall {
-                function: sql::ast::Function::JsonbPopulateRecord,
-                args: vec![
-                    sql::ast::Expression::Cast {
-                        expression: Box::new(sql::ast::Expression::Value(sql::ast::Value::Null)),
-                        r#type: type_to_ast_scalar_type(r#type),
-                    },
-                    exp,
-                ],
-            }
-        }
-        _ => {
-            let exp = sql::ast::Expression::BinaryOperation {
-                left: Box::new(variables_reference),
-                operator: sql::ast::BinaryOperator("->>".to_string()),
-                right: Box::new(sql::ast::Expression::Value(sql::ast::Value::String(
-                    variable.clone(),
-                ))),
+
+            let from_arr = sql::ast::From::JsonbArrayElements {
+                expression: exp,
+                alias: array_table.clone(),
+                column: element_column.clone(),
             };
-            sql::ast::Expression::Cast {
-                expression: Box::new(exp),
-                r#type: type_to_ast_scalar_type(r#type),
-            }
+
+            let element_expression =
+                sql::ast::Expression::ColumnReference(ColumnReference::AliasedColumn {
+                    table: sql::ast::TableReference::AliasedTable(array_table.clone()),
+                    column: element_column.clone(),
+                });
+
+            let converted_element_exp =
+                translate_projected_variable(state, type_name, element_expression);
+
+            let mut result_select = simple_select(vec![(
+                element_column.clone(),
+                sql::ast::Expression::FunctionCall {
+                    function: sql::ast::Function::Unknown("array_agg".to_string()),
+                    args: vec![converted_element_exp],
+                },
+            )]);
+
+            result_select.from = Some(from_arr);
+
+            sql::ast::Expression::CorrelatedSubSelect(Box::new(result_select))
         }
+        database::Type::ScalarType(_) => sql::ast::Expression::Cast {
+            expression: Box::new(sql::ast::Expression::BinaryOperation {
+                left: Box::new(exp),
+                operator: sql::ast::BinaryOperator("#>>".to_string()),
+                right: Box::new(sql::ast::Expression::Cast {
+                    expression: Box::new(sql::ast::Expression::Value(sql::ast::Value::Array(
+                        vec![],
+                    ))),
+                    r#type: sql::ast::ScalarType("text[]".to_string()),
+                }),
+            }),
+            r#type: type_to_ast_scalar_type(r#type),
+        },
     }
 }
diff --git a/crates/query-engine/translation/tests/goldenfiles/select_array_variable/request.json b/crates/query-engine/translation/tests/goldenfiles/select_array_variable/request.json
new file mode 100644
index 000000000..c4de718cc
--- /dev/null
+++ b/crates/query-engine/translation/tests/goldenfiles/select_array_variable/request.json
@@ -0,0 +1,27 @@
+{
+  "collection": "count_elements",
+  "query": {
+    "fields": {
+      "result": {
+        "type": "column",
+        "column": "result",
+        "arguments": {}
+      }
+    }
+  },
+  "arguments": {
+    "array_argument": {
+      "type": "variable",
+      "name": "variable_array_argument"
+    }
+  },
+  "collection_relationships": {},
+  "variables": [
+    {
+      "variable_array_argument": ["one", "two"]
+    },
+    {
+      "variable_array_argument": ["one", "two", "three"]
+    }
+  ]
+}
diff --git a/crates/query-engine/translation/tests/goldenfiles/select_array_variable/tables.json b/crates/query-engine/translation/tests/goldenfiles/select_array_variable/tables.json
new file mode 100644
index 000000000..be18f3610
--- /dev/null
+++ b/crates/query-engine/translation/tests/goldenfiles/select_array_variable/tables.json
@@ -0,0 +1,27 @@
+{
+  "nativeQueries": {
+    "count_elements": {
+      "sql": "SELECT array_length({{array_argument}}, 1) as result",
+      "columns": {
+        "result": {
+          "name": "result",
+          "type": {
+            "scalarType": "int4"
+          },
+          "nullable": "nullable",
+          "description": null
+        }
+      },
+      "arguments": {
+        "array_argument": {
+          "name": "array_argument",
+          "type": {
+            "arrayType": { "scalarType": "text" }
+          },
+          "nullable": "nullable"
+        }
+      },
+      "description": "A native query used to test support array-valued variables"
+    }
+  }
+}
diff --git a/crates/query-engine/translation/tests/goldenfiles/select_array_variable_nested_types/request.json b/crates/query-engine/translation/tests/goldenfiles/select_array_variable_nested_types/request.json
new file mode 100644
index 000000000..b1e338e66
--- /dev/null
+++ b/crates/query-engine/translation/tests/goldenfiles/select_array_variable_nested_types/request.json
@@ -0,0 +1,107 @@
+{
+  "collection": "summarize_organizations",
+  "query": {
+    "fields": {
+      "result": {
+        "type": "column",
+        "column": "result",
+        "arguments": {}
+      }
+    }
+  },
+  "arguments": {
+    "organizations": {
+      "type": "variable",
+      "name": "variable_organizations"
+    }
+  },
+  "collection_relationships": {},
+  "variables": [
+    {
+      "variable_organizations": []
+    },
+    {
+      "variable_organizations": [
+        {
+          "name": "Federation of United Solipsists",
+          "committees": [
+            {
+              "name": "Positively existing entities",
+              "members": [
+                {
+                  "first_name": "Yo",
+                  "last_name": "El mismo"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "variable_organizations": [
+        {
+          "name": "RC Model Airplane Enthusiasts",
+          "committees": [
+            {
+              "name": "Founders",
+              "members": [
+                {
+                  "first_name": "Orville",
+                  "last_name": "Wright"
+                },
+                {
+                  "first_name": "Wilbur",
+                  "last_name": "Wright"
+                }
+              ]
+            },
+            {
+              "name": "Parts supply management",
+              "members": [
+                {
+                  "first_name": "Orville",
+                  "last_name": "Wright"
+                },
+                {
+                  "first_name": "Wilbur",
+                  "last_name": "Wright"
+                },
+                {
+                  "first_name": "Guybrush",
+                  "last_name": "Threepwood"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "Argonauts' Alumni Association",
+          "committees": [
+            {
+              "name": "Crew",
+              "members": [
+                {
+                  "first_name": "Jason",
+                  "last_name": "(The)"
+                },
+                {
+                  "first_name": "Heracles",
+                  "last_name": "(The)"
+                },
+                {
+                  "first_name": "Castor",
+                  "last_name": "(The)"
+                },
+                {
+                  "first_name": "Polydeuces",
+                  "last_name": "(The)"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/crates/query-engine/translation/tests/goldenfiles/select_array_variable_nested_types/tables.json b/crates/query-engine/translation/tests/goldenfiles/select_array_variable_nested_types/tables.json
new file mode 100644
index 000000000..fa4e076f6
--- /dev/null
+++ b/crates/query-engine/translation/tests/goldenfiles/select_array_variable_nested_types/tables.json
@@ -0,0 +1,86 @@
+{
+  "compositeTypes": {
+    "person_name": {
+      "name": "person_name",
+      "fields": {
+        "first_name": {
+          "name": "first_name",
+          "type": {
+            "scalarType": "text"
+          }
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": {
+            "scalarType": "text"
+          }
+        }
+      }
+    },
+    "committee": {
+      "name": "committee",
+      "fields": {
+        "name": {
+          "name": "name",
+          "type": {
+            "scalarType": "text"
+          }
+        },
+        "members": {
+          "name": "members",
+          "type": {
+            "arrayType": {
+              "scalarType": "text"
+            }
+          }
+        }
+      }
+    },
+    "organization": {
+      "name": "organization",
+      "fields": {
+        "name": {
+          "name": "name",
+          "type": {
+            "scalarType": "text"
+          }
+        },
+        "members": {
+          "name": "committees",
+          "type": {
+            "arrayType": {
+              "compositeType": "committee"
+            }
+          }
+        }
+      }
+    }
+  },
+  "nativeQueries": {
+    "summarize_organizations": {
+      "sql": "SELECT 'The organization ' || org.name || ' has ' || no_committees::text || ' committees, ' || 'the largest of which has ' || max_members || ' members.' AS result FROM (SELECT orgs.* FROM unnest({{organizations}})) AS org JOIN LATERAL ( SELECT count(committee.*) AS no_committees, max(members_agg.no_members) AS max_members FROM unnest(org.committees) AS committee JOIN LATERAL ( SELECT count(*) as no_members FROM unnest(committee.members) AS members) AS members_agg ON true) AS coms ON true",
+      "columns": {
+        "result": {
+          "name": "result",
+          "type": {
+            "scalarType": "text"
+          },
+          "nullable": "nullable",
+          "description": null
+        }
+      },
+      "arguments": {
+        "organizations": {
+          "name": "organizations",
+          "type": {
+            "arrayType": {
+              "compositeType": "organization"
+            }
+          },
+          "nullable": "nullable"
+        }
+      },
+      "description": "A native query used to test support array-valued variables"
+    }
+  }
+}
diff --git a/crates/query-engine/translation/tests/snapshots/tests__select_array_variable.snap b/crates/query-engine/translation/tests/snapshots/tests__select_array_variable.snap
new file mode 100644
index 000000000..8336b17dd
--- /dev/null
+++ b/crates/query-engine/translation/tests/snapshots/tests__select_array_variable.snap
@@ -0,0 +1,43 @@
+---
+source: crates/query-engine/translation/tests/tests.rs
+expression: result
+---
+SELECT
+  coalesce(json_agg("%6_universe_agg"."universe"), '[]') AS "universe"
+FROM
+  (
+    SELECT
+      row_to_json("%3_universe") AS "universe"
+    FROM
+      jsonb_to_recordset($1) AS "%0_%variables_table"("%variable_order" int, "%variables" jsonb)
+      CROSS JOIN LATERAL (
+        WITH "%2_NATIVE_QUERY_count_elements" AS (
+          SELECT
+            array_length(
+              (
+                SELECT
+                  array_agg(
+                    cast(
+                      (
+                        "%0_array"."element" #>> cast(ARRAY [] as text[])) as text)) AS "element" FROM jsonb_array_elements(("%0_%variables_table"."%variables" -> $2)) AS "%0_array"("element")), 1) as result
+                      )
+                      SELECT
+                        *
+                      FROM
+                        (
+                          SELECT
+                            coalesce(json_agg(row_to_json("%4_rows")), '[]') AS "rows"
+                          FROM
+                            (
+                              SELECT
+                                "%1_count_elements"."result" AS "result"
+                              FROM
+                                "%2_NATIVE_QUERY_count_elements" AS "%1_count_elements"
+                            ) AS "%4_rows"
+                        ) AS "%4_rows"
+                    ) AS "%3_universe"
+                    ORDER BY
+                      "%0_%variables_table"."%variable_order" ASC
+                  ) AS "%6_universe_agg"
+
+[(1, Variable("%VARIABLES_OBJECT_PLACEHOLDER")), (2, String("variable_array_argument"))]
diff --git a/crates/query-engine/translation/tests/snapshots/tests__select_array_variable_nested_types.snap b/crates/query-engine/translation/tests/snapshots/tests__select_array_variable_nested_types.snap
new file mode 100644
index 000000000..bf2fa7ae2
--- /dev/null
+++ b/crates/query-engine/translation/tests/snapshots/tests__select_array_variable_nested_types.snap
@@ -0,0 +1,66 @@
+---
+source: crates/query-engine/translation/tests/tests.rs
+expression: result
+---
+SELECT
+  coalesce(json_agg("%6_universe_agg"."universe"), '[]') AS "universe"
+FROM
+  (
+    SELECT
+      row_to_json("%3_universe") AS "universe"
+    FROM
+      jsonb_to_recordset($1) AS "%0_%variables_table"("%variable_order" int, "%variables" jsonb)
+      CROSS JOIN LATERAL (
+        WITH "%2_NATIVE_QUERY_summarize_organizations" AS (
+          SELECT
+            'The organization ' || org.name || ' has ' || no_committees :: text || ' committees, ' || 'the largest of which has ' || max_members || ' members.' AS result
+          FROM
+            (
+              SELECT
+                orgs.*
+              FROM
+                unnest(
+                  (
+                    SELECT
+                      array_agg(
+                        jsonb_populate_record(cast(null as organization), "%0_array"."element")
+                      ) AS "element"
+                    FROM
+                      jsonb_array_elements(("%0_%variables_table"."%variables" -> $2)) AS "%0_array"("element")
+                  )
+                )
+            ) AS org
+            JOIN LATERAL (
+              SELECT
+                count(committee.*) AS no_committees,
+                max(members_agg.no_members) AS max_members
+              FROM
+                unnest(org.committees) AS committee
+                JOIN LATERAL (
+                  SELECT
+                    count(*) as no_members
+                  FROM
+                    unnest(committee.members) AS members
+                ) AS members_agg ON true
+            ) AS coms ON true
+        )
+        SELECT
+          *
+        FROM
+          (
+            SELECT
+              coalesce(json_agg(row_to_json("%4_rows")), '[]') AS "rows"
+            FROM
+              (
+                SELECT
+                  "%1_summarize_organizations"."result" AS "result"
+                FROM
+                  "%2_NATIVE_QUERY_summarize_organizations" AS "%1_summarize_organizations"
+              ) AS "%4_rows"
+          ) AS "%4_rows"
+      ) AS "%3_universe"
+    ORDER BY
+      "%0_%variables_table"."%variable_order" ASC
+  ) AS "%6_universe_agg"
+
+[(1, Variable("%VARIABLES_OBJECT_PLACEHOLDER")), (2, String("variable_organizations"))]
diff --git a/crates/query-engine/translation/tests/tests.rs b/crates/query-engine/translation/tests/tests.rs
index 6aad4f605..10d6e6c03 100644
--- a/crates/query-engine/translation/tests/tests.rs
+++ b/crates/query-engine/translation/tests/tests.rs
@@ -12,6 +12,18 @@ fn select_array_column() {
     insta::assert_snapshot!(result);
 }
 
+#[test]
+fn select_array_variable() {
+    let result = common::test_translation("select_array_variable").unwrap();
+    insta::assert_snapshot!(result);
+}
+
+#[test]
+fn select_array_variable_nested_types() {
+    let result = common::test_translation("select_array_variable_nested_types").unwrap();
+    insta::assert_snapshot!(result);
+}
+
 #[test]
 fn select_composite_column_simple() {
     let result = common::test_translation("select_composite_column_simple").unwrap();
diff --git a/crates/tests/databases-tests/src/aurora/query_tests.rs b/crates/tests/databases-tests/src/aurora/query_tests.rs
index a5e80ba69..d58e83e70 100644
--- a/crates/tests/databases-tests/src/aurora/query_tests.rs
+++ b/crates/tests/databases-tests/src/aurora/query_tests.rs
@@ -33,6 +33,18 @@ mod basic {
         insta::assert_json_snapshot!(result);
     }
 
+    #[tokio::test]
+    async fn select_array_variable() {
+        let result = run_query(create_router().await, "select_array_variable").await;
+        insta::assert_json_snapshot!(result);
+    }
+
+    #[tokio::test]
+    async fn select_array_variable_nested_types() {
+        let result = run_query(create_router().await, "select_array_variable_nested_types").await;
+        insta::assert_json_snapshot!(result);
+    }
+
     #[tokio::test]
     async fn select_int_and_string() {
         let result = run_query(create_router().await, "select_int_and_string").await;
diff --git a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__basic__select_array_variable.snap b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__basic__select_array_variable.snap
new file mode 100644
index 000000000..5dd3dfbdf
--- /dev/null
+++ b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__basic__select_array_variable.snap
@@ -0,0 +1,20 @@
+---
+source: crates/tests/databases-tests/src/aurora/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": [
+      {
+        "result": 2
+      }
+    ]
+  },
+  {
+    "rows": [
+      {
+        "result": 3
+      }
+    ]
+  }
+]
diff --git a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__basic__select_array_variable_nested_types.snap b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__basic__select_array_variable_nested_types.snap
new file mode 100644
index 000000000..d21b4de2d
--- /dev/null
+++ b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__basic__select_array_variable_nested_types.snap
@@ -0,0 +1,26 @@
+---
+source: crates/tests/databases-tests/src/aurora/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": []
+  },
+  {
+    "rows": [
+      {
+        "result": "The organization Federation of United Solipsists has 1 committees, the largest of which has 1 members."
+      }
+    ]
+  },
+  {
+    "rows": [
+      {
+        "result": "The organization RC Model Airplane Enthusiasts has 2 committees, the largest of which has 3 members."
+      },
+      {
+        "result": "The organization Argonauts' Alumni Association has 1 committees, the largest of which has 4 members."
+      }
+    ]
+  }
+]
diff --git a/crates/tests/databases-tests/src/citus/query_tests.rs b/crates/tests/databases-tests/src/citus/query_tests.rs
index a5e80ba69..d58e83e70 100644
--- a/crates/tests/databases-tests/src/citus/query_tests.rs
+++ b/crates/tests/databases-tests/src/citus/query_tests.rs
@@ -33,6 +33,18 @@ mod basic {
         insta::assert_json_snapshot!(result);
     }
 
+    #[tokio::test]
+    async fn select_array_variable() {
+        let result = run_query(create_router().await, "select_array_variable").await;
+        insta::assert_json_snapshot!(result);
+    }
+
+    #[tokio::test]
+    async fn select_array_variable_nested_types() {
+        let result = run_query(create_router().await, "select_array_variable_nested_types").await;
+        insta::assert_json_snapshot!(result);
+    }
+
     #[tokio::test]
     async fn select_int_and_string() {
         let result = run_query(create_router().await, "select_int_and_string").await;
diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_variable.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_variable.snap
index 4238563d3..72a7752c6 100644
--- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_variable.snap
+++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_variable.snap
@@ -27,14 +27,5 @@ FROM
                 WHERE
                   (
                     "%1_Album"."Title" ~~ cast(
-                      ("%0_%variables_table"."%variables" ->> $2) as varchar
-                    )
-                  )
-                ORDER BY
-                  "%1_Album"."AlbumId" ASC
-              ) AS "%3_rows"
-          ) AS "%3_rows"
-      ) AS "%2_universe"
-    ORDER BY
-      "%0_%variables_table"."%variable_order" ASC
-  ) AS "%5_universe_agg"
+                      (
+                        ("%0_%variables_table"."%variables" -> $2) #>> cast(ARRAY [] as text[])) as varchar)) ORDER BY "%1_Album"."AlbumId" ASC ) AS "%3_rows") AS "%3_rows") AS "%2_universe" ORDER BY "%0_%variables_table"."%variable_order" ASC ) AS "%5_universe_agg"
diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__basic__select_array_variable.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__basic__select_array_variable.snap
new file mode 100644
index 000000000..42df3a295
--- /dev/null
+++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__basic__select_array_variable.snap
@@ -0,0 +1,20 @@
+---
+source: crates/tests/databases-tests/src/citus/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": [
+      {
+        "result": 2
+      }
+    ]
+  },
+  {
+    "rows": [
+      {
+        "result": 3
+      }
+    ]
+  }
+]
diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__basic__select_array_variable_nested_types.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__basic__select_array_variable_nested_types.snap
new file mode 100644
index 000000000..0b2994c2d
--- /dev/null
+++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__basic__select_array_variable_nested_types.snap
@@ -0,0 +1,26 @@
+---
+source: crates/tests/databases-tests/src/citus/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": []
+  },
+  {
+    "rows": [
+      {
+        "result": "The organization Federation of United Solipsists has 1 committees, the largest of which has 1 members."
+      }
+    ]
+  },
+  {
+    "rows": [
+      {
+        "result": "The organization RC Model Airplane Enthusiasts has 2 committees, the largest of which has 3 members."
+      },
+      {
+        "result": "The organization Argonauts' Alumni Association has 1 committees, the largest of which has 4 members."
+      }
+    ]
+  }
+]
diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__schema_tests__schema_test__get_schema.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__schema_tests__schema_test__get_schema.snap
index d78f85a20..c753bb2bf 100644
--- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__schema_tests__schema_test__get_schema.snap
+++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__schema_tests__schema_test__get_schema.snap
@@ -2024,6 +2024,39 @@ expression: result
         }
       }
     },
+    "committee": {
+      "fields": {
+        "members": {
+          "type": {
+            "type": "array",
+            "element_type": {
+              "type": "named",
+              "name": "text"
+            }
+          }
+        },
+        "name": {
+          "type": {
+            "type": "named",
+            "name": "text"
+          }
+        }
+      }
+    },
+    "count_elements": {
+      "description": "A native query used to test support array-valued variables",
+      "fields": {
+        "result": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "named",
+              "name": "int4"
+            }
+          }
+        }
+      }
+    },
     "delete_playlist_track": {
       "fields": {
         "PlaylistId": {
@@ -2113,6 +2146,25 @@ expression: result
         }
       }
     },
+    "organization": {
+      "fields": {
+        "committees": {
+          "type": {
+            "type": "array",
+            "element_type": {
+              "type": "named",
+              "name": "committee"
+            }
+          }
+        },
+        "name": {
+          "type": {
+            "type": "named",
+            "name": "text"
+          }
+        }
+      }
+    },
     "person": {
       "fields": {
         "address": {
@@ -2161,6 +2213,20 @@ expression: result
         }
       }
     },
+    "summarize_organizations": {
+      "description": "A native query used to test support array-valued variables",
+      "fields": {
+        "result": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "named",
+              "name": "text"
+            }
+          }
+        }
+      }
+    },
     "v1_insert_Album_object": {
       "fields": {
         "AlbumId": {
@@ -3175,6 +3241,27 @@ expression: result
       "uniqueness_constraints": {},
       "foreign_keys": {}
     },
+    {
+      "name": "count_elements",
+      "description": "A native query used to test support array-valued variables",
+      "arguments": {
+        "array_argument": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "array",
+              "element_type": {
+                "type": "named",
+                "name": "text"
+              }
+            }
+          }
+        }
+      },
+      "type": "count_elements",
+      "uniqueness_constraints": {},
+      "foreign_keys": {}
+    },
     {
       "name": "make_person",
       "description": "A native query used to test support for composite types",
@@ -3202,6 +3289,27 @@ expression: result
       "uniqueness_constraints": {},
       "foreign_keys": {}
     },
+    {
+      "name": "summarize_organizations",
+      "description": "A native query used to test support array-valued variables",
+      "arguments": {
+        "organizations": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "array",
+              "element_type": {
+                "type": "named",
+                "name": "organization"
+              }
+            }
+          }
+        }
+      },
+      "type": "summarize_organizations",
+      "uniqueness_constraints": {},
+      "foreign_keys": {}
+    },
     {
       "name": "value_types",
       "arguments": {
diff --git a/crates/tests/databases-tests/src/cockroach/query_tests.rs b/crates/tests/databases-tests/src/cockroach/query_tests.rs
index e2bc11e83..7a33a4c90 100644
--- a/crates/tests/databases-tests/src/cockroach/query_tests.rs
+++ b/crates/tests/databases-tests/src/cockroach/query_tests.rs
@@ -34,6 +34,19 @@ mod basic {
         insta::assert_json_snapshot!(result);
     }
 
+    #[tokio::test]
+    async fn select_array_variable() {
+        let result = run_query(create_router().await, "select_array_variable").await;
+        insta::assert_json_snapshot!(result);
+    }
+
+    #[tokio::test]
+    #[ignore = "Cockroach v23.1.10 does not support nested user defined types which this test uses."]
+    async fn select_array_variable_nested_types() {
+        let result = run_query(create_router().await, "select_array_variable_nested_types").await;
+        insta::assert_json_snapshot!(result);
+    }
+
     #[tokio::test]
     async fn select_int_and_string() {
         let result = run_query(create_router().await, "select_int_and_string").await;
diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_variable.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_variable.snap
index 03e7eb6f3..cef57e93c 100644
--- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_variable.snap
+++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_variable.snap
@@ -27,14 +27,5 @@ FROM
                 WHERE
                   (
                     "%1_Album"."Title" LIKE cast(
-                      ("%0_%variables_table"."%variables" ->> $2) as varchar
-                    )
-                  )
-                ORDER BY
-                  "%1_Album"."AlbumId" ASC
-              ) AS "%3_rows"
-          ) AS "%3_rows"
-      ) AS "%2_universe"
-    ORDER BY
-      "%0_%variables_table"."%variable_order" ASC
-  ) AS "%5_universe_agg"
+                      (
+                        ("%0_%variables_table"."%variables" -> $2) #>> cast(ARRAY [] as text[])) as varchar)) ORDER BY "%1_Album"."AlbumId" ASC ) AS "%3_rows") AS "%3_rows") AS "%2_universe" ORDER BY "%0_%variables_table"."%variable_order" ASC ) AS "%5_universe_agg"
diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__basic__select_array_variable.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__basic__select_array_variable.snap
new file mode 100644
index 000000000..021b59ba9
--- /dev/null
+++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__basic__select_array_variable.snap
@@ -0,0 +1,20 @@
+---
+source: crates/tests/databases-tests/src/cockroach/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": [
+      {
+        "result": 2
+      }
+    ]
+  },
+  {
+    "rows": [
+      {
+        "result": 3
+      }
+    ]
+  }
+]
diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__schema_tests__schema_test__get_schema.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__schema_tests__schema_test__get_schema.snap
index 33563d338..b19982f72 100644
--- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__schema_tests__schema_test__get_schema.snap
+++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__schema_tests__schema_test__get_schema.snap
@@ -1783,6 +1783,20 @@ expression: result
         }
       }
     },
+    "count_elements": {
+      "description": "A native query used to test support array-valued variables",
+      "fields": {
+        "result": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "named",
+              "name": "int4"
+            }
+          }
+        }
+      }
+    },
     "delete_playlist_track": {
       "fields": {
         "PlaylistId": {
@@ -3006,6 +3020,27 @@ expression: result
       "uniqueness_constraints": {},
       "foreign_keys": {}
     },
+    {
+      "name": "count_elements",
+      "description": "A native query used to test support array-valued variables",
+      "arguments": {
+        "array_argument": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "array",
+              "element_type": {
+                "type": "named",
+                "name": "text"
+              }
+            }
+          }
+        }
+      },
+      "type": "count_elements",
+      "uniqueness_constraints": {},
+      "foreign_keys": {}
+    },
     {
       "name": "value_types",
       "arguments": {
diff --git a/crates/tests/databases-tests/src/postgres/query_tests.rs b/crates/tests/databases-tests/src/postgres/query_tests.rs
index 83ba584bc..14ab9a604 100644
--- a/crates/tests/databases-tests/src/postgres/query_tests.rs
+++ b/crates/tests/databases-tests/src/postgres/query_tests.rs
@@ -33,6 +33,18 @@ mod basic {
         insta::assert_json_snapshot!(result);
     }
 
+    #[tokio::test]
+    async fn select_array_variable() {
+        let result = run_query(create_router().await, "select_array_variable").await;
+        insta::assert_json_snapshot!(result);
+    }
+
+    #[tokio::test]
+    async fn select_array_variable_nested_types() {
+        let result = run_query(create_router().await, "select_array_variable_nested_types").await;
+        insta::assert_json_snapshot!(result);
+    }
+
     #[tokio::test]
     async fn select_int_and_string() {
         let result = run_query(create_router().await, "select_int_and_string").await;
diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__native_queries__embedded_variable.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__native_queries__embedded_variable.snap
index ff335ca02..2c60cf364 100644
--- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__native_queries__embedded_variable.snap
+++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__native_queries__embedded_variable.snap
@@ -19,27 +19,26 @@ FROM
             public."Album"
           WHERE
             "Title" LIKE cast(
-              ("%0_%variables_table"."%variables" ->> $2) as varchar
-            )
-            AND "AlbumId" < 500
-        )
-        SELECT
-          *
-        FROM
-          (
-            SELECT
-              coalesce(json_agg(row_to_json("%4_rows")), '[]') AS "rows"
-            FROM
               (
-                SELECT
-                  "%1_album_by_title"."Title" AS "Title"
-                FROM
-                  "%2_NATIVE_QUERY_album_by_title" AS "%1_album_by_title"
-                ORDER BY
-                  "%1_album_by_title"."AlbumId" ASC
-              ) AS "%4_rows"
-          ) AS "%4_rows"
-      ) AS "%3_universe"
-    ORDER BY
-      "%0_%variables_table"."%variable_order" ASC
-  ) AS "%6_universe_agg"
+                ("%0_%variables_table"."%variables" -> $2) #>> cast(ARRAY [] as text[])) as varchar) AND "AlbumId" < 500
+              )
+              SELECT
+                *
+              FROM
+                (
+                  SELECT
+                    coalesce(json_agg(row_to_json("%4_rows")), '[]') AS "rows"
+                  FROM
+                    (
+                      SELECT
+                        "%1_album_by_title"."Title" AS "Title"
+                      FROM
+                        "%2_NATIVE_QUERY_album_by_title" AS "%1_album_by_title"
+                      ORDER BY
+                        "%1_album_by_title"."AlbumId" ASC
+                    ) AS "%4_rows"
+                ) AS "%4_rows"
+            ) AS "%3_universe"
+          ORDER BY
+            "%0_%variables_table"."%variable_order" ASC
+        ) AS "%6_universe_agg"
diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_no_variable.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_no_variable.snap
index 286e202fe..62d201314 100644
--- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_no_variable.snap
+++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_no_variable.snap
@@ -27,14 +27,5 @@ FROM
                 WHERE
                   (
                     "%1_Album"."Title" ~~ cast(
-                      ("%0_%variables_table"."%variables" ->> $2) as varchar
-                    )
-                  )
-                ORDER BY
-                  "%1_Album"."AlbumId" ASC
-              ) AS "%3_rows"
-          ) AS "%3_rows"
-      ) AS "%2_universe"
-    ORDER BY
-      "%0_%variables_table"."%variable_order" ASC
-  ) AS "%5_universe_agg"
+                      (
+                        ("%0_%variables_table"."%variables" -> $2) #>> cast(ARRAY [] as text[])) as varchar)) ORDER BY "%1_Album"."AlbumId" ASC ) AS "%3_rows") AS "%3_rows") AS "%2_universe" ORDER BY "%0_%variables_table"."%variable_order" ASC ) AS "%5_universe_agg"
diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_variable.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_variable.snap
index 286e202fe..62d201314 100644
--- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_variable.snap
+++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_variable.snap
@@ -27,14 +27,5 @@ FROM
                 WHERE
                   (
                     "%1_Album"."Title" ~~ cast(
-                      ("%0_%variables_table"."%variables" ->> $2) as varchar
-                    )
-                  )
-                ORDER BY
-                  "%1_Album"."AlbumId" ASC
-              ) AS "%3_rows"
-          ) AS "%3_rows"
-      ) AS "%2_universe"
-    ORDER BY
-      "%0_%variables_table"."%variable_order" ASC
-  ) AS "%5_universe_agg"
+                      (
+                        ("%0_%variables_table"."%variables" -> $2) #>> cast(ARRAY [] as text[])) as varchar)) ORDER BY "%1_Album"."AlbumId" ASC ) AS "%3_rows") AS "%3_rows") AS "%2_universe" ORDER BY "%0_%variables_table"."%variable_order" ASC ) AS "%5_universe_agg"
diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__basic__select_array_variable.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__basic__select_array_variable.snap
new file mode 100644
index 000000000..b21e6aa3d
--- /dev/null
+++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__basic__select_array_variable.snap
@@ -0,0 +1,20 @@
+---
+source: crates/tests/databases-tests/src/postgres/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": [
+      {
+        "result": 2
+      }
+    ]
+  },
+  {
+    "rows": [
+      {
+        "result": 3
+      }
+    ]
+  }
+]
diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__basic__select_array_variable_nested_types.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__basic__select_array_variable_nested_types.snap
new file mode 100644
index 000000000..2303f2883
--- /dev/null
+++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__basic__select_array_variable_nested_types.snap
@@ -0,0 +1,26 @@
+---
+source: crates/tests/databases-tests/src/postgres/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": []
+  },
+  {
+    "rows": [
+      {
+        "result": "The organization Federation of United Solipsists has 1 committees, the largest of which has 1 members."
+      }
+    ]
+  },
+  {
+    "rows": [
+      {
+        "result": "The organization RC Model Airplane Enthusiasts has 2 committees, the largest of which has 3 members."
+      },
+      {
+        "result": "The organization Argonauts' Alumni Association has 1 committees, the largest of which has 4 members."
+      }
+    ]
+  }
+]
diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__schema_tests__schema_test__get_schema.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__schema_tests__schema_test__get_schema.snap
index 8e2cf2f69..a2448f9bc 100644
--- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__schema_tests__schema_test__get_schema.snap
+++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__schema_tests__schema_test__get_schema.snap
@@ -2096,6 +2096,39 @@ expression: result
         }
       }
     },
+    "committee": {
+      "fields": {
+        "members": {
+          "type": {
+            "type": "array",
+            "element_type": {
+              "type": "named",
+              "name": "text"
+            }
+          }
+        },
+        "name": {
+          "type": {
+            "type": "named",
+            "name": "text"
+          }
+        }
+      }
+    },
+    "count_elements": {
+      "description": "A native query used to test support array-valued variables",
+      "fields": {
+        "result": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "named",
+              "name": "int4"
+            }
+          }
+        }
+      }
+    },
     "custom_dog": {
       "fields": {
         "adopter_name": {
@@ -2231,6 +2264,25 @@ expression: result
         }
       }
     },
+    "organization": {
+      "fields": {
+        "committees": {
+          "type": {
+            "type": "array",
+            "element_type": {
+              "type": "named",
+              "name": "committee"
+            }
+          }
+        },
+        "name": {
+          "type": {
+            "type": "named",
+            "name": "text"
+          }
+        }
+      }
+    },
     "person": {
       "fields": {
         "address": {
@@ -2325,6 +2377,20 @@ expression: result
         }
       }
     },
+    "summarize_organizations": {
+      "description": "A native query used to test support array-valued variables",
+      "fields": {
+        "result": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "named",
+              "name": "text"
+            }
+          }
+        }
+      }
+    },
     "topology_layer": {
       "fields": {
         "child_id": {
@@ -3666,6 +3732,27 @@ expression: result
       "uniqueness_constraints": {},
       "foreign_keys": {}
     },
+    {
+      "name": "count_elements",
+      "description": "A native query used to test support array-valued variables",
+      "arguments": {
+        "array_argument": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "array",
+              "element_type": {
+                "type": "named",
+                "name": "text"
+              }
+            }
+          }
+        }
+      },
+      "type": "count_elements",
+      "uniqueness_constraints": {},
+      "foreign_keys": {}
+    },
     {
       "name": "make_person",
       "description": "A native query used to test support for composite types",
@@ -3693,6 +3780,27 @@ expression: result
       "uniqueness_constraints": {},
       "foreign_keys": {}
     },
+    {
+      "name": "summarize_organizations",
+      "description": "A native query used to test support array-valued variables",
+      "arguments": {
+        "organizations": {
+          "type": {
+            "type": "nullable",
+            "underlying_type": {
+              "type": "array",
+              "element_type": {
+                "type": "named",
+                "name": "organization"
+              }
+            }
+          }
+        }
+      },
+      "type": "summarize_organizations",
+      "uniqueness_constraints": {},
+      "foreign_keys": {}
+    },
     {
       "name": "value_types",
       "arguments": {
diff --git a/crates/tests/databases-tests/src/yugabyte/query_tests.rs b/crates/tests/databases-tests/src/yugabyte/query_tests.rs
index 51d376913..191e38ed3 100644
--- a/crates/tests/databases-tests/src/yugabyte/query_tests.rs
+++ b/crates/tests/databases-tests/src/yugabyte/query_tests.rs
@@ -27,6 +27,18 @@ mod basic {
         insta::assert_json_snapshot!(result);
     }
 
+    #[tokio::test]
+    async fn select_array_variable() {
+        let result = run_query(create_router().await, "select_array_variable").await;
+        insta::assert_json_snapshot!(result);
+    }
+
+    #[tokio::test]
+    async fn select_array_variable_nested_types() {
+        let result = run_query(create_router().await, "select_array_variable_nested_types").await;
+        insta::assert_json_snapshot!(result);
+    }
+
     #[tokio::test]
     async fn select_int_and_string() {
         let result = run_query(create_router().await, "select_int_and_string").await;
diff --git a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__basic__select_array_variable.snap b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__basic__select_array_variable.snap
new file mode 100644
index 000000000..00f2e4520
--- /dev/null
+++ b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__basic__select_array_variable.snap
@@ -0,0 +1,20 @@
+---
+source: crates/tests/databases-tests/src/yugabyte/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": [
+      {
+        "result": 2
+      }
+    ]
+  },
+  {
+    "rows": [
+      {
+        "result": 3
+      }
+    ]
+  }
+]
diff --git a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__basic__select_array_variable_nested_types.snap b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__basic__select_array_variable_nested_types.snap
new file mode 100644
index 000000000..e19f7ee0a
--- /dev/null
+++ b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__basic__select_array_variable_nested_types.snap
@@ -0,0 +1,26 @@
+---
+source: crates/tests/databases-tests/src/yugabyte/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": []
+  },
+  {
+    "rows": [
+      {
+        "result": "The organization Federation of United Solipsists has 1 committees, the largest of which has 1 members."
+      }
+    ]
+  },
+  {
+    "rows": [
+      {
+        "result": "The organization RC Model Airplane Enthusiasts has 2 committees, the largest of which has 3 members."
+      },
+      {
+        "result": "The organization Argonauts' Alumni Association has 1 committees, the largest of which has 4 members."
+      }
+    ]
+  }
+]
diff --git a/crates/tests/tests-common/goldenfiles/select_array_variable.json b/crates/tests/tests-common/goldenfiles/select_array_variable.json
new file mode 100644
index 000000000..c4de718cc
--- /dev/null
+++ b/crates/tests/tests-common/goldenfiles/select_array_variable.json
@@ -0,0 +1,27 @@
+{
+  "collection": "count_elements",
+  "query": {
+    "fields": {
+      "result": {
+        "type": "column",
+        "column": "result",
+        "arguments": {}
+      }
+    }
+  },
+  "arguments": {
+    "array_argument": {
+      "type": "variable",
+      "name": "variable_array_argument"
+    }
+  },
+  "collection_relationships": {},
+  "variables": [
+    {
+      "variable_array_argument": ["one", "two"]
+    },
+    {
+      "variable_array_argument": ["one", "two", "three"]
+    }
+  ]
+}
diff --git a/crates/tests/tests-common/goldenfiles/select_array_variable_nested_types.json b/crates/tests/tests-common/goldenfiles/select_array_variable_nested_types.json
new file mode 100644
index 000000000..b1e338e66
--- /dev/null
+++ b/crates/tests/tests-common/goldenfiles/select_array_variable_nested_types.json
@@ -0,0 +1,107 @@
+{
+  "collection": "summarize_organizations",
+  "query": {
+    "fields": {
+      "result": {
+        "type": "column",
+        "column": "result",
+        "arguments": {}
+      }
+    }
+  },
+  "arguments": {
+    "organizations": {
+      "type": "variable",
+      "name": "variable_organizations"
+    }
+  },
+  "collection_relationships": {},
+  "variables": [
+    {
+      "variable_organizations": []
+    },
+    {
+      "variable_organizations": [
+        {
+          "name": "Federation of United Solipsists",
+          "committees": [
+            {
+              "name": "Positively existing entities",
+              "members": [
+                {
+                  "first_name": "Yo",
+                  "last_name": "El mismo"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "variable_organizations": [
+        {
+          "name": "RC Model Airplane Enthusiasts",
+          "committees": [
+            {
+              "name": "Founders",
+              "members": [
+                {
+                  "first_name": "Orville",
+                  "last_name": "Wright"
+                },
+                {
+                  "first_name": "Wilbur",
+                  "last_name": "Wright"
+                }
+              ]
+            },
+            {
+              "name": "Parts supply management",
+              "members": [
+                {
+                  "first_name": "Orville",
+                  "last_name": "Wright"
+                },
+                {
+                  "first_name": "Wilbur",
+                  "last_name": "Wright"
+                },
+                {
+                  "first_name": "Guybrush",
+                  "last_name": "Threepwood"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "Argonauts' Alumni Association",
+          "committees": [
+            {
+              "name": "Crew",
+              "members": [
+                {
+                  "first_name": "Jason",
+                  "last_name": "(The)"
+                },
+                {
+                  "first_name": "Heracles",
+                  "last_name": "(The)"
+                },
+                {
+                  "first_name": "Castor",
+                  "last_name": "(The)"
+                },
+                {
+                  "first_name": "Polydeuces",
+                  "last_name": "(The)"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/static/aurora/v2-chinook-deployment-template.json b/static/aurora/v2-chinook-deployment-template.json
index a57a9dfa7..e02020710 100644
--- a/static/aurora/v2-chinook-deployment-template.json
+++ b/static/aurora/v2-chinook-deployment-template.json
@@ -743,6 +743,50 @@
       }
     },
     "compositeTypes": {
+      "committee": {
+        "name": "committee",
+        "fields": {
+          "members": {
+            "name": "members",
+            "type": {
+              "arrayType": {
+                "scalarType": "text"
+              }
+            },
+            "description": null
+          },
+          "name": {
+            "name": "name",
+            "type": {
+              "scalarType": "text"
+            },
+            "description": null
+          }
+        },
+        "description": null
+      },
+      "organization": {
+        "name": "organization",
+        "fields": {
+          "members": {
+            "name": "committees",
+            "type": {
+              "arrayType": {
+                "compositeType": "committee"
+              }
+            },
+            "description": null
+          },
+          "name": {
+            "name": "name",
+            "type": {
+              "scalarType": "text"
+            },
+            "description": null
+          }
+        },
+        "description": null
+      },
       "person": {
         "name": "person",
         "fields": {
@@ -994,6 +1038,32 @@
         },
         "description": null
       },
+      "count_elements": {
+        "sql": "SELECT array_length({{array_argument}}, 1) as result",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "scalarType": "int4"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "array_argument": {
+            "name": "array_argument",
+            "type": {
+              "arrayType": {
+                "scalarType": "text"
+              }
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support array-valued variables"
+      },
       "delete_playlist_track": {
         "sql": "DELETE FROM public.\"PlaylistTrack\" WHERE \"TrackId\" = {{track_id}} RETURNING *",
         "columns": {
@@ -1157,6 +1227,32 @@
         },
         "description": "A native query used to test support for composite types"
       },
+      "summarize_organizations": {
+        "sql": "SELECT 'The organization ' || org.name || ' has ' || no_committees::text || ' committees, ' || 'the largest of which has ' || max_members || ' members.' AS result FROM (SELECT orgs.* FROM unnest({{organizations}}) as orgs) AS org JOIN LATERAL ( SELECT count(committee.*) AS no_committees, max(members_agg.no_members) AS max_members FROM unnest(org.committees) AS committee JOIN LATERAL ( SELECT count(*) as no_members FROM unnest(committee.members) AS members) AS members_agg ON true) AS coms ON true",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "scalarType": "text"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "organizations": {
+            "name": "organizations",
+            "type": {
+              "arrayType": {
+                "compositeType": "organization"
+              }
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support array-valued variables"
+      },
       "value_types": {
         "sql": "SELECT {{bool}} as bool, {{int4}} as int4, {{int2}} as int2, {{int8}} as int8, {{float4}} as float4, {{float8}} as \"float8\", {{numeric}} as numeric, {{char}} as char, {{varchar}} as \"varchar\", {{text}} as text, {{date}} as date, {{time}} as time, {{timetz}} as timetz, {{timestamp}} as timestamp, {{timestamptz}} as timestamptz, {{uuid}} as uuid",
         "columns": {
diff --git a/static/citus/v2-chinook-deployment.json b/static/citus/v2-chinook-deployment.json
index a6ec2f1aa..50fe5c54d 100644
--- a/static/citus/v2-chinook-deployment.json
+++ b/static/citus/v2-chinook-deployment.json
@@ -727,6 +727,50 @@
       }
     },
     "compositeTypes": {
+      "committee": {
+        "name": "committee",
+        "fields": {
+          "members": {
+            "name": "members",
+            "type": {
+              "arrayType": {
+                "scalarType": "text"
+              }
+            },
+            "description": null
+          },
+          "name": {
+            "name": "name",
+            "type": {
+              "scalarType": "text"
+            },
+            "description": null
+          }
+        },
+        "description": null
+      },
+      "organization": {
+        "name": "organization",
+        "fields": {
+          "members": {
+            "name": "committees",
+            "type": {
+              "arrayType": {
+                "compositeType": "committee"
+              }
+            },
+            "description": null
+          },
+          "name": {
+            "name": "name",
+            "type": {
+              "scalarType": "text"
+            },
+            "description": null
+          }
+        },
+        "description": null
+      },
       "person": {
         "name": "person",
         "fields": {
@@ -978,6 +1022,32 @@
         },
         "description": null
       },
+      "count_elements": {
+        "sql": "SELECT array_length({{array_argument}}, 1) as result",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "scalarType": "int4"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "array_argument": {
+            "name": "array_argument",
+            "type": {
+              "arrayType": {
+                "scalarType": "text"
+              }
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support array-valued variables"
+      },
       "delete_playlist_track": {
         "sql": "DELETE FROM public.\"PlaylistTrack\" WHERE \"TrackId\" = {{track_id}} RETURNING *",
         "columns": {
@@ -1141,6 +1211,32 @@
         },
         "description": "A native query used to test support for composite types"
       },
+      "summarize_organizations": {
+        "sql": "SELECT 'The organization ' || org.name || ' has ' || no_committees::text || ' committees, ' || 'the largest of which has ' || max_members || ' members.' AS result FROM (SELECT orgs.* FROM unnest({{organizations}}) as orgs) AS org JOIN LATERAL ( SELECT count(committee.*) AS no_committees, max(members_agg.no_members) AS max_members FROM unnest(org.committees) AS committee JOIN LATERAL ( SELECT count(*) as no_members FROM unnest(committee.members) AS members) AS members_agg ON true) AS coms ON true",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "scalarType": "text"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "organizations": {
+            "name": "organizations",
+            "type": {
+              "arrayType": {
+                "compositeType": "organization"
+              }
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support array-valued variables"
+      },
       "value_types": {
         "sql": "SELECT {{bool}} as bool, {{int4}} as int4, {{int2}} as int2, {{int8}} as int8, {{float4}} as float4, {{float8}} as \"float8\", {{numeric}} as numeric, {{char}} as char, {{varchar}} as \"varchar\", {{text}} as text, {{date}} as date, {{time}} as time, {{timetz}} as timetz, {{timestamp}} as timestamp, {{timestamptz}} as timestamptz, {{uuid}} as uuid",
         "columns": {
diff --git a/static/cockroach/v2-chinook-deployment.json b/static/cockroach/v2-chinook-deployment.json
index e94c02aba..b9129ed6d 100644
--- a/static/cockroach/v2-chinook-deployment.json
+++ b/static/cockroach/v2-chinook-deployment.json
@@ -1007,6 +1007,32 @@
         },
         "description": null
       },
+      "count_elements": {
+        "sql": "SELECT array_length({{array_argument}}, 1) as result",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "scalarType": "int4"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "array_argument": {
+            "name": "array_argument",
+            "type": {
+              "arrayType": {
+                "scalarType": "text"
+              }
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support array-valued variables"
+      },
       "delete_playlist_track": {
         "sql": "DELETE FROM public.\"PlaylistTrack\" WHERE \"TrackId\" = {{track_id}} RETURNING *",
         "columns": {
diff --git a/static/composite-types-complex.sql b/static/composite-types-complex.sql
index 217113a3c..f94fec5c4 100644
--- a/static/composite-types-complex.sql
+++ b/static/composite-types-complex.sql
@@ -7,3 +7,16 @@ CREATE TYPE person AS
     name person_name,
     address person_address
   );
+
+CREATE TYPE committee AS
+  (
+    name text,
+    members person_name[]
+  );
+
+CREATE TYPE organization AS
+  (
+    name text,
+    committees committee[]
+  );
+
diff --git a/static/postgres/v2-chinook-deployment.json b/static/postgres/v2-chinook-deployment.json
index d2c01d8d4..97e6561b3 100644
--- a/static/postgres/v2-chinook-deployment.json
+++ b/static/postgres/v2-chinook-deployment.json
@@ -984,6 +984,50 @@
       }
     },
     "compositeTypes": {
+      "committee": {
+        "name": "committee",
+        "fields": {
+          "members": {
+            "name": "members",
+            "type": {
+              "arrayType": {
+                "scalarType": "text"
+              }
+            },
+            "description": null
+          },
+          "name": {
+            "name": "name",
+            "type": {
+              "scalarType": "text"
+            },
+            "description": null
+          }
+        },
+        "description": null
+      },
+      "organization": {
+        "name": "organization",
+        "fields": {
+          "members": {
+            "name": "committees",
+            "type": {
+              "arrayType": {
+                "compositeType": "committee"
+              }
+            },
+            "description": null
+          },
+          "name": {
+            "name": "name",
+            "type": {
+              "scalarType": "text"
+            },
+            "description": null
+          }
+        },
+        "description": null
+      },
       "person": {
         "name": "person",
         "fields": {
@@ -1235,6 +1279,32 @@
         },
         "description": null
       },
+      "count_elements": {
+        "sql": "SELECT array_length({{array_argument}}, 1) as result",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "scalarType": "int4"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "array_argument": {
+            "name": "array_argument",
+            "type": {
+              "arrayType": {
+                "scalarType": "text"
+              }
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support array-valued variables"
+      },
       "delete_playlist_track": {
         "sql": "DELETE FROM public.\"PlaylistTrack\" WHERE \"TrackId\" = {{track_id}} RETURNING *",
         "columns": {
@@ -1398,6 +1468,32 @@
         },
         "description": "A native query used to test support for composite types"
       },
+      "summarize_organizations": {
+        "sql": "SELECT 'The organization ' || org.name || ' has ' || no_committees::text || ' committees, ' || 'the largest of which has ' || max_members || ' members.' AS result FROM (SELECT orgs.* FROM unnest({{organizations}}) as orgs) AS org JOIN LATERAL ( SELECT count(committee.*) AS no_committees, max(members_agg.no_members) AS max_members FROM unnest(org.committees) AS committee JOIN LATERAL ( SELECT count(*) as no_members FROM unnest(committee.members) AS members) AS members_agg ON true) AS coms ON true",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "scalarType": "text"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "organizations": {
+            "name": "organizations",
+            "type": {
+              "arrayType": {
+                "compositeType": "organization"
+              }
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support array-valued variables"
+      },
       "value_types": {
         "sql": "SELECT {{bool}} as bool, {{int4}} as int4, {{int2}} as int2, {{int8}} as int8, {{float4}} as float4, {{float8}} as \"float8\", {{numeric}} as numeric, {{char}} as char, {{varchar}} as \"varchar\", {{text}} as text, {{date}} as date, {{time}} as time, {{timetz}} as timetz, {{timestamp}} as timestamp, {{timestamptz}} as timestamptz, {{uuid}} as uuid",
         "columns": {
diff --git a/static/yugabyte/v2-chinook-deployment.json b/static/yugabyte/v2-chinook-deployment.json
index 88136d127..70f39e149 100644
--- a/static/yugabyte/v2-chinook-deployment.json
+++ b/static/yugabyte/v2-chinook-deployment.json
@@ -727,6 +727,50 @@
       }
     },
     "compositeTypes": {
+      "committee": {
+        "name": "committee",
+        "fields": {
+          "members": {
+            "name": "members",
+            "type": {
+              "arrayType": {
+                "scalarType": "text"
+              }
+            },
+            "description": null
+          },
+          "name": {
+            "name": "name",
+            "type": {
+              "scalarType": "text"
+            },
+            "description": null
+          }
+        },
+        "description": null
+      },
+      "organization": {
+        "name": "organization",
+        "fields": {
+          "members": {
+            "name": "committees",
+            "type": {
+              "arrayType": {
+                "compositeType": "committee"
+              }
+            },
+            "description": null
+          },
+          "name": {
+            "name": "name",
+            "type": {
+              "scalarType": "text"
+            },
+            "description": null
+          }
+        },
+        "description": null
+      },
       "person": {
         "name": "person",
         "fields": {
@@ -978,6 +1022,32 @@
         },
         "description": null
       },
+      "count_elements": {
+        "sql": "SELECT array_length({{array_argument}}, 1) as result",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "scalarType": "int4"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "array_argument": {
+            "name": "array_argument",
+            "type": {
+              "arrayType": {
+                "scalarType": "text"
+              }
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support array-valued variables"
+      },
       "delete_playlist_track": {
         "sql": "DELETE FROM public.\"PlaylistTrack\" WHERE \"TrackId\" = {{track_id}} RETURNING *",
         "columns": {
@@ -1141,6 +1211,32 @@
         },
         "description": "A native query used to test support for composite types"
       },
+      "summarize_organizations": {
+        "sql": "SELECT 'The organization ' || org.name || ' has ' || no_committees::text || ' committees, ' || 'the largest of which has ' || max_members || ' members.' AS result FROM (SELECT orgs.* FROM unnest({{organizations}}) as orgs) AS org JOIN LATERAL ( SELECT count(committee.*) AS no_committees, max(members_agg.no_members) AS max_members FROM unnest(org.committees) AS committee JOIN LATERAL ( SELECT count(*) as no_members FROM unnest(committee.members) AS members) AS members_agg ON true) AS coms ON true",
+        "columns": {
+          "result": {
+            "name": "result",
+            "type": {
+              "scalarType": "text"
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "arguments": {
+          "organizations": {
+            "name": "organizations",
+            "type": {
+              "arrayType": {
+                "compositeType": "organization"
+              }
+            },
+            "nullable": "nullable",
+            "description": null
+          }
+        },
+        "description": "A native query used to test support array-valued variables"
+      },
       "value_types": {
         "sql": "SELECT {{bool}} as bool, {{int4}} as int4, {{int2}} as int2, {{int8}} as int8, {{float4}} as float4, {{float8}} as \"float8\", {{numeric}} as numeric, {{char}} as char, {{varchar}} as \"varchar\", {{text}} as text, {{date}} as date, {{time}} as time, {{timetz}} as timetz, {{timestamp}} as timestamp, {{timestamptz}} as timestamptz, {{uuid}} as uuid",
         "columns": {