kysely 0.7.2 → 0.7.6

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AlterTableModifyColumnBuilder = exports.AlterTableAddColumnBuilder = exports.AlterTableExecutor = exports.AlterColumnBuilder = exports.AlterTableBuilder = void 0;
+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");
@@ -16,6 +16,13 @@ const object_utils_js_1 = require("../util/object-utils.js");
 const prevent_await_js_1 = require("../util/prevent-await.js");
 const column_definition_builder_js_1 = require("./column-definition-builder.js");
 const modify_column_node_js_1 = require("../operation-node/modify-column-node.js");
+const data_type_parser_js_1 = require("../parser/data-type-parser.js");
+const foreign_key_constraint_builder_js_1 = require("./foreign-key-constraint-builder.js");
+const add_constraint_node_js_1 = require("../operation-node/add-constraint-node.js");
+const unique_constraint_node_js_1 = require("../operation-node/unique-constraint-node.js");
+const check_constraint_node_js_1 = require("../operation-node/check-constraint-node.js");
+const foreign_key_constraint_node_js_1 = require("../operation-node/foreign-key-constraint-node.js");
+const column_node_js_1 = require("../operation-node/column-node.js");
 class AlterTableBuilder {
     #props;
     constructor(props) {
@@ -62,9 +69,7 @@ class AlterTableBuilder {
     addColumn(columnName, dataType) {
         return new AlterTableAddColumnBuilder({
             ...this.#props,
-            columnBuilder: new column_definition_builder_js_1.ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.create(columnName, (0, operation_node_source_js_1.isOperationNodeSource)(dataType)
-                ? dataType.toOperationNode()
-                : data_type_node_js_1.DataTypeNode.create(dataType))),
+            columnBuilder: new column_definition_builder_js_1.ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.create(columnName, (0, data_type_parser_js_1.parseDataTypeExpression)(dataType))),
         });
     }
     /**
@@ -75,9 +80,29 @@ class AlterTableBuilder {
     modifyColumn(columnName, dataType) {
         return new AlterTableModifyColumnBuilder({
             ...this.#props,
-            columnBuilder: new column_definition_builder_js_1.ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.create(columnName, (0, operation_node_source_js_1.isOperationNodeSource)(dataType)
-                ? dataType.toOperationNode()
-                : data_type_node_js_1.DataTypeNode.create(dataType))),
+            columnBuilder: new column_definition_builder_js_1.ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.create(columnName, (0, data_type_parser_js_1.parseDataTypeExpression)(dataType))),
+        });
+    }
+    addUniqueConstraint(constraintName, columns) {
+        return new AlterTableExecutor({
+            ...this.#props,
+            alterTableNode: alter_table_node_js_1.AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                addConstraint: add_constraint_node_js_1.AddConstraintNode.create(unique_constraint_node_js_1.UniqueConstraintNode.create(columns, constraintName)),
+            }),
+        });
+    }
+    addCheckConstraint(constraintName, checkExpression) {
+        return new AlterTableExecutor({
+            ...this.#props,
+            alterTableNode: alter_table_node_js_1.AlterTableNode.cloneWith(this.#props.alterTableNode, {
+                addConstraint: add_constraint_node_js_1.AddConstraintNode.create(check_constraint_node_js_1.CheckConstraintNode.create(checkExpression, constraintName)),
+            }),
+        });
+    }
+    addForeignKeyConstraint(constraintName, columns, targetTable, targetColumns) {
+        return new AlterTableAddForeignKeyConstraintBuilder({
+            ...this.#props,
+            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), table_node_js_1.TableNode.create(targetTable), targetColumns.map(column_node_js_1.ColumnNode.create), constraintName)),
         });
     }
 }
@@ -186,6 +211,12 @@ class AlterTableAddColumnBuilder {
             columnBuilder: this.#props.columnBuilder.onDelete(onDelete),
         });
     }
+    onUpdate(onDelete) {
+        return new AlterTableAddColumnBuilder({
+            ...this.#props,
+            columnBuilder: this.#props.columnBuilder.onUpdate(onDelete),
+        });
+    }
     unique() {
         return new AlterTableAddColumnBuilder({
             ...this.#props,
@@ -252,6 +283,12 @@ class AlterTableModifyColumnBuilder {
             columnBuilder: this.#props.columnBuilder.onDelete(onDelete),
         });
     }
+    onUpdate(onUpdate) {
+        return new AlterTableModifyColumnBuilder({
+            ...this.#props,
+            columnBuilder: this.#props.columnBuilder.onUpdate(onUpdate),
+        });
+    }
     unique() {
         return new AlterTableModifyColumnBuilder({
             ...this.#props,
@@ -289,8 +326,39 @@ class AlterTableModifyColumnBuilder {
     }
 }
 exports.AlterTableModifyColumnBuilder = AlterTableModifyColumnBuilder;
+class AlterTableAddForeignKeyConstraintBuilder {
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
+    }
+    onDelete(onDelete) {
+        return new AlterTableAddForeignKeyConstraintBuilder({
+            ...this.#props,
+            constraintBuilder: this.#props.constraintBuilder.onDelete(onDelete),
+        });
+    }
+    onUpdate(onUpdate) {
+        return new AlterTableAddForeignKeyConstraintBuilder({
+            ...this.#props,
+            constraintBuilder: this.#props.constraintBuilder.onUpdate(onUpdate),
+        });
+    }
+    toOperationNode() {
+        return this.#props.executor.transformQuery(alter_table_node_js_1.AlterTableNode.cloneWith(this.#props.alterTableNode, {
+            addConstraint: add_constraint_node_js_1.AddConstraintNode.create(this.#props.constraintBuilder.toOperationNode()),
+        }), 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.AlterTableAddForeignKeyConstraintBuilder = AlterTableAddForeignKeyConstraintBuilder;
 (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`");

package/dist/cjs/schema/column-definition-builder.d.ts

@@ -1,8 +1,9 @@
 import { OperationNodeSource } from '../operation-node/operation-node-source.js';
-import { OnDelete } from '../operation-node/references-node.js';
+import { OnModifyForeignAction } from '../operation-node/references-node.js';
 import { PrimitiveValue } from '../util/object-utils.js';
 import { ColumnDefinitionNode } from '../operation-node/column-definition-node.js';
 import { AnyRawBuilder } from '../query-builder/type-utils.js';
+import { DefaultValueExpression } from '../parser/default-value-parser.js';
 export interface ColumnDefinitionBuilderInterface<R> {
     /**
      * Makes the column automatically incrementing.
@@ -31,7 +32,11 @@ export interface ColumnDefinitionBuilderInterface<R> {
     /**
      * Adds an `on delete` constraint for the foreign key column.
      */
-    onDelete(onDelete: OnDelete): R;
+    onDelete(onDelete: OnModifyForeignAction): R;
+    /**
+     * Adds an `on update` constraint for the foreign key column.
+     */
+    onUpdate(onUpdate: OnModifyForeignAction): R;
     /**
      * Adds a unique constraint for the column.
      */
@@ -71,10 +76,11 @@ export declare class ColumnDefinitionBuilder implements ColumnDefinitionBuilderI
     increments(): ColumnDefinitionBuilder;
     primaryKey(): ColumnDefinitionBuilder;
     references(ref: string): ColumnDefinitionBuilder;
-    onDelete(onDelete: OnDelete): ColumnDefinitionBuilder;
+    onDelete(onDelete: OnModifyForeignAction): ColumnDefinitionBuilder;
+    onUpdate(onUpdate: OnModifyForeignAction): ColumnDefinitionBuilder;
     unique(): ColumnDefinitionBuilder;
     notNull(): ColumnDefinitionBuilder;
-    defaultTo(value: PrimitiveValue | AnyRawBuilder): ColumnDefinitionBuilder;
+    defaultTo(value: DefaultValueExpression): ColumnDefinitionBuilder;
     check(sql: string): ColumnDefinitionBuilder;
     toOperationNode(): ColumnDefinitionNode;
 }

