kysely-org · koskimas · Sep 29, 2024 · Sep 29, 2024
diff --git a/src/kysely.ts b/src/kysely.ts
@@ -16,7 +16,6 @@ import {
   TransactionSettings,
   TRANSACTION_ISOLATION_LEVELS,
 } from './driver/driver.js'
-import { preventAwait } from './util/prevent-await.js'
 import {
   createFunctionModule,
   FunctionModule,
@@ -526,11 +525,6 @@ export class ConnectionBuilder<DB> {
 
 interface ConnectionBuilderProps extends KyselyProps {}
 
-preventAwait(
-  ConnectionBuilder,
-  "don't await ConnectionBuilder instances directly. To execute the query you need to call the `execute` method",
-)
-
 export class TransactionBuilder<DB> {
   readonly #props: TransactionBuilderProps
 
@@ -579,11 +573,6 @@ interface TransactionBuilderProps extends KyselyProps {
   readonly isolationLevel?: IsolationLevel
 }
 
-preventAwait(
-  TransactionBuilder,
-  "don't await TransactionBuilder instances directly. To execute the transaction you need to call the `execute` method",
-)
-
 function validateTransactionSettings(settings: TransactionSettings): void {
   if (
     settings.isolationLevel &&

diff --git a/src/operation-node/operation-node-transformer.ts b/src/operation-node/operation-node-transformer.ts
@@ -190,7 +190,8 @@ export class OperationNodeTransformer {
     DropConstraintNode: this.transformDropConstraint.bind(this),
     ForeignKeyConstraintNode: this.transformForeignKeyConstraint.bind(this),
     CreateViewNode: this.transformCreateView.bind(this),
-    RefreshMaterializedViewNode: this.transformRefreshMaterializedView.bind(this),
+    RefreshMaterializedViewNode:
+      this.transformRefreshMaterializedView.bind(this),
     DropViewNode: this.transformDropView.bind(this),
     GeneratedNode: this.transformGenerated.bind(this),
     DefaultValueNode: this.transformDefaultValue.bind(this),
@@ -798,7 +799,9 @@ export class OperationNodeTransformer {
     })
   }
 
-  protected transformRefreshMaterializedView(node: RefreshMaterializedViewNode): RefreshMaterializedViewNode {
+  protected transformRefreshMaterializedView(
+    node: RefreshMaterializedViewNode,
+  ): RefreshMaterializedViewNode {
     return requireAllProps<RefreshMaterializedViewNode>({
       kind: 'RefreshMaterializedViewNode',
       name: this.transformNode(node.name),

diff --git a/src/operation-node/operation-node-visitor.ts b/src/operation-node/operation-node-visitor.ts
@@ -279,7 +279,9 @@ export abstract class OperationNodeVisitor {
   protected abstract visitPrimitiveValueList(node: PrimitiveValueListNode): void
   protected abstract visitOperator(node: OperatorNode): void
   protected abstract visitCreateView(node: CreateViewNode): void
-  protected abstract visitRefreshMaterializedView(node: RefreshMaterializedViewNode): void
+  protected abstract visitRefreshMaterializedView(
+    node: RefreshMaterializedViewNode,
+  ): void
   protected abstract visitDropView(node: DropViewNode): void
   protected abstract visitGenerated(node: GeneratedNode): void
   protected abstract visitDefaultValue(node: DefaultValueNode): void

diff --git a/src/query-builder/aggregate-function-builder.ts b/src/query-builder/aggregate-function-builder.ts
@@ -2,7 +2,6 @@ import { freeze } from '../util/object-utils.js'
 import { AggregateFunctionNode } from '../operation-node/aggregate-function-node.js'
 import { AliasNode } from '../operation-node/alias-node.js'
 import { IdentifierNode } from '../operation-node/identifier-node.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { OverBuilder } from './over-builder.js'
 import { createOverBuilder } from '../parser/parse-utils.js'
 import {
@@ -300,11 +299,6 @@ export class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unknown>
   }
 }
 
-preventAwait(
-  AggregateFunctionBuilder,
-  "don't await AggregateFunctionBuilder instances. They are never executed directly and are always just a part of a query.",
-)
-
 /**
  * {@link AggregateFunctionBuilder} with an alias. The result of calling {@link AggregateFunctionBuilder.as}.
  */

diff --git a/src/query-builder/cte-builder.ts b/src/query-builder/cte-builder.ts
@@ -1,6 +1,5 @@
 import { OperationNodeSource } from '../operation-node/operation-node-source.js'
 import { CommonTableExpressionNode } from '../operation-node/common-table-expression-node.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { freeze } from '../util/object-utils.js'
 
 export class CTEBuilder<N extends string> implements OperationNodeSource {
@@ -39,11 +38,6 @@ export class CTEBuilder<N extends string> implements OperationNodeSource {
   }
 }
 
-preventAwait(
-  CTEBuilder,
-  "don't await CTEBuilder instances. They are never executed directly and are always just a part of a query.",
-)
-
 interface CTEBuilderProps {
   readonly node: CommonTableExpressionNode
 }

diff --git a/src/query-builder/delete-query-builder.ts b/src/query-builder/delete-query-builder.ts
@@ -35,7 +35,6 @@ import {
   SimplifySingleResult,
   SqlBool,
 } from '../util/type-utils.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { Compilable } from '../util/compilable.js'
 import { QueryExecutor } from '../query-executor/query-executor.js'
 import { QueryId } from '../util/query-id.js'
@@ -1153,11 +1152,6 @@ export class DeleteQueryBuilder<DB, TB extends keyof DB, O>
   }
 }
 
-preventAwait(
-  DeleteQueryBuilder,
-  "don't await DeleteQueryBuilder instances directly. To execute the query you need to call `execute` or `executeTakeFirst`.",
-)
-
 export interface DeleteQueryBuilderProps {
   readonly queryId: QueryId
   readonly queryNode: DeleteQueryNode

diff --git a/src/query-builder/insert-query-builder.ts b/src/query-builder/insert-query-builder.ts
@@ -22,7 +22,6 @@ import {
   UpdateObjectExpression,
   parseUpdateObjectExpression,
 } from '../parser/update-set-parser.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { Compilable } from '../util/compilable.js'
 import { QueryExecutor } from '../query-executor/query-executor.js'
 import { QueryId } from '../util/query-id.js'
@@ -1076,11 +1075,6 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
   }
 }
 
-preventAwait(
-  InsertQueryBuilder,
-  "don't await InsertQueryBuilder instances directly. To execute the query you need to call `execute` or `executeTakeFirst`.",
-)
-
 export interface InsertQueryBuilderProps {
   readonly queryId: QueryId
   readonly queryNode: InsertQueryNode

diff --git a/src/query-builder/join-builder.ts b/src/query-builder/join-builder.ts
@@ -10,7 +10,6 @@ import {
 import { ExpressionOrFactory } from '../parser/expression-parser.js'
 import { ReferenceExpression } from '../parser/reference-parser.js'
 import { freeze } from '../util/object-utils.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { SqlBool } from '../util/type-utils.js'
 
 export class JoinBuilder<DB, TB extends keyof DB>
@@ -92,11 +91,6 @@ export class JoinBuilder<DB, TB extends keyof DB>
   }
 }
 
-preventAwait(
-  JoinBuilder,
-  "don't await JoinBuilder instances. They are never executed directly and are always just a part of a query.",
-)
-
 export interface JoinBuilderProps {
   readonly joinNode: JoinNode
 }
diff --git a/src/query-builder/merge-query-builder.ts b/src/query-builder/merge-query-builder.ts
@@ -37,7 +37,6 @@ import { NOOP_QUERY_EXECUTOR } from '../query-executor/noop-query-executor.js'
 import { QueryExecutor } from '../query-executor/query-executor.js'
 import { Compilable } from '../util/compilable.js'
 import { freeze } from '../util/object-utils.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { QueryId } from '../util/query-id.js'
 import {
   ShallowRecord,
@@ -262,11 +261,6 @@ export class MergeQueryBuilder<DB, TT extends keyof DB, O>
   }
 }
 
-preventAwait(
-  MergeQueryBuilder,
-  "don't await MergeQueryBuilder instances directly. To execute the query you need to call `execute` when available.",
-)
-
 export interface MergeQueryBuilderProps {
   readonly queryId: QueryId
   readonly queryNode: MergeQueryNode
@@ -833,11 +827,6 @@ export class WheneableMergeQueryBuilder<
   }
 }
 
-preventAwait(
-  WheneableMergeQueryBuilder,
-  "don't await WheneableMergeQueryBuilder instances directly. To execute the query you need to call `execute`.",
-)
-
 export class MatchedThenableMergeQueryBuilder<
   DB,
   TT extends keyof DB,
@@ -1034,11 +1023,6 @@ export class MatchedThenableMergeQueryBuilder<
   }
 }
 
-preventAwait(
-  MatchedThenableMergeQueryBuilder,
-  "don't await MatchedThenableMergeQueryBuilder instances directly. To execute the query you need to call `execute` when available.",
-)
-
 export class NotMatchedThenableMergeQueryBuilder<
   DB,
   TT extends keyof DB,
@@ -1145,11 +1129,6 @@ export class NotMatchedThenableMergeQueryBuilder<
   }
 }
 
