fixes #258

kysely-org · Dec 27, 2022 · cc25cdf · cc25cdf
1 parent 22cac0e
commit cc25cdf
Show file tree

Hide file tree

Showing 14 changed files with 103 additions and 83 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kysely",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "description": "Type safe SQL query builder",
   "repository": {
     "type": "git",

diff --git a/src/schema/alter-table-builder.ts b/src/schema/alter-table-builder.ts
@@ -237,8 +237,8 @@ export class AlterTableBuilder implements ColumnAlteringInterface {
 
 export interface AlterTableBuilderProps {
   readonly queryId: QueryId
-  readonly node: AlterTableNode
   readonly executor: QueryExecutor
+  readonly node: AlterTableNode
 }
 
 export class AlterTableExecutor implements OperationNodeSource, Compilable {
@@ -306,7 +306,7 @@ export class AlterTableColumnAlteringBuilder
   readonly #props: AlterTableColumnAlteringBuilderProps
 
   constructor(props: AlterTableColumnAlteringBuilderProps) {
-    this.#props = props
+    this.#props = freeze(props)
   }
 
   alterColumn(
@@ -396,12 +396,15 @@ export class AlterTableColumnAlteringBuilder
   }
 
   toOperationNode(): AlterTableNode {
-    return this.#props.node
+    return this.#props.executor.transformQuery(
+      this.#props.node,
+      this.#props.queryId
+    )
   }
 
   compile(): CompiledQuery {
     return this.#props.executor.compileQuery(
-      this.#props.node,
+      this.toOperationNode(),
       this.#props.queryId
     )
   }

diff --git a/src/schema/create-index-builder.ts b/src/schema/create-index-builder.ts
@@ -28,7 +28,7 @@ export class CreateIndexBuilder implements OperationNodeSource, Compilable {
   unique(): CreateIndexBuilder {
     return new CreateIndexBuilder({
       ...this.#props,
-      createIndexNode: CreateIndexNode.cloneWith(this.#props.createIndexNode, {
+      node: CreateIndexNode.cloneWith(this.#props.node, {
         unique: true,
       }),
     })
@@ -40,7 +40,7 @@ export class CreateIndexBuilder implements OperationNodeSource, Compilable {
   on(table: string): CreateIndexBuilder {
     return new CreateIndexBuilder({
       ...this.#props,
-      createIndexNode: CreateIndexNode.cloneWith(this.#props.createIndexNode, {
+      node: CreateIndexNode.cloneWith(this.#props.node, {
         table: parseTable(table),
       }),
     })
@@ -54,7 +54,7 @@ export class CreateIndexBuilder implements OperationNodeSource, Compilable {
   column(column: string): CreateIndexBuilder {
     return new CreateIndexBuilder({
       ...this.#props,
-      createIndexNode: CreateIndexNode.cloneWith(this.#props.createIndexNode, {
+      node: CreateIndexNode.cloneWith(this.#props.node, {
         expression: parseColumnName(column),
       }),
     })
@@ -68,7 +68,7 @@ export class CreateIndexBuilder implements OperationNodeSource, Compilable {
   columns(columns: string[]): CreateIndexBuilder {
     return new CreateIndexBuilder({
       ...this.#props,
-      createIndexNode: CreateIndexNode.cloneWith(this.#props.createIndexNode, {
+      node: CreateIndexNode.cloneWith(this.#props.node, {
         expression: ListNode.create(columns.map(parseColumnName)),
       }),
     })
@@ -92,7 +92,7 @@ export class CreateIndexBuilder implements OperationNodeSource, Compilable {
   expression(expression: Expression<any>): CreateIndexBuilder {
     return new CreateIndexBuilder({
       ...this.#props,
-      createIndexNode: CreateIndexNode.cloneWith(this.#props.createIndexNode, {
+      node: CreateIndexNode.cloneWith(this.#props.node, {
         expression: expression.toOperationNode(),
       }),
     })
@@ -106,15 +106,15 @@ export class CreateIndexBuilder implements OperationNodeSource, Compilable {
   using(indexType: string): CreateIndexBuilder {
     return new CreateIndexBuilder({
       ...this.#props,
-      createIndexNode: CreateIndexNode.cloneWith(this.#props.createIndexNode, {
+      node: CreateIndexNode.cloneWith(this.#props.node, {
         using: RawNode.createWithSql(indexType),
       }),
     })
   }
 
   toOperationNode(): CreateIndexNode {
     return this.#props.executor.transformQuery(
-      this.#props.createIndexNode,
+      this.#props.node,
       this.#props.queryId
     )
   }
@@ -139,5 +139,5 @@ preventAwait(
 export interface CreateIndexBuilderProps {
   readonly queryId: QueryId
   readonly executor: QueryExecutor
-  readonly createIndexNode: CreateIndexNode
+  readonly node: CreateIndexNode
 }
diff --git a/src/schema/create-schema-builder.ts b/src/schema/create-schema-builder.ts
@@ -17,16 +17,13 @@ export class CreateSchemaBuilder implements OperationNodeSource, Compilable {
   ifNotExists(): CreateSchemaBuilder {
     return new CreateSchemaBuilder({
       ...this.#props,
-      createSchemaNode: CreateSchemaNode.cloneWith(
-        this.#props.createSchemaNode,
-        { ifNotExists: true }
-      ),
+      node: CreateSchemaNode.cloneWith(this.#props.node, { ifNotExists: true }),
     })
   }
 
   toOperationNode(): CreateSchemaNode {
     return this.#props.executor.transformQuery(
-      this.#props.createSchemaNode,
+      this.#props.node,
       this.#props.queryId
     )
   }
@@ -51,5 +48,5 @@ preventAwait(
 export interface CreateSchemaBuilderProps {
   readonly queryId: QueryId
   readonly executor: QueryExecutor
-  readonly createSchemaNode: CreateSchemaNode
+  readonly node: CreateSchemaNode
 }
diff --git a/src/schema/create-table-builder.ts b/src/schema/create-table-builder.ts
@@ -45,7 +45,7 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
   temporary(): CreateTableBuilder<TB, C> {
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWith(this.#props.createTableNode, {
+      node: CreateTableNode.cloneWith(this.#props.node, {
         temporary: true,
       }),
     })
@@ -60,7 +60,7 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
   onCommit(onCommit: OnCommitAction): CreateTableBuilder<TB, C> {
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWith(this.#props.createTableNode, {
+      node: CreateTableNode.cloneWith(this.#props.node, {
         onCommit: parseOnCommitAction(onCommit),
       }),
     })
@@ -74,7 +74,7 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
   ifNotExists(): CreateTableBuilder<TB, C> {
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWith(this.#props.createTableNode, {
+      node: CreateTableNode.cloneWith(this.#props.node, {
         ifNotExists: true,
       }),
     })
@@ -140,8 +140,8 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
 
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWithColumn(
-        this.#props.createTableNode,
+      node: CreateTableNode.cloneWithColumn(
+        this.#props.node,
         columnBuilder.toOperationNode()
       ),
     })
@@ -165,8 +165,8 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
   ): CreateTableBuilder<TB, C> {
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWithConstraint(
-        this.#props.createTableNode,
+      node: CreateTableNode.cloneWithConstraint(
+        this.#props.node,
         PrimaryConstraintNode.create(columns, constraintName)
       ),
     })
@@ -190,8 +190,8 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
   ): CreateTableBuilder<TB, C> {
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWithConstraint(
-        this.#props.createTableNode,
+      node: CreateTableNode.cloneWithConstraint(
+        this.#props.node,
         UniqueConstraintNode.create(columns, constraintName)
       ),
     })
@@ -217,8 +217,8 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
   ): CreateTableBuilder<TB, C> {
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWithConstraint(
-        this.#props.createTableNode,
+      node: CreateTableNode.cloneWithConstraint(
+        this.#props.node,
         CheckConstraintNode.create(
           checkExpression.toOperationNode(),
           constraintName
@@ -276,8 +276,8 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
 
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWithConstraint(
-        this.#props.createTableNode,
+      node: CreateTableNode.cloneWithConstraint(
+        this.#props.node,
         builder.toOperationNode()
       ),
     })
@@ -312,8 +312,8 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
   modifyFront(modifier: Expression<any>): CreateTableBuilder<TB, C> {
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWithFrontModifier(
-        this.#props.createTableNode,
+      node: CreateTableNode.cloneWithFrontModifier(
+        this.#props.node,
         modifier.toOperationNode()
       ),
     })
@@ -348,8 +348,8 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
   modifyEnd(modifier: Expression<any>): CreateTableBuilder<TB, C> {
     return new CreateTableBuilder({
       ...this.#props,
-      createTableNode: CreateTableNode.cloneWithEndModifier(
-        this.#props.createTableNode,
+      node: CreateTableNode.cloneWithEndModifier(
+        this.#props.node,
         modifier.toOperationNode()
       ),
     })
@@ -393,7 +393,7 @@ export class CreateTableBuilder<TB extends string, C extends string = never>
 
   toOperationNode(): CreateTableNode {
     return this.#props.executor.transformQuery(
-      this.#props.createTableNode,
+      this.#props.node,
       this.#props.queryId
     )
   }
@@ -418,7 +418,7 @@ preventAwait(
 export interface CreateTableBuilderProps {
   readonly queryId: QueryId
   readonly executor: QueryExecutor
-  readonly createTableNode: CreateTableNode
+  readonly node: CreateTableNode
 }
 
 export type ColumnBuilderCallback = (

diff --git a/src/schema/create-type-builder.ts b/src/schema/create-type-builder.ts
@@ -16,7 +16,7 @@ export class CreateTypeBuilder implements OperationNodeSource, Compilable {
 
   toOperationNode(): CreateTypeNode {
     return this.#props.executor.transformQuery(
-      this.#props.createTypeNode,
+      this.#props.node,
       this.#props.queryId
     )
   }
@@ -33,10 +33,7 @@ export class CreateTypeBuilder implements OperationNodeSource, Compilable {
   asEnum(values: string[]): CreateTypeBuilder {
     return new CreateTypeBuilder({
       ...this.#props,
-      createTypeNode: CreateTypeNode.cloneWithEnum(
-        this.#props.createTypeNode,
-        values
-      ),
+      node: CreateTypeNode.cloneWithEnum(this.#props.node, values),
     })
   }
 
@@ -60,5 +57,5 @@ preventAwait(
 export interface CreateTypeBuilderProps {
   readonly queryId: QueryId
   readonly executor: QueryExecutor
-  readonly createTypeNode: CreateTypeNode
+  readonly node: CreateTypeNode
 }
diff --git a/src/schema/create-view-builder.ts b/src/schema/create-view-builder.ts
@@ -26,7 +26,7 @@ export class CreateViewBuilder implements OperationNodeSource, Compilable {
   temporary(): CreateViewBuilder {
     return new CreateViewBuilder({
       ...this.#props,
-      createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+      node: CreateViewNode.cloneWith(this.#props.node, {
         temporary: true,
       }),
     })
@@ -35,7 +35,7 @@ export class CreateViewBuilder implements OperationNodeSource, Compilable {
   materialized(): CreateViewBuilder {
     return new CreateViewBuilder({
       ...this.#props,
-      createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+      node: CreateViewNode.cloneWith(this.#props.node, {
         materialized: true,
       }),
     })
@@ -47,7 +47,7 @@ export class CreateViewBuilder implements OperationNodeSource, Compilable {
   ifNotExists(): CreateViewBuilder {
     return new CreateViewBuilder({
       ...this.#props,
-      createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+      node: CreateViewNode.cloneWith(this.#props.node, {
         ifNotExists: true,
       }),
     })
@@ -56,7 +56,7 @@ export class CreateViewBuilder implements OperationNodeSource, Compilable {
   orReplace(): CreateViewBuilder {
     return new CreateViewBuilder({
       ...this.#props,
-      createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+      node: CreateViewNode.cloneWith(this.#props.node, {
         orReplace: true,
       }),
     })
@@ -65,7 +65,7 @@ export class CreateViewBuilder implements OperationNodeSource, Compilable {
   columns(columns: string[]): CreateViewBuilder {
     return new CreateViewBuilder({
       ...this.#props,
-      createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+      node: CreateViewNode.cloneWith(this.#props.node, {
         columns: columns.map(parseColumnName),
       }),
     })
@@ -87,15 +87,15 @@ export class CreateViewBuilder implements OperationNodeSource, Compilable {
 
     return new CreateViewBuilder({
       ...this.#props,
-      createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+      node: CreateViewNode.cloneWith(this.#props.node, {
         as: queryNode,
       }),
     })
   }
 
   toOperationNode(): CreateViewNode {
     return this.#props.executor.transformQuery(
-      this.#props.createViewNode,
+      this.#props.node,
       this.#props.queryId
     )
   }
@@ -120,5 +120,5 @@ preventAwait(
 export interface CreateViewBuilderProps {
   readonly queryId: QueryId
   readonly executor: QueryExecutor
-  readonly createViewNode: CreateViewNode
+  readonly node: CreateViewNode
 }