package/dist/cjs/schema/column-definition-builder.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnDefinitionBuilder = void 0;
 const check_constraint_node_js_1 = require("../operation-node/check-constraint-node.js");
-const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
 const reference_node_js_1 = require("../operation-node/reference-node.js");
 const references_node_js_1 = require("../operation-node/references-node.js");
 const select_all_node_js_1 = require("../operation-node/select-all-node.js");
-const value_node_js_1 = require("../operation-node/value-node.js");
 const reference_parser_js_1 = require("../parser/reference-parser.js");
 const prevent_await_js_1 = require("../util/prevent-await.js");
 const column_definition_node_js_1 = require("../operation-node/column-definition-node.js");
+const default_value_parser_js_1 = require("../parser/default-value-parser.js");
 class ColumnDefinitionBuilder {
     #node;
     constructor(node) {
@@ -40,6 +39,14 @@ class ColumnDefinitionBuilder {
             references: references_node_js_1.ReferencesNode.cloneWithOnDelete(this.#node.references, onDelete),
         }));
     }
+    onUpdate(onUpdate) {
+        if (!this.#node.references) {
+            throw new Error('on update constraint can only be added for foreign keys');
+        }
+        return new ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.cloneWith(this.#node, {
+            references: references_node_js_1.ReferencesNode.cloneWithOnUpdate(this.#node.references, onUpdate),
+        }));
+    }
     unique() {
         return new ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.cloneWith(this.#node, { isUnique: true }));
     }
@@ -48,9 +55,7 @@ class ColumnDefinitionBuilder {
     }
     defaultTo(value) {
         return new ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.cloneWith(this.#node, {
-            defaultTo: (0, operation_node_source_js_1.isOperationNodeSource)(value)
-                ? value.toOperationNode()
-                : value_node_js_1.ValueNode.createImmediate(value),
+            defaultTo: (0, default_value_parser_js_1.parseDefaultValueExpression)(value),
         }));
     }
     check(sql) {
@@ -63,4 +68,4 @@ class ColumnDefinitionBuilder {
     }
 }
 exports.ColumnDefinitionBuilder = ColumnDefinitionBuilder;
