kysely 0.19.0 → 0.19.3

package/README.md

@@ -95,7 +95,7 @@ interface PersonTable {
   // automatically by Kysely.
   last_name: string | null
 
-  // You can specity a different type for each operation (select, insert and
+  // You can specify a different type for each operation (select, insert and
   // update) using the `ColumnType<SelectType, InsertType, UpdateType>`
   // wrapper. Here we define a column `modified_at` that is selected as
   // a `Date`, can optionally be provided as a `string` in inserts and
@@ -324,7 +324,7 @@ have. You will probably want to add a simple migration script to your projects l
 ```ts
 import * as path from 'path'
 import { Pool } from 'pg'
-import { promises: fs } from 'fs'
+import { promises as fs } from 'fs'
 import {
   Kysely,
   Migrator,

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

@@ -11,11 +11,6 @@ export declare class MysqlDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlIntrospector = void 0;
 const migrator_js_1 = require("../../migration/migrator.js");
 const object_utils_js_1 = require("../../util/object-utils.js");
+const sql_js_1 = require("../../raw-builder/sql.js");
 class MysqlIntrospector {
     #db;
     constructor(db) {
@@ -26,12 +27,7 @@ class MysqlIntrospector {
             'is_nullable',
             'data_type',
         ])
-            .where('table_schema', 'not in', [
-            'information_schema',
-            'performance_schema',
-            'mysql',
-            'sys',
-        ])
+            .where('table_schema', '=', (0, sql_js_1.sql) `database()`)
             .castTo();
         if (!options.withInternalKyselyTables) {
             query = query

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

@@ -11,11 +11,6 @@ export declare class PostgresDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

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

@@ -9,11 +9,6 @@ export declare class SqliteDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

package/dist/cjs/driver/driver.d.ts

@@ -10,11 +10,6 @@ export interface Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

package/dist/cjs/driver/dummy-driver.d.ts

@@ -42,11 +42,6 @@ export declare class DummyDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

package/dist/cjs/driver/runtime-driver.d.ts

@@ -14,11 +14,6 @@ export declare class RuntimeDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

package/dist/cjs/migration/file-migration-provider.js

@@ -27,9 +27,10 @@ class FileMigrationProvider {
         const migrations = {};
         const files = await this.#props.fs.readdir(this.#props.migrationFolder);
         for (const fileName of files) {
-            if ((fileName.endsWith('.js') || fileName.endsWith('.ts')) &&
+            if ((fileName.endsWith('.js') || fileName.endsWith('.ts') || fileName.endsWith('.mjs')) &&
                 !fileName.endsWith('.d.ts')) {
-                const migration = await Promise.resolve().then(() => require(this.#props.path.join(this.#props.migrationFolder, fileName)));
+                const migration = await Promise.resolve().then(() => require(
+                /* webpackIgnore: true */ this.#props.path.join(this.#props.migrationFolder, fileName)));
                 if (isMigration(migration)) {
                     migrations[fileName.substring(0, fileName.length - 3)] = migration;
                 }

package/dist/cjs/migration/migrator.d.ts

@@ -188,6 +188,8 @@ export interface MigratorProps {
      * If you do specify this, ALWAYS ALWAYS use the same value from the beginning of
      * the project, to the end of time or prepare to manually migrate the migration
      * tables.
+     *
+     * This only works on postgres.
      */
     readonly migrationTableSchema?: string;
 }

package/dist/cjs/operation-node/drop-constraint-node.d.ts

@@ -1,8 +1,11 @@
 import { OperationNode } from './operation-node.js';
 import { IdentifierNode } from './identifier-node.js';
+export declare type DropConstraintNodeProps = Omit<DropConstraintNode, 'kind' | 'constraintName'>;
 export interface DropConstraintNode extends OperationNode {
     readonly kind: 'DropConstraintNode';
     readonly constraintName: IdentifierNode;
+    readonly ifExists?: boolean;
+    readonly modifier?: 'cascade' | 'restrict';
 }
 /**
  * @internal
@@ -10,4 +13,5 @@ export interface DropConstraintNode extends OperationNode {
 export declare const DropConstraintNode: Readonly<{
     is(node: OperationNode): node is DropConstraintNode;
     create(constraintName: string): DropConstraintNode;
+    cloneWith(dropConstraint: DropConstraintNode, props: DropConstraintNodeProps): DropConstraintNode;
 }>;

package/dist/cjs/operation-node/drop-constraint-node.js

@@ -16,4 +16,10 @@ exports.DropConstraintNode = (0, object_utils_js_1.freeze)({
             constraintName: identifier_node_js_1.IdentifierNode.create(constraintName),
         });
     },
+    cloneWith(dropConstraint, props) {
+        return (0, object_utils_js_1.freeze)({
+            ...dropConstraint,
+            ...props,
+        });
+    },
 });

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

@@ -545,6 +545,8 @@ class OperationNodeTransformer {
         return {
             kind: 'DropConstraintNode',
             constraintName: this.transformNode(node.constraintName),
+            ifExists: node.ifExists,
+            modifier: node.modifier,
         };
     }
     transformCreateView(node) {

package/dist/cjs/package.json

@@ -1 +1 @@
-{"type":"commonjs"}
+{"type":"commonjs","sideEffects":false}

package/dist/cjs/query-compiler/default-query-compiler.js

@@ -704,7 +704,16 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     }
     visitDropConstraint(node) {
         this.append('drop constraint ');
+        if (node.ifExists) {
+            this.append('if exists ');
+        }
         this.visitNode(node.constraintName);
+        if (node.modifier === 'cascade') {
+            this.append(' cascade');
+        }
+        else if (node.modifier === 'restrict') {
+            this.append(' restrict');
+        }
     }
     visitUnion(node) {
         this.append('union ');

package/dist/cjs/schema/alter-table-builder.d.ts

@@ -25,12 +25,8 @@ export declare class AlterTableBuilder {
     renameColumn(column: string, newColumn: string): AlterTableExecutor;
     /**
      * See {@link CreateTableBuilder.addColumn}
-     *
-     * Unlike {@link CreateTableBuilder.addColumn} this method returns the column builder
-     * and doesn't take a callback as the last argument. This is because you can only
-     * add one column per `ALTER TABLE` query.
      */
-    addColumn(columnName: string, dataType: DataTypeExpression): AlterTableAddColumnBuilder;
+    addColumn(columnName: string, dataType: DataTypeExpression, build?: AlterTableAddColumnBuilderCallback): AlterTableAddColumnBuilder;
     /**
      * Creates an `alter table modify column` query. The `modify column` statement
      * is only implemeted by MySQL and oracle AFAIK. On other databases you
@@ -53,6 +49,7 @@ export declare class AlterTableBuilder {
      * is because you can only add one column per `ALTER TABLE` query.
      */
     addForeignKeyConstraint(constraintName: string, columns: string[], targetTable: string, targetColumns: string[]): AlterTableAddForeignKeyConstraintBuilder;
+    dropConstraint(constraintName: string): AlterTableDropConstraintBuilder;
 }
 export interface AlterTableBuilderProps {
     readonly queryId: QueryId;
@@ -245,6 +242,7 @@ export declare class AlterTableAddColumnBuilder implements ColumnDefinitionBuild
 export interface AlterTableAddColumnBuilderProps extends AlterTableBuilderProps {
     readonly columnBuilder: ColumnDefinitionBuilder;
 }
+export declare type AlterTableAddColumnBuilderCallback = (builder: AlterTableAddColumnBuilder) => AlterTableAddColumnBuilder;
 export declare class AlterTableModifyColumnBuilder implements ColumnDefinitionBuilderInterface, OperationNodeSource, Compilable {
     #private;
     constructor(props: AlterTableModifyColumnBuilderProps);
@@ -422,3 +420,15 @@ export declare class AlterTableAddForeignKeyConstraintBuilder implements Foreign
 export interface AlterTableAddForeignKeyConstraintBuilderProps extends AlterTableBuilderProps {
     readonly constraintBuilder: ForeignKeyConstraintBuilder;
 }
+export declare class AlterTableDropConstraintBuilder implements OperationNodeSource, Compilable {
+    #private;
+    constructor(props: AlterTableDropConstraintBuilderProps);
+    ifExists(): AlterTableDropConstraintBuilder;
+    cascade(): AlterTableDropConstraintBuilder;
+    restrict(): AlterTableDropConstraintBuilder;
+    toOperationNode(): AlterTableNode;
+    compile(): CompiledQuery;
+    execute(): Promise<void>;
+}
+export interface AlterTableDropConstraintBuilderProps extends AlterTableBuilderProps {
+}

package/dist/cjs/schema/alter-table-builder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AlterTableAddForeignKeyConstraintBuilder = exports.AlterTableModifyColumnBuilder = exports.AlterTableAddColumnBuilder = exports.AlterTableExecutor = exports.AlterColumnBuilder = exports.AlterTableBuilder = void 0;
+exports.AlterTableDropConstraintBuilder = exports.AlterTableAddForeignKeyConstraintBuilder = exports.AlterTableModifyColumnBuilder = exports.AlterTableAddColumnBuilder = exports.AlterTableExecutor = exports.AlterColumnBuilder = exports.AlterTableBuilder = void 0;
 const add_column_node_js_1 = require("../operation-node/add-column-node.js");
 const alter_column_node_js_1 = require("../operation-node/alter-column-node.js");
 const alter_table_node_js_1 = require("../operation-node/alter-table-node.js");
@@ -22,6 +22,7 @@ const foreign_key_constraint_node_js_1 = require("../operation-node/foreign-key-
 const column_node_js_1 = require("../operation-node/column-node.js");
 const default_value_parser_js_1 = require("../parser/default-value-parser.js");
 const table_parser_js_1 = require("../parser/table-parser.js");
+const drop_constraint_node_js_1 = require("../operation-node/drop-constraint-node.js");
 /**
  * This builder can be used to create a `alter table` query.
  */
@@ -70,16 +71,12 @@ class AlterTableBuilder {
     }
     /**
      * See {@link CreateTableBuilder.addColumn}
-     *
-     * Unlike {@link CreateTableBuilder.addColumn} this method returns the column builder
-     * and doesn't take a callback as the last argument. This is because you can only
-     * add one column per `ALTER TABLE` query.
      */
-    addColumn(columnName, dataType) {
-        return new AlterTableAddColumnBuilder({
+    addColumn(columnName, dataType, build = object_utils_js_1.noop) {
+        return build(new AlterTableAddColumnBuilder({
             ...this.#props,
             columnBuilder: new column_definition_builder_js_1.ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.create(columnName, (0, data_type_parser_js_1.parseDataTypeExpression)(dataType))),
-        });
+        }));
     }
     /**
      * Creates an `alter table modify column` query. The `modify column` statement
@@ -127,6 +124,14 @@ class AlterTableBuilder {
             constraintBuilder: new foreign_key_constraint_builder_js_1.ForeignKeyConstraintBuilder(foreign_key_constraint_node_js_1.ForeignKeyConstraintNode.create(columns.map(column_node_js_1.ColumnNode.create), (0, table_parser_js_1.parseTable)(targetTable), targetColumns.map(column_node_js_1.ColumnNode.create), constraintName)),
         });
     }
+    dropConstraint(constraintName) {
+        return new AlterTableDropConstraintBuilder({
+            ...this.#props,
+            alterTableNode: alter_table_node_js_1.AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                dropConstraint: drop_constraint_node_js_1.DropConstraintNode.create(constraintName),
+            }),
+        });
+    }
 }
 exports.AlterTableBuilder = AlterTableBuilder;
 class AlterColumnBuilder {
@@ -436,9 +441,56 @@ class AlterTableAddForeignKeyConstraintBuilder {
     }
 }
 exports.AlterTableAddForeignKeyConstraintBuilder = AlterTableAddForeignKeyConstraintBuilder;
+class AlterTableDropConstraintBuilder {
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
+    }
+    ifExists() {
+        return new AlterTableDropConstraintBuilder({
+            ...this.#props,
+            alterTableNode: alter_table_node_js_1.AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                dropConstraint: drop_constraint_node_js_1.DropConstraintNode.cloneWith(this.#props.alterTableNode.dropConstraint, {
+                    ifExists: true,
+                }),
+            }),
+        });
+    }
+    cascade() {
+        return new AlterTableDropConstraintBuilder({
+            ...this.#props,
+            alterTableNode: alter_table_node_js_1.AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                dropConstraint: drop_constraint_node_js_1.DropConstraintNode.cloneWith(this.#props.alterTableNode.dropConstraint, {
+                    modifier: 'cascade',
+                }),
+            }),
+        });
+    }
+    restrict() {
+        return new AlterTableDropConstraintBuilder({
+            ...this.#props,
+            alterTableNode: alter_table_node_js_1.AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                dropConstraint: drop_constraint_node_js_1.DropConstraintNode.cloneWith(this.#props.alterTableNode.dropConstraint, {
+                    modifier: 'restrict',
+                }),
+            }),
+        });
+    }
+    toOperationNode() {
+        return this.#props.executor.transformQuery(this.#props.alterTableNode, this.#props.queryId);
+    }
+    compile() {
+        return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
+    }
+    async execute() {
+        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+    }
+}
+exports.AlterTableDropConstraintBuilder = AlterTableDropConstraintBuilder;
 (0, prevent_await_js_1.preventAwait)(AlterTableBuilder, "don't await AlterTableBuilder instances");
 (0, prevent_await_js_1.preventAwait)(AlterColumnBuilder, "don't await AlterColumnBuilder instances");
 (0, prevent_await_js_1.preventAwait)(AlterTableExecutor, "don't await AlterTableExecutor instances directly. To execute the query you need to call `execute`");
 (0, prevent_await_js_1.preventAwait)(AlterTableAddColumnBuilder, "don't await AlterTableAddColumnBuilder instances directly. To execute the query you need to call `execute`");
 (0, prevent_await_js_1.preventAwait)(AlterTableModifyColumnBuilder, "don't await AlterTableModifyColumnBuilder instances directly. To execute the query you need to call `execute`");
 (0, prevent_await_js_1.preventAwait)(AlterTableAddForeignKeyConstraintBuilder, "don't await AlterTableAddForeignKeyConstraintBuilder instances directly. To execute the query you need to call `execute`");
+(0, prevent_await_js_1.preventAwait)(AlterTableDropConstraintBuilder, "don't await AlterTableDropConstraintBuilder instances directly. To execute the query you need to call `execute`");

package/dist/esm/dialect/mysql/mysql-driver.d.ts

@@ -11,11 +11,6 @@ export declare class MysqlDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

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

@@ -1,6 +1,7 @@
 /// <reference types="./mysql-introspector.d.ts" />
 import { DEFAULT_MIGRATION_LOCK_TABLE, DEFAULT_MIGRATION_TABLE, } from '../../migration/migrator.js';
 import { freeze } from '../../util/object-utils.js';
+import { sql } from '../../raw-builder/sql.js';
 export class MysqlIntrospector {
     #db;
     constructor(db) {
@@ -24,12 +25,7 @@ export class MysqlIntrospector {
             'is_nullable',
             'data_type',
         ])
-            .where('table_schema', 'not in', [
-            'information_schema',
-            'performance_schema',
-            'mysql',
-            'sys',
-        ])
+            .where('table_schema', '=', sql `database()`)
             .castTo();
         if (!options.withInternalKyselyTables) {
             query = query

package/dist/esm/dialect/postgres/postgres-driver.d.ts

@@ -11,11 +11,6 @@ export declare class PostgresDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

package/dist/esm/dialect/sqlite/sqlite-driver.d.ts

@@ -9,11 +9,6 @@ export declare class SqliteDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

package/dist/esm/driver/driver.d.ts

@@ -10,11 +10,6 @@ export interface Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

package/dist/esm/driver/dummy-driver.d.ts

@@ -42,11 +42,6 @@ export declare class DummyDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

package/dist/esm/driver/runtime-driver.d.ts

@@ -14,11 +14,6 @@ export declare class RuntimeDriver implements Driver {
      *
      * After calling this method the driver should be usable and `acquireConnection` etc.
      * methods should be callable.
-     *
-     * IMPORTANT: The underlying database engine driver (like [pg](https://node-postgres.com/))
-     * should be imported inside this function, not at the top of the driver file! This is
-     * important so that Kysely is usable without installing all database driver libraries
-     * it supports.
      */
     init(): Promise<void>;
     /**

package/dist/esm/migration/file-migration-provider.js

@@ -25,9 +25,10 @@ export class FileMigrationProvider {
         const migrations = {};
         const files = await this.#props.fs.readdir(this.#props.migrationFolder);
         for (const fileName of files) {
-            if ((fileName.endsWith('.js') || fileName.endsWith('.ts')) &&
+            if ((fileName.endsWith('.js') || fileName.endsWith('.ts') || fileName.endsWith('.mjs')) &&
                 !fileName.endsWith('.d.ts')) {
-                const migration = await import(this.#props.path.join(this.#props.migrationFolder, fileName));
+                const migration = await import(
+                /* webpackIgnore: true */ this.#props.path.join(this.#props.migrationFolder, fileName));
                 if (isMigration(migration)) {
                     migrations[fileName.substring(0, fileName.length - 3)] = migration;
                 }

package/dist/esm/migration/migrator.d.ts

@@ -188,6 +188,8 @@ export interface MigratorProps {
      * If you do specify this, ALWAYS ALWAYS use the same value from the beginning of
      * the project, to the end of time or prepare to manually migrate the migration
      * tables.
+     *
+     * This only works on postgres.
      */
     readonly migrationTableSchema?: string;
 }

package/dist/esm/operation-node/drop-constraint-node.d.ts

@@ -1,8 +1,11 @@
 import { OperationNode } from './operation-node.js';
 import { IdentifierNode } from './identifier-node.js';
+export declare type DropConstraintNodeProps = Omit<DropConstraintNode, 'kind' | 'constraintName'>;
 export interface DropConstraintNode extends OperationNode {
     readonly kind: 'DropConstraintNode';
     readonly constraintName: IdentifierNode;
+    readonly ifExists?: boolean;
+    readonly modifier?: 'cascade' | 'restrict';
 }
 /**
  * @internal
@@ -10,4 +13,5 @@ export interface DropConstraintNode extends OperationNode {
 export declare const DropConstraintNode: Readonly<{
     is(node: OperationNode): node is DropConstraintNode;
     create(constraintName: string): DropConstraintNode;
+    cloneWith(dropConstraint: DropConstraintNode, props: DropConstraintNodeProps): DropConstraintNode;
 }>;

package/dist/esm/operation-node/drop-constraint-node.js

@@ -14,4 +14,10 @@ export const DropConstraintNode = freeze({
             constraintName: IdentifierNode.create(constraintName),
         });
     },
+    cloneWith(dropConstraint, props) {
+        return freeze({
+            ...dropConstraint,
+            ...props,
+        });
+    },
 });

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

@@ -543,6 +543,8 @@ export class OperationNodeTransformer {
         return {
             kind: 'DropConstraintNode',
             constraintName: this.transformNode(node.constraintName),
+            ifExists: node.ifExists,
+            modifier: node.modifier,
         };
     }
     transformCreateView(node) {

package/dist/esm/package.json

@@ -1 +1 @@
-{"type":"module"}
+{"type":"module","sideEffects":false}

package/dist/esm/query-compiler/default-query-compiler.js

@@ -702,7 +702,16 @@ export class DefaultQueryCompiler extends OperationNodeVisitor {
     }
     visitDropConstraint(node) {
         this.append('drop constraint ');
+        if (node.ifExists) {
+            this.append('if exists ');
+        }
         this.visitNode(node.constraintName);
+        if (node.modifier === 'cascade') {
+            this.append(' cascade');
+        }
+        else if (node.modifier === 'restrict') {
+            this.append(' restrict');
+        }
     }
     visitUnion(node) {
         this.append('union ');

package/dist/esm/schema/alter-table-builder.d.ts

@@ -25,12 +25,8 @@ export declare class AlterTableBuilder {
     renameColumn(column: string, newColumn: string): AlterTableExecutor;
     /**
      * See {@link CreateTableBuilder.addColumn}
-     *
-     * Unlike {@link CreateTableBuilder.addColumn} this method returns the column builder
-     * and doesn't take a callback as the last argument. This is because you can only
-     * add one column per `ALTER TABLE` query.
      */
-    addColumn(columnName: string, dataType: DataTypeExpression): AlterTableAddColumnBuilder;
+    addColumn(columnName: string, dataType: DataTypeExpression, build?: AlterTableAddColumnBuilderCallback): AlterTableAddColumnBuilder;
     /**
      * Creates an `alter table modify column` query. The `modify column` statement
      * is only implemeted by MySQL and oracle AFAIK. On other databases you
@@ -53,6 +49,7 @@ export declare class AlterTableBuilder {
      * is because you can only add one column per `ALTER TABLE` query.
      */
     addForeignKeyConstraint(constraintName: string, columns: string[], targetTable: string, targetColumns: string[]): AlterTableAddForeignKeyConstraintBuilder;
+    dropConstraint(constraintName: string): AlterTableDropConstraintBuilder;
 }
 export interface AlterTableBuilderProps {
     readonly queryId: QueryId;
@@ -245,6 +242,7 @@ export declare class AlterTableAddColumnBuilder implements ColumnDefinitionBuild
 export interface AlterTableAddColumnBuilderProps extends AlterTableBuilderProps {
     readonly columnBuilder: ColumnDefinitionBuilder;
 }
+export declare type AlterTableAddColumnBuilderCallback = (builder: AlterTableAddColumnBuilder) => AlterTableAddColumnBuilder;
 export declare class AlterTableModifyColumnBuilder implements ColumnDefinitionBuilderInterface, OperationNodeSource, Compilable {
     #private;
     constructor(props: AlterTableModifyColumnBuilderProps);
@@ -422,3 +420,15 @@ export declare class AlterTableAddForeignKeyConstraintBuilder implements Foreign
 export interface AlterTableAddForeignKeyConstraintBuilderProps extends AlterTableBuilderProps {
     readonly constraintBuilder: ForeignKeyConstraintBuilder;
 }
+export declare class AlterTableDropConstraintBuilder implements OperationNodeSource, Compilable {
+    #private;
+    constructor(props: AlterTableDropConstraintBuilderProps);
+    ifExists(): AlterTableDropConstraintBuilder;
+    cascade(): AlterTableDropConstraintBuilder;
+    restrict(): AlterTableDropConstraintBuilder;
+    toOperationNode(): AlterTableNode;
+    compile(): CompiledQuery;
+    execute(): Promise<void>;
+}
+export interface AlterTableDropConstraintBuilderProps extends AlterTableBuilderProps {
+}

package/dist/esm/schema/alter-table-builder.js

@@ -7,7 +7,7 @@ import { DataTypeNode, } from '../operation-node/data-type-node.js';
 import { DropColumnNode } from '../operation-node/drop-column-node.js';
 import { IdentifierNode } from '../operation-node/identifier-node.js';
 import { RenameColumnNode } from '../operation-node/rename-column-node.js';
-import { freeze } from '../util/object-utils.js';
+import { freeze, noop } from '../util/object-utils.js';
 import { preventAwait } from '../util/prevent-await.js';
 import { ColumnDefinitionBuilder, } from './column-definition-builder.js';
 import { ModifyColumnNode } from '../operation-node/modify-column-node.js';
@@ -20,6 +20,7 @@ import { ForeignKeyConstraintNode } from '../operation-node/foreign-key-constrai
 import { ColumnNode } from '../operation-node/column-node.js';
 import { parseDefaultValueExpression, } from '../parser/default-value-parser.js';
 import { parseTable } from '../parser/table-parser.js';
+import { DropConstraintNode } from '../operation-node/drop-constraint-node.js';
 /**
  * This builder can be used to create a `alter table` query.
  */
@@ -68,16 +69,12 @@ export class AlterTableBuilder {
     }
     /**
      * See {@link CreateTableBuilder.addColumn}
-     *
-     * Unlike {@link CreateTableBuilder.addColumn} this method returns the column builder
-     * and doesn't take a callback as the last argument. This is because you can only
-     * add one column per `ALTER TABLE` query.
      */
-    addColumn(columnName, dataType) {
-        return new AlterTableAddColumnBuilder({
+    addColumn(columnName, dataType, build = noop) {
+        return build(new AlterTableAddColumnBuilder({
             ...this.#props,
             columnBuilder: new ColumnDefinitionBuilder(ColumnDefinitionNode.create(columnName, parseDataTypeExpression(dataType))),
-        });
+        }));
     }
     /**
      * Creates an `alter table modify column` query. The `modify column` statement
@@ -125,6 +122,14 @@ export class AlterTableBuilder {
             constraintBuilder: new ForeignKeyConstraintBuilder(ForeignKeyConstraintNode.create(columns.map(ColumnNode.create), parseTable(targetTable), targetColumns.map(ColumnNode.create), constraintName)),
         });
     }
+    dropConstraint(constraintName) {
+        return new AlterTableDropConstraintBuilder({
+            ...this.#props,
+            alterTableNode: AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                dropConstraint: DropConstraintNode.create(constraintName),
+            }),
+        });
+    }
 }
 export class AlterColumnBuilder {
     #props;
@@ -428,9 +433,55 @@ export class AlterTableAddForeignKeyConstraintBuilder {
         await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
     }
 }
+export class AlterTableDropConstraintBuilder {
+    #props;
+    constructor(props) {
+        this.#props = freeze(props);
+    }
+    ifExists() {
+        return new AlterTableDropConstraintBuilder({
+            ...this.#props,
+            alterTableNode: AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                dropConstraint: DropConstraintNode.cloneWith(this.#props.alterTableNode.dropConstraint, {
+                    ifExists: true,
+                }),
+            }),
+        });
+    }
+    cascade() {
+        return new AlterTableDropConstraintBuilder({
+            ...this.#props,
+            alterTableNode: AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                dropConstraint: DropConstraintNode.cloneWith(this.#props.alterTableNode.dropConstraint, {
+                    modifier: 'cascade',
+                }),
+            }),
+        });
+    }
+    restrict() {
+        return new AlterTableDropConstraintBuilder({
+            ...this.#props,
+            alterTableNode: AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                dropConstraint: DropConstraintNode.cloneWith(this.#props.alterTableNode.dropConstraint, {
+                    modifier: 'restrict',
+                }),
+            }),
+        });
+    }
+    toOperationNode() {
+        return this.#props.executor.transformQuery(this.#props.alterTableNode, this.#props.queryId);
+    }
+    compile() {
+        return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
+    }
+    async execute() {
+        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+    }
+}
 preventAwait(AlterTableBuilder, "don't await AlterTableBuilder instances");
 preventAwait(AlterColumnBuilder, "don't await AlterColumnBuilder instances");
 preventAwait(AlterTableExecutor, "don't await AlterTableExecutor instances directly. To execute the query you need to call `execute`");
 preventAwait(AlterTableAddColumnBuilder, "don't await AlterTableAddColumnBuilder instances directly. To execute the query you need to call `execute`");
 preventAwait(AlterTableModifyColumnBuilder, "don't await AlterTableModifyColumnBuilder instances directly. To execute the query you need to call `execute`");
 preventAwait(AlterTableAddForeignKeyConstraintBuilder, "don't await AlterTableAddForeignKeyConstraintBuilder instances directly. To execute the query you need to call `execute`");
+preventAwait(AlterTableDropConstraintBuilder, "don't await AlterTableDropConstraintBuilder instances directly. To execute the query you need to call `execute`");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kysely",
-  "version": "0.19.0",
+  "version": "0.19.3",
   "description": "Type safe SQL query builder",
   "repository": {
     "type": "git",