kysely 0.24.0 → 0.24.1

package/dist/cjs/helpers/mysql.d.ts

@@ -0,0 +1,140 @@
+import { Expression } from '../expression/expression.js';
+import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
+import { RawBuilder } from '../raw-builder/raw-builder.js';
+import { Simplify } from '../util/type-utils.js';
+/**
+ * A MySQL helper for aggregating a subquery (or other expression) into a JSON array.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into arrays.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonArrayFrom(
+ *       eb.selectFrom('pet')
+ *         .select(['pet.id as pet_id', 'pet.name'])
+ *         .where('pet.owner_id', '=', 'person.id')
+ *         .orderBy('pet.name')
+ *     ).as('pets')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].pets[0].pet_id
+ * result[0].pets[0].name
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select `id`, (
+ *   select cast(coalesce(json_arrayagg(json_object(
+ *     'pet_id', `agg`.`pet_id`,
+ *     'name', `agg`.`name`
+ *   )), '[]') as json) from (
+ *     select `pet`.`id` as `pet_id`, `pet`.`name`
+ *     from `pet`
+ *     where `pet`.`owner_id` = `person`.`id`
+ *     order by `pet`.`name`
+ *   ) as `agg`
+ * ) as `pets`
+ * from `person`
+ * ```
+ */
+export declare function jsonArrayFrom<O>(expr: SelectQueryBuilder<any, any, O>): RawBuilder<Simplify<O>[]>;
+/**
+ * A MySQL helper for turning a subquery (or other expression) into a JSON object.
+ *
+ * The subquery must only return one row.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into objects.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonObjectFrom(
+ *       eb.selectFrom('pet')
+ *         .select(['pet.id as pet_id', 'pet.name'])
+ *         .where('pet.owner_id', '=', 'person.id')
+ *         .where('pet.is_favorite', '=', true)
+ *     ).as('favorite_pet')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].favorite_pet.pet_id
+ * result[0].favorite_pet.name
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select `id`, (
+ *   select json_object(
+ *     'pet_id', `obj`.`pet_id`,
+ *     'name', `obj`.`name`
+ *   ) from (
+ *     select `pet`.`id` as `pet_id`, `pet`.`name`
+ *     from `pet`
+ *     where `pet`.`owner_id` = `person`.`id`
+ *     and `pet`.`is_favorite` = ?
+ *   ) as obj
+ * ) as `favorite_pet`
+ * from `person`
+ * ```
+ */
+export declare function jsonObjectFrom<O>(expr: SelectQueryBuilder<any, any, O>): RawBuilder<Simplify<O>>;
+/**
+ * The MySQL `json_object` function.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into objects.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonBuildObject({
+ *       first: eb.ref('first_name'),
+ *       last: eb.ref('last_name'),
+ *       full: eb.fn('concat', ['first_name', eb.val(' '), 'last_name'])
+ *     }).as('name')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].name.first
+ * result[0].name.last
+ * result[0].name.full
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select "id", json_object(
+ *   'first', first_name,
+ *   'last', last_name,
+ *   'full', concat(`first_name`, ?, `last_name`)
+ * ) as "name"
+ * from "person"
+ * ```
+ */
+export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
+    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+}>>;