-preventAwait(
-  NotMatchedThenableMergeQueryBuilder,
-  "don't await NotMatchedThenableMergeQueryBuilder instances directly. To execute the query you need to call `execute` when available.",
-)
-
 export type ExtractWheneableMergeQueryBuilder<
   DB,
   TT extends keyof DB,

diff --git a/src/query-builder/on-conflict-builder.ts b/src/query-builder/on-conflict-builder.ts
@@ -17,7 +17,6 @@ import {
 } from '../parser/update-set-parser.js'
 import { Updateable } from '../util/column-type.js'
 import { freeze } from '../util/object-utils.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { AnyColumn, SqlBool } from '../util/type-utils.js'
 import { WhereInterface } from './where-interface.js'
 
@@ -251,8 +250,6 @@ export interface OnConflictBuilderProps {
   readonly onConflictNode: OnConflictNode
 }
 
-preventAwait(OnConflictBuilder, "don't await OnConflictBuilder instances.")
-
 export type OnConflictDatabase<DB, TB extends keyof DB> = {
   [K in keyof DB | 'excluded']: Updateable<K extends keyof DB ? DB[K] : DB[TB]>
 }
@@ -273,11 +270,6 @@ export class OnConflictDoNothingBuilder<DB, TB extends keyof DB>
   }
 }
 