-(0, prevent_await_js_1.preventAwait)(ColumnDefinitionBuilder, "don't await ColumnBuilder instances directly.");
+(0, prevent_await_js_1.preventAwait)(ColumnDefinitionBuilder, "don't await ColumnDefinitionBuilder instances directly.");

package/dist/cjs/schema/create-index-builder.d.ts

@@ -6,7 +6,7 @@ import { QueryExecutor } from '../query-executor/query-executor.js';
 import { QueryId } from '../util/query-id.js';
 export declare class CreateIndexBuilder implements OperationNodeSource, Compilable {
     #private;
-    constructor(args: CreateIndexBuilderConstructorArgs);
+    constructor(props: CreateIndexBuilderProps);
     /**
      * Makes the index unique.
      */
@@ -49,8 +49,8 @@ export declare class CreateIndexBuilder implements OperationNodeSource, Compilab
     compile(): CompiledQuery;
     execute(): Promise<void>;
 }
-export interface CreateIndexBuilderConstructorArgs {
-    queryId: QueryId;
-    createIndexNode: CreateIndexNode;
-    executor: QueryExecutor;
+export interface CreateIndexBuilderProps {
+    readonly queryId: QueryId;
+    readonly executor: QueryExecutor;
+    readonly createIndexNode: CreateIndexNode;
 }

package/dist/cjs/schema/create-index-builder.js

@@ -7,23 +7,19 @@ const raw_node_js_1 = require("../operation-node/raw-node.js");
 const reference_parser_js_1 = require("../parser/reference-parser.js");
 const table_parser_js_1 = require("../parser/table-parser.js");
 const prevent_await_js_1 = require("../util/prevent-await.js");
+const object_utils_js_1 = require("../util/object-utils.js");
 class CreateIndexBuilder {
-    #queryId;
-    #createIndexNode;
-    #executor;
-    constructor(args) {
-        this.#queryId = args.queryId;
-        this.#createIndexNode = args.createIndexNode;
-        this.#executor = args.executor;
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
     }
     /**
      * Makes the index unique.
      */
     unique() {
         return new CreateIndexBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#createIndexNode, {
+            ...this.#props,
+            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#props.createIndexNode, {
                 unique: true,
             }),
         });
@@ -33,9 +29,8 @@ class CreateIndexBuilder {
      */
     on(table) {
         return new CreateIndexBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#createIndexNode, {
+            ...this.#props,
+            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#props.createIndexNode, {
                 table: (0, table_parser_js_1.parseTable)(table),
             }),
         });
@@ -47,9 +42,8 @@ class CreateIndexBuilder {
      */
     column(column) {
         return new CreateIndexBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#createIndexNode, {
+            ...this.#props,
+            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#props.createIndexNode, {
                 expression: (0, reference_parser_js_1.parseColumnName)(column),
             }),
         });
@@ -61,9 +55,8 @@ class CreateIndexBuilder {
      */
     columns(columns) {
         return new CreateIndexBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#createIndexNode, {
+            ...this.#props,
+            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#props.createIndexNode, {
                 expression: list_node_js_1.ListNode.create(columns.map(reference_parser_js_1.parseColumnName)),
             }),
         });