package/dist/cjs/helpers/mysql.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.jsonBuildObject = exports.jsonObjectFrom = exports.jsonArrayFrom = void 0;
+const alias_node_js_1 = require("../operation-node/alias-node.js");
+const column_node_js_1 = require("../operation-node/column-node.js");
+const identifier_node_js_1 = require("../operation-node/identifier-node.js");
+const reference_node_js_1 = require("../operation-node/reference-node.js");
+const sql_js_1 = require("../raw-builder/sql.js");
+/**
+ * A MySQL helper for aggregating a subquery (or other expression) into a JSON array.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into arrays.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonArrayFrom(
+ *       eb.selectFrom('pet')
+ *         .select(['pet.id as pet_id', 'pet.name'])
+ *         .where('pet.owner_id', '=', 'person.id')
+ *         .orderBy('pet.name')
+ *     ).as('pets')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].pets[0].pet_id
+ * result[0].pets[0].name
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select `id`, (
+ *   select cast(coalesce(json_arrayagg(json_object(
+ *     'pet_id', `agg`.`pet_id`,
+ *     'name', `agg`.`name`
+ *   )), '[]') as json) from (
+ *     select `pet`.`id` as `pet_id`, `pet`.`name`
+ *     from `pet`
+ *     where `pet`.`owner_id` = `person`.`id`
+ *     order by `pet`.`name`
+ *   ) as `agg`
+ * ) as `pets`
+ * from `person`
+ * ```
+ */
+function jsonArrayFrom(expr) {
+    return (0, sql_js_1.sql) `(select cast(coalesce(json_arrayagg(json_object(${sql_js_1.sql.join(getJsonObjectArgs(expr.toOperationNode(), 'agg'))})), '[]') as json) from ${expr} as agg)`;
+}
+exports.jsonArrayFrom = jsonArrayFrom;
+/**
+ * A MySQL helper for turning a subquery (or other expression) into a JSON object.
+ *
+ * The subquery must only return one row.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into objects.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonObjectFrom(
+ *       eb.selectFrom('pet')
+ *         .select(['pet.id as pet_id', 'pet.name'])
+ *         .where('pet.owner_id', '=', 'person.id')
+ *         .where('pet.is_favorite', '=', true)
+ *     ).as('favorite_pet')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].favorite_pet.pet_id
+ * result[0].favorite_pet.name
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select `id`, (
+ *   select json_object(
+ *     'pet_id', `obj`.`pet_id`,
+ *     'name', `obj`.`name`
+ *   ) from (
+ *     select `pet`.`id` as `pet_id`, `pet`.`name`
+ *     from `pet`
+ *     where `pet`.`owner_id` = `person`.`id`
+ *     and `pet`.`is_favorite` = ?
+ *   ) as obj
+ * ) as `favorite_pet`
+ * from `person`
+ * ```
+ */
+function jsonObjectFrom(expr) {
+    return (0, sql_js_1.sql) `(select json_object(${sql_js_1.sql.join(getJsonObjectArgs(expr.toOperationNode(), 'obj'))}) from ${expr} as obj)`;
+}
+exports.jsonObjectFrom = jsonObjectFrom;
+/**
+ * The MySQL `json_object` function.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into objects.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonBuildObject({
+ *       first: eb.ref('first_name'),
+ *       last: eb.ref('last_name'),
+ *       full: eb.fn('concat', ['first_name', eb.val(' '), 'last_name'])
+ *     }).as('name')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].name.first
+ * result[0].name.last
+ * result[0].name.full
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select "id", json_object(
+ *   'first', first_name,
+ *   'last', last_name,
+ *   'full', concat(`first_name`, ?, `last_name`)
+ * ) as "name"
+ * from "person"
+ * ```
+ */
+function jsonBuildObject(obj) {
+    return (0, sql_js_1.sql) `json_object(${sql_js_1.sql.join(Object.keys(obj).flatMap((k) => [sql_js_1.sql.lit(k), obj[k]]))})`;
+}
+exports.jsonBuildObject = jsonBuildObject;
+function getJsonObjectArgs(node, table) {
+    return node.selections.flatMap(({ selection: s }) => {
+        if (reference_node_js_1.ReferenceNode.is(s) && column_node_js_1.ColumnNode.is(s.column)) {
+            return [
+                sql_js_1.sql.lit(s.column.column.name),
+                sql_js_1.sql.id(table, s.column.column.name),
+            ];
+        }
+        else if (column_node_js_1.ColumnNode.is(s)) {
+            return [sql_js_1.sql.lit(s.column.name), sql_js_1.sql.id(table, s.column.name)];
+        }
+        else if (alias_node_js_1.AliasNode.is(s) && identifier_node_js_1.IdentifierNode.is(s.alias)) {
+            return [sql_js_1.sql.lit(s.alias.name), sql_js_1.sql.id(table, s.alias.name)];
+        }
+        else {
+            throw new Error('MySQL jsonArrayFrom and jsonObjectFrom functions can only handle explicit selections due to limitations of the json_object function. selectAll() is not allowed in the subquery.');
+        }
+    });
+}

package/dist/cjs/helpers/postgres.d.ts