-preventAwait(
-  OnConflictDoNothingBuilder,
-  "don't await OnConflictDoNothingBuilder instances.",
-)
-
 export class OnConflictUpdateBuilder<DB, TB extends keyof DB>
   implements WhereInterface<DB, TB>, OperationNodeSource
 {
@@ -358,8 +350,3 @@ export class OnConflictUpdateBuilder<DB, TB extends keyof DB>
     return this.#props.onConflictNode
   }
 }
-
-preventAwait(
-  OnConflictUpdateBuilder,
-  "don't await OnConflictUpdateBuilder instances.",
-)
diff --git a/src/query-builder/over-builder.ts b/src/query-builder/over-builder.ts
@@ -12,7 +12,6 @@ import {
 } from '../parser/partition-by-parser.js'
 import { StringReference } from '../parser/reference-parser.js'
 import { freeze } from '../util/object-utils.js'
-import { preventAwait } from '../util/prevent-await.js'
 
 export class OverBuilder<DB, TB extends keyof DB>
   implements OperationNodeSource
@@ -107,11 +106,6 @@ export class OverBuilder<DB, TB extends keyof DB>
   }
 }
 
-preventAwait(
-  OverBuilder,
-  "don't await OverBuilder instances. They are never executed directly and are always just a part of a query.",
-)
-
 export interface OverBuilderProps {
   readonly overNode: OverNode
 }
diff --git a/src/query-builder/select-query-builder.ts b/src/query-builder/select-query-builder.ts
@@ -40,7 +40,6 @@ import {
   UndirectedOrderByExpression,
   parseOrderBy,
 } from '../parser/order-by-parser.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { LimitNode } from '../operation-node/limit-node.js'
 import { OffsetNode } from '../operation-node/offset-node.js'
 import { Compilable } from '../util/compilable.js'
@@ -2487,11 +2486,6 @@ class SelectQueryBuilderImpl<DB, TB extends keyof DB, O>
   }
 }
 
