kysely 0.23.4 → 0.23.5

package/README.md

@@ -78,6 +78,8 @@ for [3rd party dialects](https://koskimas.github.io/kysely/interfaces/Dialect.ht
  - [SingleStore Data API](https://github.com/igalklebanov/kysely-singlestore)
  - [D1](https://github.com/aidenwallis/kysely-d1)
  - [SurrealDB](https://github.com/igalklebanov/kysely-surrealdb)
+ - [sqld](https://github.com/libsql/kysely-libsql)
+ - [Neon](https://github.com/seveibar/kysely-neon)
 
 # Minimal example
 
@@ -183,7 +185,7 @@ type UpdateablePerson = Updateable<PersonTable>
 
 # Playground
 
-[@wirekang](https://github.com/wirekang) has created a [playground for Kysely](https://wirekang.github.io/kysely-playground/#eyJkaWFsZWN0IjoibXlzcWwiLCJ0cyI6ImludGVyZmFjZSBEQiB7XG4gIHVzZXI6IFVzZXJUYWJsZVxufVxuXG5pbnRlcmZhY2UgVXNlclRhYmxlIHtcbiAgaWQ6IEdlbmVyYXRlZDxzdHJpbmc+XG4gIGZpcnN0X25hbWU6IHN0cmluZyB8IG51bGxcbiAgbGFzdF9uYW1lOiBzdHJpbmcgfCBudWxsXG4gIGNyZWF0ZWRfYXQ6IEdlbmVyYXRlZDxEYXRlPlxufVxuXG5yZXN1bHQgPSBreXNlbHlcbiAgLnNlbGVjdEZyb20oXCJ1c2VyXCIpXG4gIC5zZWxlY3RBbGwoKVxuICAub3JkZXJCeShcImNyZWF0ZWRfYXRcIikifQ==). You can use to quickly test stuff out and for creating code examples for your issues, PRs and discord messages.
+[@wirekang](https://github.com/wirekang) has created a [playground for Kysely](https://wirekang.github.io/kysely-playground/?p=f&i=-NLp3n_P5fyeQKMQda8n). You can use to quickly test stuff out and for creating code examples for your issues, PRs and discord messages.
 
 # Generating types
 

package/dist/cjs/dialect/database-introspector.d.ts

@@ -7,7 +7,7 @@ export interface DatabaseIntrospector {
      */
     getSchemas(): Promise<SchemaMetadata[]>;
     /**
-     * Get table metadata.
+     * Get tables and views metadata.
      */
     getTables(options?: DatabaseMetadataOptions): Promise<TableMetadata[]>;
     /**
@@ -29,12 +29,14 @@ export interface SchemaMetadata {
 }
 export interface DatabaseMetadata {
     /**
-     * The tables found in the database.
+     * The tables and views found in the database.
+  *  * The propery isView can be used to tell them apart.
      */
     readonly tables: TableMetadata[];
 }
 export interface TableMetadata {
     readonly name: string;
+    readonly isView: boolean;
     readonly columns: ColumnMetadata[];
     readonly schema?: string;
 }

package/dist/cjs/dialect/mysql/mysql-introspector.d.ts

@@ -8,7 +8,7 @@ export declare class MysqlIntrospector implements DatabaseIntrospector {
      */
     getSchemas(): Promise<SchemaMetadata[]>;
     /**
-     * Get table metadata.
+     * Get tables and views metadata.
      */
     getTables(options?: DatabaseMetadataOptions): Promise<TableMetadata[]>;
     /**

package/dist/cjs/dialect/mysql/mysql-introspector.js

@@ -19,24 +19,29 @@ class MysqlIntrospector {
     }
     async getTables(options = { withInternalKyselyTables: false }) {
         let query = this.#db
-            .selectFrom('information_schema.columns')
+            .selectFrom('information_schema.columns as columns')
+            .innerJoin('information_schema.tables as tables', (b) => b
+            .onRef('columns.TABLE_CATALOG', '=', 'tables.TABLE_CATALOG')
+            .onRef('columns.TABLE_SCHEMA', '=', 'tables.TABLE_SCHEMA')
+            .onRef('columns.TABLE_NAME', '=', 'tables.TABLE_NAME'))
             .select([
-            'COLUMN_NAME',
-            'COLUMN_DEFAULT',
-            'TABLE_NAME',
-            'TABLE_SCHEMA',
-            'IS_NULLABLE',
-            'DATA_TYPE',
-            'EXTRA',
+            'columns.COLUMN_NAME',
+            'columns.COLUMN_DEFAULT',
+            'columns.TABLE_NAME',
+            'columns.TABLE_SCHEMA',
+            'tables.TABLE_TYPE',
+            'columns.IS_NULLABLE',
+            'columns.DATA_TYPE',
+            'columns.EXTRA',
         ])
-            .where('table_schema', '=', (0, sql_js_1.sql) `database()`)
-            .orderBy('table_name')
-            .orderBy('ordinal_position')
+            .where('columns.TABLE_SCHEMA', '=', (0, sql_js_1.sql) `database()`)
+            .orderBy('columns.TABLE_NAME')
+            .orderBy('columns.ORDINAL_POSITION')
             .$castTo();
         if (!options.withInternalKyselyTables) {
             query = query
-                .where('table_name', '!=', migrator_js_1.DEFAULT_MIGRATION_TABLE)
-                .where('table_name', '!=', migrator_js_1.DEFAULT_MIGRATION_LOCK_TABLE);
+                .where('columns.TABLE_NAME', '!=', migrator_js_1.DEFAULT_MIGRATION_TABLE)
+                .where('columns.TABLE_NAME', '!=', migrator_js_1.DEFAULT_MIGRATION_LOCK_TABLE);
         }
         const rawColumns = await query.execute();
         return this.#parseTableMetadata(rawColumns);
@@ -52,6 +57,7 @@ class MysqlIntrospector {
             if (!table) {
                 table = (0, object_utils_js_1.freeze)({
                     name: it.TABLE_NAME,
+                    isView: it.TABLE_TYPE === 'VIEW',
                     schema: it.TABLE_SCHEMA,
                     columns: [],
                 });

package/dist/cjs/dialect/postgres/postgres-introspector.d.ts

@@ -8,7 +8,7 @@ export declare class PostgresIntrospector implements DatabaseIntrospector {
      */
     getSchemas(): Promise<SchemaMetadata[]>;
     /**
-     * Get table metadata.
+     * Get tables and views metadata.
      */
     getTables(options?: DatabaseMetadataOptions): Promise<TableMetadata[]>;
     /**

package/dist/cjs/dialect/postgres/postgres-introspector.js

@@ -34,6 +34,7 @@ class PostgresIntrospector {
             'a.attnotnull as not_null',
             'a.atthasdef as has_default',
             'c.relname as table',
+            'c.relkind as table_type',
             'ns.nspname as schema',
             'typ.typname as type',
             'dtns.nspname as type_schema',
@@ -49,7 +50,7 @@ class PostgresIntrospector {
                 .as('auto_incrementing'),
         ])
             // r == normal table
-            .where('c.relkind', '=', 'r')
+            .where('c.relkind', 'in', ['r', 'v'])
             .where('ns.nspname', '!~', '^pg_')
             .where('ns.nspname', '!=', 'information_schema')
             // No system columns
@@ -78,6 +79,7 @@ class PostgresIntrospector {
             if (!table) {
                 table = (0, object_utils_js_1.freeze)({
                     name: it.table,
+                    isView: it.table_type === 'v',
                     schema: it.schema,
                     columns: [],
                 });

package/dist/cjs/dialect/sqlite/sqlite-introspector.d.ts

@@ -8,7 +8,7 @@ export declare class SqliteIntrospector implements DatabaseIntrospector {
      */
     getSchemas(): Promise<SchemaMetadata[]>;
     /**
-     * Get table metadata.
+     * Get tables and views metadata.
      */
     getTables(options?: DatabaseMetadataOptions): Promise<TableMetadata[]>;
     /**

package/dist/cjs/dialect/sqlite/sqlite-introspector.js

@@ -15,7 +15,7 @@ class SqliteIntrospector {
     async getTables(options = { withInternalKyselyTables: false }) {
         let query = this.#db
             .selectFrom('sqlite_schema')
-            .where('type', '=', 'table')
+            .where('type', 'in', ['table', 'view'])
             .where('name', 'not like', 'sqlite_%')
             .select('name')
             .orderBy('name')
@@ -36,14 +36,14 @@ class SqliteIntrospector {
     async #getTableMetadata(table) {
         const db = this.#db;
         // Get the SQL that was used to create the table.
-        const createSql = await db
+        const tableDefinition = await db
             .selectFrom('sqlite_master')
             .where('name', '=', table)
-            .select('sql')
+            .select(['sql', 'type'])
             .$castTo()
-            .execute();
+            .executeTakeFirstOrThrow();
         // Try to find the name of the column that has `autoincrement` 🤦
-        const autoIncrementCol = createSql[0]?.sql
+        const autoIncrementCol = tableDefinition.sql
             ?.split(/[\(\),]/)
             ?.find((it) => it.toLowerCase().includes('autoincrement'))
             ?.trimStart()
@@ -56,6 +56,7 @@ class SqliteIntrospector {
             .execute();
         return {
             name: table,
+            isView: tableDefinition.type === 'view',
             columns: columns.map((col) => ({
                 name: col.name,
                 dataType: col.type,

package/dist/cjs/operation-node/aggregate-function-node.d.ts

@@ -1,12 +1,13 @@
 import { OperationNode } from './operation-node.js';
 import { OverNode } from './over-node.js';
+import { SelectAllNode } from './select-all-node.js';
 import { SimpleReferenceExpressionNode } from './simple-reference-expression-node.js';
 import { WhereNode } from './where-node.js';
 declare type AggregateFunction = 'avg' | 'count' | 'max' | 'min' | 'sum';
 export interface AggregateFunctionNode extends OperationNode {
     readonly kind: 'AggregateFunctionNode';
     readonly func: AggregateFunction;
-    readonly column: SimpleReferenceExpressionNode;
+    readonly aggregated: SimpleReferenceExpressionNode | SelectAllNode;
     readonly distinct?: boolean;
     readonly filter?: WhereNode;
     readonly over?: OverNode;
@@ -16,7 +17,7 @@ export interface AggregateFunctionNode extends OperationNode {
  */
 export declare const AggregateFunctionNode: Readonly<{
     is(node: OperationNode): node is AggregateFunctionNode;
-    create(aggregateFunction: AggregateFunction, column: SimpleReferenceExpressionNode): AggregateFunctionNode;
+    create(aggregateFunction: AggregateFunction, aggregated: SimpleReferenceExpressionNode | SelectAllNode): AggregateFunctionNode;
     cloneWithDistinct(aggregateFunctionNode: AggregateFunctionNode): AggregateFunctionNode;
     cloneWithFilter(aggregateFunctionNode: AggregateFunctionNode, filter: OperationNode): AggregateFunctionNode;
     cloneWithOrFilter(aggregateFunctionNode: AggregateFunctionNode, filter: OperationNode): AggregateFunctionNode;

package/dist/cjs/operation-node/aggregate-function-node.js

@@ -10,11 +10,11 @@ exports.AggregateFunctionNode = (0, object_utils_js_1.freeze)({
     is(node) {
         return node.kind === 'AggregateFunctionNode';
     },
-    create(aggregateFunction, column) {
+    create(aggregateFunction, aggregated) {
         return (0, object_utils_js_1.freeze)({
             kind: 'AggregateFunctionNode',
             func: aggregateFunction,
-            column,
+            aggregated,
         });
     },
     cloneWithDistinct(aggregateFunctionNode) {

package/dist/cjs/operation-node/delete-query-node.d.ts

@@ -26,7 +26,7 @@ export interface DeleteQueryNode extends OperationNode {
  */
 export declare const DeleteQueryNode: Readonly<{
     is(node: OperationNode): node is DeleteQueryNode;
-    create(fromItem: OperationNode, withNode?: WithNode): DeleteQueryNode;
+    create(fromItems: OperationNode[], withNode?: WithNode): DeleteQueryNode;
     cloneWithOrderByItem(deleteNode: DeleteQueryNode, item: OrderByItemNode): DeleteQueryNode;
     cloneWithLimit(deleteNode: DeleteQueryNode, limit: LimitNode): DeleteQueryNode;
     cloneWithExplain(deleteNode: DeleteQueryNode, explain: ExplainNode): DeleteQueryNode;

package/dist/cjs/operation-node/delete-query-node.js

@@ -12,10 +12,10 @@ exports.DeleteQueryNode = (0, object_utils_js_1.freeze)({
     is(node) {
         return node.kind === 'DeleteQueryNode';
     },
-    create(fromItem, withNode) {
+    create(fromItems, withNode) {
         return (0, object_utils_js_1.freeze)({
             kind: 'DeleteQueryNode',
-            from: from_node_js_1.FromNode.create([fromItem]),
+            from: from_node_js_1.FromNode.create(fromItems),
             ...(withNode && { with: withNode }),
         });
     },

package/dist/cjs/operation-node/operation-node-transformer.js

@@ -651,7 +651,7 @@ class OperationNodeTransformer {
     transformAggregateFunction(node) {
         return (0, require_all_props_js_1.requireAllProps)({
             kind: 'AggregateFunctionNode',
-            column: this.transformNode(node.column),
+            aggregated: this.transformNode(node.aggregated),
             distinct: node.distinct,
             filter: this.transformNode(node.filter),
             func: node.func,
@@ -695,7 +695,7 @@ class OperationNodeTransformer {
     transformUsing(node) {
         return (0, require_all_props_js_1.requireAllProps)({
             kind: 'UsingNode',
-            tables: node.tables,
+            tables: this.transformNodeList(node.tables),
         });
     }
     transformDataType(node) {

package/dist/cjs/parser/expression-parser.js

@@ -26,6 +26,6 @@ function parseAliasedExpression(exp) {
 }
 exports.parseAliasedExpression = parseAliasedExpression;
 function isExpressionOrFactory(obj) {
-    return (0, expression_js_1.isExpression)(obj) || (0, object_utils_js_1.isFunction)(obj);
+    return (0, expression_js_1.isExpression)(obj) || (0, expression_js_1.isAliasedExpression)(obj) || (0, object_utils_js_1.isFunction)(obj);
 }
 exports.isExpressionOrFactory = isExpressionOrFactory;

package/dist/cjs/parser/table-parser.d.ts

@@ -6,6 +6,7 @@ import { AliasedExpression } from '../expression/expression.js';
 export declare type TableExpression<DB, TB extends keyof DB> = TableReference<DB> | AliasedExpressionOrFactory<DB, TB>;
 export declare type TableExpressionOrList<DB, TB extends keyof DB> = TableExpression<DB, TB> | ReadonlyArray<TableExpression<DB, TB>>;
 export declare type TableReference<DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpression<any, any>;
+export declare type TableReferenceOrList<DB> = TableReference<DB> | ReadonlyArray<TableReference<DB>>;
 export declare type From<DB, TE> = {
     [C in keyof DB | ExtractAliasFromTableExpression<DB, TE>]: C extends ExtractAliasFromTableExpression<DB, TE> ? ExtractRowTypeFromTableExpression<DB, TE, C> : C extends keyof DB ? DB[C] : never;
 };

package/dist/cjs/plugin/camel-case/camel-case-plugin.d.ts

@@ -26,6 +26,12 @@ export interface CamelCasePluginOptions {
      * Defaults to false.
      */
     underscoreBetweenUppercaseLetters?: boolean;
+    /**
+     * If true, nested object's keys will not be converted to camel case.
+     *
+     * Defaults to false.
+     */
+    maintainNestedObjectKeys?: boolean;
 }
 /**
  * A plugin that converts snake_case identifiers in the database into
@@ -93,6 +99,7 @@ export interface CamelCasePluginOptions {
  */
 export declare class CamelCasePlugin implements KyselyPlugin {
     #private;
+    readonly opt: CamelCasePluginOptions;
     constructor(opt?: CamelCasePluginOptions);
     /**
      * This is called for each query before it is executed. You can modify the query by

package/dist/cjs/plugin/camel-case/camel-case-plugin.js

@@ -69,10 +69,12 @@ const camel_case_js_1 = require("./camel-case.js");
  * ```
  */
 class CamelCasePlugin {
+    opt;
     #camelCase;
     #snakeCase;
     #snakeCaseTransformer;
     constructor(opt = {}) {
+        this.opt = opt;
         this.#camelCase = (0, camel_case_js_1.createCamelCaseMapper)(opt);
         this.#snakeCase = (0, camel_case_js_1.createSnakeCaseMapper)(opt);
         this.#snakeCaseTransformer = new camel_case_transformer_js_1.SnakeCaseTransformer(this.snakeCase.bind(this));
@@ -93,9 +95,9 @@ class CamelCasePlugin {
         return Object.keys(row).reduce((obj, key) => {
             let value = row[key];
             if (Array.isArray(value)) {
-                value = value.map((it) => (canMap(it) ? this.mapRow(it) : it));
+                value = value.map((it) => (canMap(it, this.opt) ? this.mapRow(it) : it));
             }
-            else if (canMap(value)) {
+            else if (canMap(value, this.opt)) {
                 value = this.mapRow(value);
             }
             obj[this.camelCase(key)] = value;
@@ -110,6 +112,10 @@ class CamelCasePlugin {
     }
 }
 exports.CamelCasePlugin = CamelCasePlugin;
-function canMap(obj) {
-    return ((0, object_utils_js_1.isObject)(obj) && !(0, object_utils_js_1.isDate)(obj) && !(0, object_utils_js_1.isBuffer)(obj) && !(0, object_utils_js_1.isArrayBufferOrView)(obj));
+function canMap(obj, opt) {
+    return ((0, object_utils_js_1.isObject)(obj) &&
+        !(0, object_utils_js_1.isDate)(obj) &&
+        !(0, object_utils_js_1.isBuffer)(obj) &&
+        !(0, object_utils_js_1.isArrayBufferOrView)(obj) &&
+        !opt?.maintainNestedObjectKeys);
 }

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

@@ -5,7 +5,7 @@ import { From, FromTables, TableExpression } from '../parser/table-parser.js';
 import { SelectExpression } from '../parser/select-parser.js';
 import { ReturningRow } from '../parser/returning-parser.js';
 import { ReferenceExpression } from '../parser/reference-parser.js';
-import { MergePartial, Nullable, SingleResultType } from '../util/type-utils.js';
+import { MergePartial, Nullable, SimplifyResult, SimplifySingleResult } from '../util/type-utils.js';
 import { Compilable } from '../util/compilable.js';
 import { QueryExecutor } from '../query-executor/query-executor.js';
 import { QueryId } from '../util/query-id.js';
@@ -878,18 +878,18 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      */
     withPlugin(plugin: KyselyPlugin): DeleteQueryBuilder<DB, TB, O>;
     toOperationNode(): DeleteQueryNode;
-    compile(): CompiledQuery<O>;
+    compile(): CompiledQuery<SimplifyResult<O>>;
     /**
      * Executes the query and returns an array of rows.
      *
      * Also see the {@link executeTakeFirst} and {@link executeTakeFirstOrThrow} methods.
      */
-    execute(): Promise<O[]>;
+    execute(): Promise<SimplifyResult<O>[]>;
     /**
      * Executes the query and returns the first result or undefined if
      * the query returned no result.
      */
-    executeTakeFirst(): Promise<SingleResultType<O>>;
+    executeTakeFirst(): Promise<SimplifySingleResult<O>>;
     /**
      * Executes the query and returns the first result or throws if
      * the query returned no result.
@@ -898,7 +898,7 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      * provide a custom error class as the only argument to throw a different
      * error.
      */
-    executeTakeFirstOrThrow(errorConstructor?: NoResultErrorConstructor): Promise<O>;
+    executeTakeFirstOrThrow(errorConstructor?: NoResultErrorConstructor): Promise<SimplifyResult<O>>;
     /**
      * Executes query with `explain` statement before `delete` keyword.
      *

package/dist/cjs/query-builder/delete-query-builder.js

@@ -354,7 +354,7 @@ class DeleteQueryBuilder {
         return [
             new delete_result_js_1.DeleteResult(
             // TODO: remove numUpdatedOrDeletedRows.
-            (result.numAffectedRows ?? result.numUpdatedOrDeletedRows)),
+            result.numAffectedRows ?? result.numUpdatedOrDeletedRows ?? 0n),
         ];
     }
     /**