@@ -33,7 +33,7 @@ import { Simplify } from '../util/type-utils.js';
  *
  * ```sql
  * select "id", (
- *   select coalesce(jsonb_agg(agg), '[]') from (
+ *   select coalesce(json_agg(agg), '[]') from (
  *     select "pet"."id" as "pet_id", "pet"."name"
  *     from "pet"
  *     where "pet"."owner_id" = "person"."id"
@@ -45,7 +45,7 @@ import { Simplify } from '../util/type-utils.js';
  */
 export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O>[]>;
 /**
- * A postgres helper for turning a subquery (or other expression) into a JSONB object.
+ * A postgres helper for turning a subquery (or other expression) into a JSON object.
  *
  * The subquery must only return one row.
  *
@@ -78,7 +78,7 @@ export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simpli
  *
  * ```sql
  * select "id", (
- *   select to_jsonb(obj) from (
+ *   select to_json(obj) from (
  *     select "pet"."id" as "pet_id", "pet"."name"
  *     from "pet"
  *     where "pet"."owner_id" = "person"."id"
@@ -90,7 +90,7 @@ export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simpli
  */
 export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O>>;
 /**
- * The PostgreSQL `jsonb_build_object` function.
+ * The PostgreSQL `json_build_object` function.
  *
  * NOTE: This helper is only guaranteed to fully work with the built-in `PostgresDialect`.
  * While the produced SQL is compatibe with all PostgreSQL databases, some 3rd party dialects
@@ -103,7 +103,7 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  *   .selectFrom('person')
  *   .select((eb) => [
  *     'id',
- *     jsonbBuildObject({
+ *     jsonBuildObject({
  *       first: eb.ref('first_name'),
  *       last: eb.ref('last_name'),
  *       full: sql<string>`first_name || ' ' || last_name`
@@ -120,7 +120,7 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  * The generated SQL (PostgreSQL):
  *
  * ```sql
- * select "id", jsonb_build_object(
+ * select "id", json_build_object(
  *   'first', first_name,
  *   'last', last_name,
  *   'full', first_name || ' ' || last_name
@@ -128,6 +128,6 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  * from "person"
  * ```
  */
-export declare function jsonbBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
+export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
     [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
 }>>;

package/dist/cjs/helpers/postgres.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonbBuildObject = exports.jsonObjectFrom = exports.jsonArrayFrom = void 0;
+exports.jsonBuildObject = exports.jsonObjectFrom = exports.jsonArrayFrom = void 0;
 const sql_js_1 = require("../raw-builder/sql.js");
 /**
  * A postgres helper for aggregating a subquery (or other expression) into a JSONB array.
@@ -34,7 +34,7 @@ const sql_js_1 = require("../raw-builder/sql.js");
  *
  * ```sql
  * select "id", (
- *   select coalesce(jsonb_agg(agg), '[]') from (
+ *   select coalesce(json_agg(agg), '[]') from (
  *     select "pet"."id" as "pet_id", "pet"."name"
  *     from "pet"
  *     where "pet"."owner_id" = "person"."id"
@@ -45,11 +45,11 @@ const sql_js_1 = require("../raw-builder/sql.js");
  * ```
  */
 function jsonArrayFrom(expr) {
-    return (0, sql_js_1.sql) `(select coalesce(jsonb_agg(agg), '[]') from ${expr} as agg)`;
+    return (0, sql_js_1.sql) `(select coalesce(json_agg(agg), '[]') from ${expr} as agg)`;
 }
 exports.jsonArrayFrom = jsonArrayFrom;
 /**
- * A postgres helper for turning a subquery (or other expression) into a JSONB object.
+ * A postgres helper for turning a subquery (or other expression) into a JSON object.
  *
  * The subquery must only return one row.
  *
@@ -82,7 +82,7 @@ exports.jsonArrayFrom = jsonArrayFrom;
  *
  * ```sql
  * select "id", (
- *   select to_jsonb(obj) from (
+ *   select to_json(obj) from (
  *     select "pet"."id" as "pet_id", "pet"."name"
  *     from "pet"
  *     where "pet"."owner_id" = "person"."id"
@@ -93,11 +93,11 @@ exports.jsonArrayFrom = jsonArrayFrom;
  * ```
  */
 function jsonObjectFrom(expr) {
-    return (0, sql_js_1.sql) `(select to_jsonb(obj) from ${expr} as obj)`;
+    return (0, sql_js_1.sql) `(select to_json(obj) from ${expr} as obj)`;
 }
 exports.jsonObjectFrom = jsonObjectFrom;
 /**
- * The PostgreSQL `jsonb_build_object` function.
+ * The PostgreSQL `json_build_object` function.
  *
  * NOTE: This helper is only guaranteed to fully work with the built-in `PostgresDialect`.
  * While the produced SQL is compatibe with all PostgreSQL databases, some 3rd party dialects
@@ -110,7 +110,7 @@ exports.jsonObjectFrom = jsonObjectFrom;
  *   .selectFrom('person')
  *   .select((eb) => [
  *     'id',
- *     jsonbBuildObject({
+ *     jsonBuildObject({
  *       first: eb.ref('first_name'),
  *       last: eb.ref('last_name'),
  *       full: sql<string>`first_name || ' ' || last_name`
@@ -127,7 +127,7 @@ exports.jsonObjectFrom = jsonObjectFrom;
  * The generated SQL (PostgreSQL):
  *
  * ```sql
- * select "id", jsonb_build_object(
+ * select "id", json_build_object(
  *   'first', first_name,
  *   'last', last_name,
  *   'full', first_name || ' ' || last_name
@@ -135,7 +135,7 @@ exports.jsonObjectFrom = jsonObjectFrom;
  * from "person"
  * ```
  */
-function jsonbBuildObject(obj) {
-    return (0, sql_js_1.sql) `jsonb_build_object(${sql_js_1.sql.join(Object.keys(obj).flatMap((k) => [sql_js_1.sql.lit(k), obj[k]]))})`;
+function jsonBuildObject(obj) {
+    return (0, sql_js_1.sql) `json_build_object(${sql_js_1.sql.join(Object.keys(obj).flatMap((k) => [sql_js_1.sql.lit(k), obj[k]]))})`;
 }
-exports.jsonbBuildObject = jsonbBuildObject;
+exports.jsonBuildObject = jsonBuildObject;

package/dist/cjs/query-builder/update-query-builder.d.ts

@@ -471,7 +471,7 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
      * any expressions such as raw {@link sql} snippets or select queries.
      *
      * This method also accepts a callback that returns the update object. The
-     * callback takes an instance of `{@link ExpressionBuilder} as its only argument.
+     * callback takes an instance of {@link ExpressionBuilder} as its only argument.
      * The expression builder can be used to create arbitrary update expressions.
      *
      * The return value of an update query is an instance of {@link UpdateResult}.

package/dist/esm/helpers/mysql.d.ts

@@ -0,0 +1,140 @@
+import { Expression } from '../expression/expression.js';
+import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
+import { RawBuilder } from '../raw-builder/raw-builder.js';
+import { Simplify } from '../util/type-utils.js';
+/**
+ * A MySQL helper for aggregating a subquery (or other expression) into a JSON array.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into arrays.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonArrayFrom(
+ *       eb.selectFrom('pet')
+ *         .select(['pet.id as pet_id', 'pet.name'])
+ *         .where('pet.owner_id', '=', 'person.id')
+ *         .orderBy('pet.name')
+ *     ).as('pets')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].pets[0].pet_id
+ * result[0].pets[0].name
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select `id`, (
+ *   select cast(coalesce(json_arrayagg(json_object(
+ *     'pet_id', `agg`.`pet_id`,
+ *     'name', `agg`.`name`
+ *   )), '[]') as json) from (
+ *     select `pet`.`id` as `pet_id`, `pet`.`name`
+ *     from `pet`
+ *     where `pet`.`owner_id` = `person`.`id`
+ *     order by `pet`.`name`
+ *   ) as `agg`
+ * ) as `pets`
+ * from `person`
+ * ```
+ */
+export declare function jsonArrayFrom<O>(expr: SelectQueryBuilder<any, any, O>): RawBuilder<Simplify<O>[]>;
+/**
+ * A MySQL helper for turning a subquery (or other expression) into a JSON object.
+ *
+ * The subquery must only return one row.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into objects.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonObjectFrom(
+ *       eb.selectFrom('pet')
+ *         .select(['pet.id as pet_id', 'pet.name'])
+ *         .where('pet.owner_id', '=', 'person.id')
+ *         .where('pet.is_favorite', '=', true)
+ *     ).as('favorite_pet')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].favorite_pet.pet_id
+ * result[0].favorite_pet.name
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select `id`, (
+ *   select json_object(
+ *     'pet_id', `obj`.`pet_id`,
+ *     'name', `obj`.`name`
+ *   ) from (
+ *     select `pet`.`id` as `pet_id`, `pet`.`name`
+ *     from `pet`
+ *     where `pet`.`owner_id` = `person`.`id`
+ *     and `pet`.`is_favorite` = ?
+ *   ) as obj
+ * ) as `favorite_pet`
+ * from `person`
+ * ```
+ */
+export declare function jsonObjectFrom<O>(expr: SelectQueryBuilder<any, any, O>): RawBuilder<Simplify<O>>;
+/**
+ * The MySQL `json_object` function.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into objects.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonBuildObject({
+ *       first: eb.ref('first_name'),
+ *       last: eb.ref('last_name'),
+ *       full: eb.fn('concat', ['first_name', eb.val(' '), 'last_name'])
+ *     }).as('name')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].name.first
+ * result[0].name.last
+ * result[0].name.full
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select "id", json_object(
+ *   'first', first_name,
+ *   'last', last_name,
+ *   'full', concat(`first_name`, ?, `last_name`)
+ * ) as "name"
+ * from "person"
+ * ```
+ */
+export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
+    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+}>>;

package/dist/esm/helpers/mysql.js

@@ -0,0 +1,165 @@
+/// <reference types="./mysql.d.ts" />
+import { AliasNode } from '../operation-node/alias-node.js';
+import { ColumnNode } from '../operation-node/column-node.js';
+import { IdentifierNode } from '../operation-node/identifier-node.js';
+import { ReferenceNode } from '../operation-node/reference-node.js';
+import { sql } from '../raw-builder/sql.js';
+/**
+ * A MySQL helper for aggregating a subquery (or other expression) into a JSON array.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into arrays.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonArrayFrom(
+ *       eb.selectFrom('pet')
+ *         .select(['pet.id as pet_id', 'pet.name'])
+ *         .where('pet.owner_id', '=', 'person.id')
+ *         .orderBy('pet.name')
+ *     ).as('pets')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].pets[0].pet_id
+ * result[0].pets[0].name
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select `id`, (
+ *   select cast(coalesce(json_arrayagg(json_object(
+ *     'pet_id', `agg`.`pet_id`,
+ *     'name', `agg`.`name`
+ *   )), '[]') as json) from (
+ *     select `pet`.`id` as `pet_id`, `pet`.`name`
+ *     from `pet`
+ *     where `pet`.`owner_id` = `person`.`id`
+ *     order by `pet`.`name`
+ *   ) as `agg`
+ * ) as `pets`
+ * from `person`
+ * ```
+ */
+export function jsonArrayFrom(expr) {
+    return sql `(select cast(coalesce(json_arrayagg(json_object(${sql.join(getJsonObjectArgs(expr.toOperationNode(), 'agg'))})), '[]') as json) from ${expr} as agg)`;
+}
+/**
+ * A MySQL helper for turning a subquery (or other expression) into a JSON object.
+ *
+ * The subquery must only return one row.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into objects.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonObjectFrom(
+ *       eb.selectFrom('pet')
+ *         .select(['pet.id as pet_id', 'pet.name'])
+ *         .where('pet.owner_id', '=', 'person.id')
+ *         .where('pet.is_favorite', '=', true)
+ *     ).as('favorite_pet')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].favorite_pet.pet_id
+ * result[0].favorite_pet.name
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select `id`, (
+ *   select json_object(
+ *     'pet_id', `obj`.`pet_id`,
+ *     'name', `obj`.`name`
+ *   ) from (
+ *     select `pet`.`id` as `pet_id`, `pet`.`name`
+ *     from `pet`
+ *     where `pet`.`owner_id` = `person`.`id`
+ *     and `pet`.`is_favorite` = ?
+ *   ) as obj
+ * ) as `favorite_pet`
+ * from `person`
+ * ```
+ */
+export function jsonObjectFrom(expr) {
+    return sql `(select json_object(${sql.join(getJsonObjectArgs(expr.toOperationNode(), 'obj'))}) from ${expr} as obj)`;
+}
+/**
+ * The MySQL `json_object` function.
+ *
+ * NOTE: This helper is only guaranteed to fully work with the built-in `MysqlDialect`.
+ * While the produced SQL is compatibe with all MySQL databases, some 3rd party dialects
+ * may not parse the nested results into objects.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * const result = await db
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonBuildObject({
+ *       first: eb.ref('first_name'),
+ *       last: eb.ref('last_name'),
+ *       full: eb.fn('concat', ['first_name', eb.val(' '), 'last_name'])
+ *     }).as('name')
+ *   ])
+ *   .execute()
+ *
+ * result[0].id
+ * result[0].name.first
+ * result[0].name.last
+ * result[0].name.full
+ * ```
+ *
+ * The generated SQL (MySQL):
+ *
+ * ```sql
+ * select "id", json_object(
+ *   'first', first_name,
+ *   'last', last_name,
+ *   'full', concat(`first_name`, ?, `last_name`)
+ * ) as "name"
+ * from "person"
+ * ```
+ */
+export function jsonBuildObject(obj) {
+    return sql `json_object(${sql.join(Object.keys(obj).flatMap((k) => [sql.lit(k), obj[k]]))})`;
+}
+function getJsonObjectArgs(node, table) {
+    return node.selections.flatMap(({ selection: s }) => {
+        if (ReferenceNode.is(s) && ColumnNode.is(s.column)) {
+            return [
+                sql.lit(s.column.column.name),
+                sql.id(table, s.column.column.name),
+            ];
+        }
+        else if (ColumnNode.is(s)) {
+            return [sql.lit(s.column.name), sql.id(table, s.column.name)];
+        }
+        else if (AliasNode.is(s) && IdentifierNode.is(s.alias)) {
+            return [sql.lit(s.alias.name), sql.id(table, s.alias.name)];
+        }
+        else {
+            throw new Error('MySQL jsonArrayFrom and jsonObjectFrom functions can only handle explicit selections due to limitations of the json_object function. selectAll() is not allowed in the subquery.');
+        }
+    });
+}

package/dist/esm/helpers/postgres.d.ts

@@ -33,7 +33,7 @@ import { Simplify } from '../util/type-utils.js';
  *
  * ```sql
  * select "id", (
- *   select coalesce(jsonb_agg(agg), '[]') from (
+ *   select coalesce(json_agg(agg), '[]') from (
  *     select "pet"."id" as "pet_id", "pet"."name"
  *     from "pet"
  *     where "pet"."owner_id" = "person"."id"
@@ -45,7 +45,7 @@ import { Simplify } from '../util/type-utils.js';
  */
 export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O>[]>;
 /**
- * A postgres helper for turning a subquery (or other expression) into a JSONB object.
+ * A postgres helper for turning a subquery (or other expression) into a JSON object.
  *
  * The subquery must only return one row.
  *
@@ -78,7 +78,7 @@ export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simpli
  *
  * ```sql
  * select "id", (
- *   select to_jsonb(obj) from (
+ *   select to_json(obj) from (
  *     select "pet"."id" as "pet_id", "pet"."name"
  *     from "pet"
  *     where "pet"."owner_id" = "person"."id"
@@ -90,7 +90,7 @@ export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simpli
  */
 export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O>>;
 /**
- * The PostgreSQL `jsonb_build_object` function.
+ * The PostgreSQL `json_build_object` function.
  *
  * NOTE: This helper is only guaranteed to fully work with the built-in `PostgresDialect`.
  * While the produced SQL is compatibe with all PostgreSQL databases, some 3rd party dialects
@@ -103,7 +103,7 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  *   .selectFrom('person')
  *   .select((eb) => [
  *     'id',
- *     jsonbBuildObject({
+ *     jsonBuildObject({
  *       first: eb.ref('first_name'),
  *       last: eb.ref('last_name'),
  *       full: sql<string>`first_name || ' ' || last_name`
@@ -120,7 +120,7 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  * The generated SQL (PostgreSQL):
  *
  * ```sql
- * select "id", jsonb_build_object(
+ * select "id", json_build_object(
  *   'first', first_name,
  *   'last', last_name,
  *   'full', first_name || ' ' || last_name
@@ -128,6 +128,6 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  * from "person"
  * ```
  */
-export declare function jsonbBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
+export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
     [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
 }>>;

package/dist/esm/helpers/postgres.js

@@ -32,7 +32,7 @@ import { sql } from '../raw-builder/sql.js';
  *
  * ```sql
  * select "id", (
- *   select coalesce(jsonb_agg(agg), '[]') from (
+ *   select coalesce(json_agg(agg), '[]') from (
  *     select "pet"."id" as "pet_id", "pet"."name"
  *     from "pet"
  *     where "pet"."owner_id" = "person"."id"
@@ -43,10 +43,10 @@ import { sql } from '../raw-builder/sql.js';
  * ```
  */
 export function jsonArrayFrom(expr) {
-    return sql `(select coalesce(jsonb_agg(agg), '[]') from ${expr} as agg)`;
+    return sql `(select coalesce(json_agg(agg), '[]') from ${expr} as agg)`;
 }
 /**
- * A postgres helper for turning a subquery (or other expression) into a JSONB object.
+ * A postgres helper for turning a subquery (or other expression) into a JSON object.
  *
  * The subquery must only return one row.
  *
@@ -79,7 +79,7 @@ export function jsonArrayFrom(expr) {
  *
  * ```sql
  * select "id", (
- *   select to_jsonb(obj) from (
+ *   select to_json(obj) from (
  *     select "pet"."id" as "pet_id", "pet"."name"
  *     from "pet"
  *     where "pet"."owner_id" = "person"."id"
@@ -90,10 +90,10 @@ export function jsonArrayFrom(expr) {
  * ```
  */
 export function jsonObjectFrom(expr) {
-    return sql `(select to_jsonb(obj) from ${expr} as obj)`;
+    return sql `(select to_json(obj) from ${expr} as obj)`;
 }
 /**
- * The PostgreSQL `jsonb_build_object` function.
+ * The PostgreSQL `json_build_object` function.
  *
  * NOTE: This helper is only guaranteed to fully work with the built-in `PostgresDialect`.
  * While the produced SQL is compatibe with all PostgreSQL databases, some 3rd party dialects
@@ -106,7 +106,7 @@ export function jsonObjectFrom(expr) {
  *   .selectFrom('person')
  *   .select((eb) => [
  *     'id',
- *     jsonbBuildObject({
+ *     jsonBuildObject({
  *       first: eb.ref('first_name'),
  *       last: eb.ref('last_name'),
  *       full: sql<string>`first_name || ' ' || last_name`
@@ -123,7 +123,7 @@ export function jsonObjectFrom(expr) {
  * The generated SQL (PostgreSQL):
  *
  * ```sql
- * select "id", jsonb_build_object(
+ * select "id", json_build_object(
  *   'first', first_name,
  *   'last', last_name,
  *   'full', first_name || ' ' || last_name
@@ -131,6 +131,6 @@ export function jsonObjectFrom(expr) {
  * from "person"
  * ```
  */
-export function jsonbBuildObject(obj) {
-    return sql `jsonb_build_object(${sql.join(Object.keys(obj).flatMap((k) => [sql.lit(k), obj[k]]))})`;
+export function jsonBuildObject(obj) {
+    return sql `json_build_object(${sql.join(Object.keys(obj).flatMap((k) => [sql.lit(k), obj[k]]))})`;
 }

package/dist/esm/query-builder/update-query-builder.d.ts

@@ -471,7 +471,7 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
      * any expressions such as raw {@link sql} snippets or select queries.
      *
      * This method also accepts a callback that returns the update object. The
-     * callback takes an instance of `{@link ExpressionBuilder} as its only argument.
+     * callback takes an instance of {@link ExpressionBuilder} as its only argument.
      * The expression builder can be used to create arbitrary update expressions.
      *
      * The return value of an update query is an instance of {@link UpdateResult}.

package/helpers/mysql.d.ts

@@ -0,0 +1 @@
+export * from '../dist/cjs/helpers/mysql.js'

package/helpers/mysql.js

@@ -0,0 +1 @@
+module.exports = require('../dist/cjs/helpers/mysql.js')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kysely",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "description": "Type safe SQL query builder",
   "repository": {
     "type": "git",
@@ -21,6 +21,11 @@
       "import": "./dist/esm/helpers/postgres.js",
       "require": "./dist/cjs/helpers/postgres.js",
       "default": "./dist/cjs/helpers/postgres.js"
+    },
+    "./helpers/mysql": {
+      "import": "./dist/esm/helpers/mysql.js",
+      "require": "./dist/cjs/helpers/mysql.js",
+      "default": "./dist/cjs/helpers/mysql.js"
     }
   },
   "scripts": {
@@ -60,6 +65,7 @@
     "@types/chai-as-promised": "^7.1.5",
     "@types/chai-subset": "^1.3.3",
     "@types/mocha": "^9.1.1",
+    "@types/node": "^18.15.11",
     "@types/pg": "^8.6.5",
     "@types/pg-cursor": "^2.7.0",
     "@types/sinon": "^10.0.13",