-preventAwait(
-  SelectQueryBuilderImpl,
-  "don't await SelectQueryBuilder instances directly. To execute the query you need to call `execute` or `executeTakeFirst`.",
-)
-
 export function createSelectQueryBuilder<DB, TB extends keyof DB, O>(
   props: SelectQueryBuilderProps,
 ): SelectQueryBuilder<DB, TB, O> {
@@ -2549,11 +2543,6 @@ class AliasedSelectQueryBuilderImpl<
   }
 }
 
-preventAwait(
-  AliasedSelectQueryBuilderImpl,
-  "don't await AliasedSelectQueryBuilder instances directly. AliasedSelectQueryBuilder should never be executed directly since it's always a part of another query.",
-)
-
 export type SelectQueryBuilderWithInnerJoin<
   DB,
   TB extends keyof DB,

diff --git a/src/query-builder/update-query-builder.ts b/src/query-builder/update-query-builder.ts
@@ -41,7 +41,6 @@ import {
   ExtractUpdateTypeFromReferenceExpression,
   parseUpdate,
 } from '../parser/update-set-parser.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { Compilable } from '../util/compilable.js'
 import { QueryExecutor } from '../query-executor/query-executor.js'
 import { QueryId } from '../util/query-id.js'
@@ -1151,11 +1150,6 @@ export class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O>
   }
 }
 
-preventAwait(
-  UpdateQueryBuilder,
-  "don't await UpdateQueryBuilder instances directly. To execute the query you need to call `execute` or `executeTakeFirst`.",
-)
-
 export interface UpdateQueryBuilderProps {
   readonly queryId: QueryId
   readonly queryNode: UpdateQueryNode

diff --git a/src/query-compiler/default-query-compiler.ts b/src/query-compiler/default-query-compiler.ts
@@ -810,7 +810,9 @@ export class DefaultQueryCompiler
 
     if (node.joins) {
       if (!node.from) {
-        throw new Error("Joins in an update query are only supported as a part of a PostgreSQL 'update set from join' query. If you want to create a MySQL 'update join set' query, see https://kysely.dev/docs/examples/update/my-sql-joins")
+        throw new Error(
+          "Joins in an update query are only supported as a part of a PostgreSQL 'update set from join' query. If you want to create a MySQL 'update join set' query, see https://kysely.dev/docs/examples/update/my-sql-joins",
+        )
       }
 
       this.append(' ')
@@ -1254,8 +1256,10 @@ export class DefaultQueryCompiler
       this.visitNode(node.as)
     }
   }
-
-  protected override visitRefreshMaterializedView(node: RefreshMaterializedViewNode): void {
+
+  protected override visitRefreshMaterializedView(
+    node: RefreshMaterializedViewNode,
+  ): void {
     this.append('refresh materialized view ')
 
     if (node.concurrently) {

diff --git a/src/raw-builder/raw-builder.ts b/src/raw-builder/raw-builder.ts
@@ -2,7 +2,6 @@ import { QueryResult } from '../driver/database-connection.js'
 import { AliasNode } from '../operation-node/alias-node.js'
 import { RawNode } from '../operation-node/raw-node.js'
 import { CompiledQuery } from '../query-compiler/compiled-query.js'
-import { preventAwait } from '../util/prevent-await.js'
 import { QueryExecutor } from '../query-executor/query-executor.js'
 import { freeze } from '../util/object-utils.js'
 import { KyselyPlugin } from '../plugin/kysely-plugin.js'
@@ -221,11 +220,6 @@ export function createRawBuilder<O>(props: RawBuilderProps): RawBuilder<O> {
   return new RawBuilderImpl(props)
 }
 
-preventAwait(
-  RawBuilderImpl,
-  "don't await RawBuilder instances directly. To execute the query you need to call `execute`",
-)
-
 /**
  * {@link RawBuilder} with an alias. The result of calling {@link RawBuilder.as}.
  */
@@ -266,8 +260,3 @@ class AliasedRawBuilderImpl<O = unknown, A extends string = never>
     )
   }
 }
-
-preventAwait(
-  AliasedRawBuilderImpl,
-  "don't await AliasedRawBuilder instances directly. AliasedRawBuilder should never be executed directly since it's always a part of another query.",
-)