@@ -82,30 +75,28 @@ class CreateIndexBuilder {
      */
     expression(expression) {
         return new CreateIndexBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#createIndexNode, {
+            ...this.#props,
+            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#props.createIndexNode, {
                 expression: raw_node_js_1.RawNode.createWithSql(expression),
             }),
         });
     }
     using(indexType) {
         return new CreateIndexBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#createIndexNode, {
+            ...this.#props,
+            createIndexNode: create_index_node_js_1.CreateIndexNode.cloneWith(this.#props.createIndexNode, {
                 using: raw_node_js_1.RawNode.createWithSql(indexType),
             }),
         });
     }
     toOperationNode() {
-        return this.#executor.transformQuery(this.#createIndexNode, this.#queryId);
+        return this.#props.executor.transformQuery(this.#props.createIndexNode, this.#props.queryId);
     }
     compile() {
-        return this.#executor.compileQuery(this.toOperationNode(), this.#queryId);
+        return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#executor.executeQuery(this.compile(), this.#queryId);
+        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
     }
 }
 exports.CreateIndexBuilder = CreateIndexBuilder;

package/dist/cjs/schema/create-schema-builder.d.ts

@@ -6,14 +6,14 @@ import { QueryExecutor } from '../query-executor/query-executor.js';
 import { QueryId } from '../util/query-id.js';
 export declare class CreateSchemaBuilder implements OperationNodeSource, Compilable {
     #private;
-    constructor(args: CreateSchemaBuilderConstructorArgs);
+    constructor(props: CreateSchemaBuilderProps);
     ifNotExists(): CreateSchemaBuilder;
     toOperationNode(): CreateSchemaNode;
     compile(): CompiledQuery;
     execute(): Promise<void>;
 }
