Merge branch 'master' into window-function-filter

src/dialect/mysql/mysql-driver.ts

@@ -121,17 +121,21 @@ class MysqlConnection implements DatabaseConnection {
       if (isOkPacket(result)) {
         const { insertId, affectedRows } = result
 
+        const numAffectedRows =
+          affectedRows !== undefined && affectedRows !== null
+            ? BigInt(affectedRows)
+            : undefined
+
         return {
           insertId:
             insertId !== undefined &&
             insertId !== null &&
             insertId.toString() !== '0'
               ? BigInt(insertId)
               : undefined,
-          numUpdatedOrDeletedRows:
-            affectedRows !== undefined && insertId !== null
-              ? BigInt(affectedRows)
-              : undefined,
+          // TODO: remove.
+          numUpdatedOrDeletedRows: numAffectedRows,
+          numAffectedRows,
           rows: [],
         }
       } else if (Array.isArray(result)) {

src/dialect/postgres/postgres-driver.ts

@@ -106,9 +106,17 @@ class PostgresConnection implements DatabaseConnection {
         ...compiledQuery.parameters,
       ])
 
-      if (result.command === 'UPDATE' || result.command === 'DELETE') {
+      if (
+        result.command === 'INSERT' ||
+        result.command === 'UPDATE' ||
+        result.command === 'DELETE'
+      ) {
+        const numAffectedRows = BigInt(result.rowCount)
+
         return {
-          numUpdatedOrDeletedRows: BigInt(result.rowCount),
+          // TODO: remove.
+          numUpdatedOrDeletedRows: numAffectedRows,
+          numAffectedRows,
           rows: result.rows ?? [],
         }
       }

src/dialect/sqlite/sqlite-driver.ts

@@ -76,11 +76,13 @@ class SqliteConnection implements DatabaseConnection {
     } else {
       const { changes, lastInsertRowid } = stmt.run(parameters)
 
+      const numAffectedRows =
+        changes !== undefined && changes !== null ? BigInt(changes) : undefined
+
       return Promise.resolve({
-        numUpdatedOrDeletedRows:
-          changes !== undefined && changes !== null
-            ? BigInt(changes)
-            : undefined,
+        // TODO: remove.
+        numUpdatedOrDeletedRows: numAffectedRows,
+        numAffectedRows,
         insertId:
           lastInsertRowid !== undefined && lastInsertRowid !== null
             ? BigInt(lastInsertRowid)

src/dialect/sqlite/sqlite-introspector.ts

@@ -68,6 +68,7 @@ export class SqliteIntrospector implements DatabaseIntrospector {
     const autoIncrementCol = createSql[0]?.sql
       ?.split(/[\(\),]/)
       ?.find((it) => it.toLowerCase().includes('autoincrement'))
+      ?.trimStart()
       ?.split(/\s+/)?.[0]
       ?.replace(/["`]/g, '')
 

src/driver/database-connection.ts

@@ -15,11 +15,17 @@ export interface DatabaseConnection {
 
 export interface QueryResult<O> {
   /**
-   * This is defined for update and delete queries and contains
-   * the number of rows the query updated/deleted.
+   * @deprecated use {@link QueryResult.numAffectedRows} instead.
    */
+  // TODO: remove.
   readonly numUpdatedOrDeletedRows?: bigint
 
+  /**
+   * This is defined for insert, update and delete queries and contains
+   * the number of rows the query inserted/updated/deleted.
+   */
+  readonly numAffectedRows?: bigint
+
   /**
    * This is defined for insert queries on dialects that return
    * the auto incrementing primary key from an insert.

src/index.ts

@@ -45,6 +45,7 @@ export * from './schema/foreign-key-constraint-builder.js'
 export * from './schema/alter-table-builder.js'
 export * from './schema/create-view-builder.js'
 export * from './schema/drop-view-builder.js'
+export * from './schema/alter-column-builder.js'
 
 export * from './dynamic/dynamic.js'
 
@@ -189,6 +190,7 @@ export {
   UnknownRow,
 } from './util/type-utils.js'
 export * from './util/infer-result.js'
+export { logOnce } from './util/log-once.js'
 
 export {
   SelectExpression,

src/operation-node/alter-table-node.ts

@@ -10,18 +10,24 @@ import { AddConstraintNode } from './add-constraint-node.js'
 import { DropConstraintNode } from './drop-constraint-node.js'
 import { ModifyColumnNode } from './modify-column-node.js'
 
-export type AlterTableNodeProps = Omit<AlterTableNode, 'kind' | 'table'>
+export type AlterTableNodeTableProps = Pick<
+  AlterTableNode,
+  'renameTo' | 'setSchema' | 'addConstraint' | 'dropConstraint'
+>
+
+export type AlterTableColumnAlterationNode =
+  | RenameColumnNode
+  | AddColumnNode
+  | DropColumnNode
+  | AlterColumnNode
+  | ModifyColumnNode
 
 export interface AlterTableNode extends OperationNode {
   readonly kind: 'AlterTableNode'
   readonly table: TableNode
   readonly renameTo?: TableNode
   readonly setSchema?: IdentifierNode
-  readonly renameColumn?: RenameColumnNode
-  readonly addColumn?: AddColumnNode
-  readonly dropColumn?: DropColumnNode
-  readonly alterColumn?: AlterColumnNode
-  readonly modifyColumn?: ModifyColumnNode
+  readonly columnAlterations?: ReadonlyArray<AlterTableColumnAlterationNode>
   readonly addConstraint?: AddConstraintNode
   readonly dropConstraint?: DropConstraintNode
 }
@@ -41,10 +47,25 @@ export const AlterTableNode = freeze({
     })
   },
 
-  cloneWith(node: AlterTableNode, props: AlterTableNodeProps): AlterTableNode {
+  cloneWithTableProps(
+    node: AlterTableNode,
+    props: AlterTableNodeTableProps
+  ): AlterTableNode {
     return freeze({
       ...node,
       ...props,
     })
   },
+
+  cloneWithColumnAlteration(
+    node: AlterTableNode,
+    columnAlteration: AlterTableColumnAlterationNode
+  ): AlterTableNode {
+    return freeze({
+      ...node,
+      columnAlterations: node.columnAlterations
+        ? [...node.columnAlterations, columnAlteration]
+        : [columnAlteration],
+    })
+  },
 })

src/operation-node/operation-node-transformer.ts

@@ -667,11 +667,7 @@ export class OperationNodeTransformer {
       table: this.transformNode(node.table),
       renameTo: this.transformNode(node.renameTo),
       setSchema: this.transformNode(node.setSchema),
-      renameColumn: this.transformNode(node.renameColumn),
-      addColumn: this.transformNode(node.addColumn),
-      dropColumn: this.transformNode(node.dropColumn),
-      alterColumn: this.transformNode(node.alterColumn),
-      modifyColumn: this.transformNode(node.modifyColumn),
+      columnAlterations: this.transformNodeList(node.columnAlterations),
       addConstraint: this.transformNode(node.addConstraint),
       dropConstraint: this.transformNode(node.dropConstraint),
     })

src/query-builder/delete-query-builder.ts

@@ -608,9 +608,14 @@ export class DeleteQueryBuilder<DB, TB extends keyof DB, O>
 
     if (this.#props.executor.adapter.supportsReturning && query.returning) {
       return result.rows
-    } else {
-      return [new DeleteResult(result.numUpdatedOrDeletedRows!) as unknown as O]
     }
+
+    return [
+      new DeleteResult(
+        // TODO: remove numUpdatedOrDeletedRows.
+        (result.numAffectedRows ?? result.numUpdatedOrDeletedRows)!
+      ) as any,
+    ]
   }
 
   /**

src/query-builder/insert-query-builder.ts

@@ -652,9 +652,15 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
 
     if (this.#props.executor.adapter.supportsReturning && query.returning) {
       return result.rows
-    } else {
-      return [new InsertResult(result.insertId) as unknown as O]
     }
+
+    return [
+      new InsertResult(
+        result.insertId,
+        // TODO: remove numUpdatedOrDeletedRows.
+        result.numAffectedRows ?? result.numUpdatedOrDeletedRows
+      ) as any,
+    ]
   }
 
   /**

src/query-builder/insert-result.ts

@@ -7,6 +7,9 @@
  * need to use {@link ReturningInterface.returning} or {@link ReturningInterface.returningAll}
  * to get out the inserted id.
  *
+ * {@link numInsertedOrUpdatedRows} holds the number of (actually) inserted rows.
+ * On MySQL, updated rows are counted twice when using `on duplicate key update`.
+ *
  * ### Examples
  *
  * ```ts
@@ -20,9 +23,14 @@
  */
 export class InsertResult {
   readonly #insertId: bigint | undefined
+  readonly #numInsertedOrUpdatedRows: bigint | undefined
 
-  constructor(insertId: bigint | undefined) {
+  constructor(
+    insertId: bigint | undefined,
+    numInsertedOrUpdatedRows: bigint | undefined
+  ) {
     this.#insertId = insertId
+    this.#numInsertedOrUpdatedRows = numInsertedOrUpdatedRows
   }
 
   /**
@@ -31,4 +39,11 @@ export class InsertResult {
   get insertId(): bigint | undefined {
     return this.#insertId
   }
+
+  /**
+   * Affected rows count.
+   */
+  get numInsertedOrUpdatedRows(): bigint | undefined {
+    return this.#numInsertedOrUpdatedRows
+  }
 }

src/query-builder/update-query-builder.ts

@@ -704,9 +704,14 @@ export class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O>
 
     if (this.#props.executor.adapter.supportsReturning && query.returning) {
       return result.rows
-    } else {
-      return [new UpdateResult(result.numUpdatedOrDeletedRows!) as unknown as O]
     }
+
+    return [
+      new UpdateResult(
+        // TODO: remove numUpdatedOrDeletedRows.
+        (result.numAffectedRows ?? result.numUpdatedOrDeletedRows)!
+      ) as any,
+    ]
   }
 
   /**

src/query-compiler/default-query-compiler.ts

@@ -954,24 +954,8 @@ export class DefaultQueryCompiler
       this.visitNode(node.dropConstraint)
     }
 
-    if (node.renameColumn) {
-      this.visitNode(node.renameColumn)
-    }
-
-    if (node.addColumn) {
-      this.visitNode(node.addColumn)
-    }
-
-    if (node.dropColumn) {
-      this.visitNode(node.dropColumn)
-    }
-
-    if (node.alterColumn) {
-      this.visitNode(node.alterColumn)
-    }
-
-    if (node.modifyColumn) {
-      this.visitNode(node.modifyColumn)
+    if (node.columnAlterations) {
+      this.compileList(node.columnAlterations)
     }
   }
 

src/query-executor/query-executor-base.ts

@@ -11,6 +11,7 @@ import { QueryId } from '../util/query-id.js'
 import { DialectAdapter } from '../dialect/dialect-adapter.js'
 import { QueryExecutor } from './query-executor.js'
 import { Deferred } from '../util/deferred.js'
+import { logOnce } from '../util/log-once.js'
 
 const NO_PLUGINS: ReadonlyArray<KyselyPlugin> = freeze([])
 
@@ -65,7 +66,13 @@ export abstract class QueryExecutorBase implements QueryExecutor {
   ): Promise<QueryResult<R>> {
     return await this.provideConnection(async (connection) => {
       const result = await connection.executeQuery(compiledQuery)
-      return this.#transformResult(result, queryId)
+
+      const transformedResult = await this.#transformResult(result, queryId)
+
+      // TODO: remove.
+      warnOfOutdatedDriverOrPlugins(result, transformedResult)
+
+      return transformedResult as any
     })
   }
 
@@ -118,3 +125,24 @@ export abstract class QueryExecutorBase implements QueryExecutor {
     return result
   }
 }
+
+// TODO: remove.
+function warnOfOutdatedDriverOrPlugins(
+  result: QueryResult<unknown>,
+  transformedResult: QueryResult<unknown>
+): void {
+  const { numAffectedRows } = result
+
+  if (
+    (numAffectedRows === undefined &&
+      result.numUpdatedOrDeletedRows === undefined) ||
+    (numAffectedRows !== undefined &&
+      transformedResult.numAffectedRows !== undefined)
+  ) {
+    return
+  }
+
+  logOnce(
+    'kysely:warning: outdated driver/plugin detected! QueryResult.numUpdatedOrDeletedRows is deprecated and will be removed in a future release.'
+  )
+}