-export interface CreateSchemaBuilderConstructorArgs {
-    queryId: QueryId;
-    createSchemaNode: CreateSchemaNode;
-    executor: QueryExecutor;
+export interface CreateSchemaBuilderProps {
+    readonly queryId: QueryId;
+    readonly executor: QueryExecutor;
+    readonly createSchemaNode: CreateSchemaNode;
 }

package/dist/cjs/schema/create-schema-builder.js

@@ -3,30 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateSchemaBuilder = void 0;
 const create_schema_node_js_1 = require("../operation-node/create-schema-node.js");
 const prevent_await_js_1 = require("../util/prevent-await.js");
+const object_utils_js_1 = require("../util/object-utils.js");
 class CreateSchemaBuilder {
-    #queryId;
-    #createSchemaNode;
-    #executor;
-    constructor(args) {
-        this.#queryId = args.queryId;
-        this.#createSchemaNode = args.createSchemaNode;
-        this.#executor = args.executor;
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
     }
     ifNotExists() {
         return new CreateSchemaBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createSchemaNode: create_schema_node_js_1.CreateSchemaNode.cloneWithModifier(this.#createSchemaNode, 'IfNotExists'),
+            ...this.#props,
+            createSchemaNode: create_schema_node_js_1.CreateSchemaNode.cloneWithModifier(this.#props.createSchemaNode, 'IfNotExists'),
         });
     }
     toOperationNode() {
-        return this.#executor.transformQuery(this.#createSchemaNode, this.#queryId);
+        return this.#props.executor.transformQuery(this.#props.createSchemaNode, this.#props.queryId);
     }
     compile() {
-        return this.#executor.compileQuery(this.toOperationNode(), this.#queryId);
+        return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#executor.executeQuery(this.compile(), this.#queryId);
+        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
     }
 }
 exports.CreateSchemaBuilder = CreateSchemaBuilder;

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

@@ -1,15 +1,15 @@
 import { CreateTableNode } from '../operation-node/create-table-node.js';
-import { ColumnDataType } from '../operation-node/data-type-node.js';
 import { OperationNodeSource } from '../operation-node/operation-node-source.js';
 import { CompiledQuery } from '../query-compiler/compiled-query.js';
 import { Compilable } from '../util/compilable.js';
 import { QueryExecutor } from '../query-executor/query-executor.js';
 import { ColumnDefinitionBuilder } from './column-definition-builder.js';
-import { RawBuilder } from '../raw-builder/raw-builder.js';
 import { QueryId } from '../util/query-id.js';
+import { ForeignKeyConstraintBuilder } from './foreign-key-constraint-builder.js';
+import { DataTypeExpression } from '../parser/data-type-parser.js';
 export declare class CreateTableBuilder implements OperationNodeSource, Compilable {
     #private;
-    constructor(args: CreateTableBuilderConstructorArgs);
+    constructor(props: CreateTableBuilderProps);
     /**
      * Adds the "if not exists" modifier.
      *
@@ -30,7 +30,7 @@ export declare class CreateTableBuilder implements OperationNodeSource, Compilab
      *   .addColumn('data', db.raw('customtype'))
      * ```
      */
-    addColumn(columnName: string, dataType: ColumnDataType | RawBuilder, build?: ColumnBuilderCallback): CreateTableBuilder;
+    addColumn(columnName: string, dataType: DataTypeExpression, build?: ColumnBuilderCallback): CreateTableBuilder;
     /**
      * Adds a primary key constraint for one or more columns.
      *
@@ -70,15 +70,27 @@ export declare class CreateTableBuilder implements OperationNodeSource, Compilab
      *   ['id'],
      * )
      * ```
+     *
+     * @example
+     * ```ts
+     * addForeignKeyConstraint(
+     *   'owner_id_foreign',
+     *   ['owner_id1', 'owner_id2'],
+     *   'person',
+     *   ['id1', 'id2'],
+     *   (cb) => cb.onDelete('cascade')
+     * )
+     * ```
      */
-    addForeignKeyConstraint(constraintName: string, columns: string[], targetTable: string, targetColumns: string[]): CreateTableBuilder;
+    addForeignKeyConstraint(constraintName: string, columns: string[], targetTable: string, targetColumns: string[], build?: ForeignKeyConstraintBuilderCallback): CreateTableBuilder;
     toOperationNode(): CreateTableNode;
     compile(): CompiledQuery;
     execute(): Promise<void>;
 }
-export interface CreateTableBuilderConstructorArgs {
-    queryId: QueryId;
-    createTableNode: CreateTableNode;
-    executor: QueryExecutor;
+export interface CreateTableBuilderProps {
+    readonly queryId: QueryId;
+    readonly executor: QueryExecutor;
+    readonly createTableNode: CreateTableNode;
 }
-export declare type ColumnBuilderCallback = (tableBuilder: ColumnDefinitionBuilder) => ColumnDefinitionBuilder;
+export declare type ColumnBuilderCallback = (builder: ColumnDefinitionBuilder) => ColumnDefinitionBuilder;
+export declare type ForeignKeyConstraintBuilderCallback = (builder: ForeignKeyConstraintBuilder) => ForeignKeyConstraintBuilder;

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

@@ -3,18 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateTableBuilder = void 0;
 const column_definition_node_js_1 = require("../operation-node/column-definition-node.js");
 const create_table_node_js_1 = require("../operation-node/create-table-node.js");
-const data_type_node_js_1 = require("../operation-node/data-type-node.js");
-const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
 const prevent_await_js_1 = require("../util/prevent-await.js");
 const column_definition_builder_js_1 = require("./column-definition-builder.js");
+const object_utils_js_1 = require("../util/object-utils.js");
+const foreign_key_constraint_node_js_1 = require("../operation-node/foreign-key-constraint-node.js");
+const column_node_js_1 = require("../operation-node/column-node.js");
+const table_node_js_1 = require("../operation-node/table-node.js");
+const foreign_key_constraint_builder_js_1 = require("./foreign-key-constraint-builder.js");
+const data_type_parser_js_1 = require("../parser/data-type-parser.js");
 class CreateTableBuilder {
-    #queryId;
-    #createTableNode;
-    #executor;
-    constructor(args) {
-        this.#queryId = args.queryId;
-        this.#createTableNode = args.createTableNode;
-        this.#executor = args.executor;
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
     }
     /**
      * Adds the "if not exists" modifier.
@@ -23,9 +23,8 @@ class CreateTableBuilder {
      */
     ifNotExists() {
         return new CreateTableBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithModifier(this.#createTableNode, 'IfNotExists'),
+            ...this.#props,
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithModifier(this.#props.createTableNode, 'IfNotExists'),
         });
     }
     /**
@@ -43,16 +42,13 @@ class CreateTableBuilder {
      * ```
      */
     addColumn(columnName, dataType, build) {
-        let columnBuilder = new column_definition_builder_js_1.ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.create(columnName, (0, operation_node_source_js_1.isOperationNodeSource)(dataType)
-            ? dataType.toOperationNode()
-            : data_type_node_js_1.DataTypeNode.create(dataType)));
+        let columnBuilder = new column_definition_builder_js_1.ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.create(columnName, (0, data_type_parser_js_1.parseDataTypeExpression)(dataType)));
         if (build) {
             columnBuilder = build(columnBuilder);
         }
         return new CreateTableBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithColumn(this.#createTableNode, columnBuilder.toOperationNode()),
+            ...this.#props,
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithColumn(this.#props.createTableNode, columnBuilder.toOperationNode()),
         });
     }
     /**
@@ -65,9 +61,8 @@ class CreateTableBuilder {
      */
     addPrimaryKeyConstraint(constraintName, columns) {
         return new CreateTableBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithPrimaryKeyConstraint(this.#createTableNode, constraintName, columns),
+            ...this.#props,
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithPrimaryKeyConstraint(this.#props.createTableNode, constraintName, columns),
         });
     }
     /**
@@ -80,9 +75,8 @@ class CreateTableBuilder {
      */
     addUniqueConstraint(constraintName, columns) {
         return new CreateTableBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithUniqueConstraint(this.#createTableNode, constraintName, columns),
+            ...this.#props,
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithUniqueConstraint(this.#props.createTableNode, constraintName, columns),
         });
     }
     /**
@@ -95,9 +89,8 @@ class CreateTableBuilder {
      */
     addCheckConstraint(constraintName, checkExpression) {
         return new CreateTableBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithCheckConstraint(this.#createTableNode, constraintName, checkExpression),
+            ...this.#props,
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithCheckConstraint(this.#props.createTableNode, constraintName, checkExpression),
         });
     }
     /**
@@ -112,22 +105,36 @@ class CreateTableBuilder {
      *   ['id'],
      * )
      * ```
+     *
+     * @example
+     * ```ts
+     * addForeignKeyConstraint(
+     *   'owner_id_foreign',
+     *   ['owner_id1', 'owner_id2'],
+     *   'person',
+     *   ['id1', 'id2'],
+     *   (cb) => cb.onDelete('cascade')
+     * )
+     * ```
      */
-    addForeignKeyConstraint(constraintName, columns, targetTable, targetColumns) {
+    addForeignKeyConstraint(constraintName, columns, targetTable, targetColumns, build) {
+        let builder = new foreign_key_constraint_builder_js_1.ForeignKeyConstraintBuilder(foreign_key_constraint_node_js_1.ForeignKeyConstraintNode.create(columns.map(column_node_js_1.ColumnNode.create), table_node_js_1.TableNode.create(targetTable), targetColumns.map(column_node_js_1.ColumnNode.create), constraintName));
+        if (build) {
+            builder = build(builder);
+        }
         return new CreateTableBuilder({
-            queryId: this.#queryId,
-            executor: this.#executor,
-            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithForeignKeyConstraint(this.#createTableNode, constraintName, columns, targetTable, targetColumns),
+            ...this.#props,
+            createTableNode: create_table_node_js_1.CreateTableNode.cloneWithForeignKeyConstraint(this.#props.createTableNode, builder.toOperationNode()),
         });
     }
     toOperationNode() {
-        return this.#executor.transformQuery(this.#createTableNode, this.#queryId);
+        return this.#props.executor.transformQuery(this.#props.createTableNode, this.#props.queryId);
     }
     compile() {
-        return this.#executor.compileQuery(this.toOperationNode(), this.#queryId);
+        return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#executor.executeQuery(this.compile(), this.#queryId);
+        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
     }
 }
 exports.CreateTableBuilder = CreateTableBuilder;

package/dist/cjs/schema/drop-index-builder.d.ts

@@ -6,7 +6,7 @@ import { QueryExecutor } from '../query-executor/query-executor.js';
 import { QueryId } from '../util/query-id.js';
 export declare class DropIndexBuilder implements OperationNodeSource, Compilable {
     #private;
-    constructor(args: DropIndexBuilderConstructorArgs);
+    constructor(props: DropIndexBuilderProps);
     /**
      * Specifies the table the index was created for. This is not needed
      * in all dialects.
@@ -17,8 +17,8 @@ export declare class DropIndexBuilder implements OperationNodeSource, Compilable
     compile(): CompiledQuery;
     execute(): Promise<void>;
 }
-export interface DropIndexBuilderConstructorArgs {
-    queryId: QueryId;
-    dropIndexNode: DropIndexNode;
-    executor: QueryExecutor;
+export interface DropIndexBuilderProps {
+    readonly queryId: QueryId;
+    readonly executor: QueryExecutor;
+    readonly dropIndexNode: DropIndexNode;
 }