velocious 1.0.566 → 1.0.568

package/README.md

@@ -37,6 +37,7 @@
 * AbortSignal-driven MySQL/MariaDB query cancellation for raw, model, and cross-tenant aggregate queries (see [docs/database-query-cancellation.md](docs/database-query-cancellation.md))
 * Optional built-in debug endpoint for inspecting server and database connection state (see [docs/debug-endpoint.md](docs/debug-endpoint.md))
 * Optional built-in API manifest endpoint describing every registered frontend-model resource as human- and machine-readable JSON (see [docs/api-manifest-endpoint.md](docs/api-manifest-endpoint.md))
+* Backend record attachments with filesystem, S3, native callback, and bounded Node path-input persistence (see [docs/attachments.md](docs/attachments.md))
 
 # Setup
 
@@ -521,6 +522,9 @@ Task.hasOneAttachment("descriptionFile")
 Task.hasOneAttachment("archivedPdf", {driver: "s3"})
 ```
 
+See [Backend record attachments](docs/attachments.md) for the complete input,
+storage-driver, lifecycle, and path-security contracts.
+
 You can also pass a driver class or instance directly on the attachment:
 
 ```js
@@ -538,6 +542,10 @@ await task.descriptionFile().attach({
   content: "my file content",
   filename: "file.doc"
 })
+await task.archivedPdf().attach({
+  path: "/var/app/uploads/archive.pdf",
+  contentType: "application/pdf"
+})
 const descriptionFileUrl = await task.descriptionFile().url()
 await task.update({
   descriptionFile: {
@@ -605,7 +613,25 @@ new Configuration({
 ```
 
 Then `{path: "..."}`
-inputs are only accepted when the file resolves inside one of the allowed prefixes.
+inputs are only accepted when the path resolves inside one of the allowed
+prefixes and the once-opened handle identifies a regular file. Its exact byte
+size comes from that handle's stat snapshot. The filesystem driver copies it
+with a bounded, backpressured stream and the S3 driver sends a Node `Readable`;
+on current nullable schemas neither driver first materializes the whole file as
+a Buffer or Base64 value. Legacy schemas with a non-null `content_base64`
+column instead materialize the opened snapshot once before driver persistence
+and reuse those exact bytes for storage and the database Base64. Path
+replacement cannot switch the opened source, truncation is rejected, later
+appends are ignored, and the source is closed after persistence.
+
+The native driver's documented `write({contentBase64, ...})` callback remains
+source-compatible. For path input only, that driver reads and Base64-encodes the
+opened source after driver selection on current schemas; legacy path input
+arrives pre-materialized with the same Base64 written to the database. Existing
+Buffer, string, browser, and `UploadedFile` inputs keep their in-memory
+behavior. See
+[docs/attachments.md](docs/attachments.md#normalized-storage-driver-input) for
+the normalized input passed to custom drivers.
 
 For frontend models, configure `resourceConfig().attachments` and use:
 
@@ -1148,6 +1174,8 @@ export default class CreateEvents extends Migration {
 }
 ```
 
+To reverse an `addReference("tasks", "project", {foreignKey: true, type: "uuid"})` migration, use `await this.removeReference("tasks", "project")` in `down()`. It removes the generated foreign key, index, and column; see [removing references and foreign keys](docs/database-migrations.md#removing-references-and-foreign-keys) for custom-column and foreign-key-only cases.
+
 Migrations that must be rerunnable can guard changes with `tableExists(...)`, `columnExists(table, column)` and `indexExists(table, index)` — a missing table yields `false` rather than throwing. See [docs/database-migrations.md](docs/database-migrations.md#guarding-schema-changes-in-rerunnable-migrations).
 
 ## Run migrations from the command line
@@ -1180,6 +1208,8 @@ Evaluate inline JavaScript (Rails-style runner) with initialized app/database co
 npx velocious runner "const users = await db.query('SELECT COUNT(*) AS count FROM users'); console.log(users[0].count)"
 ```
 
+Successful CLI commands exit with status `0`. If command execution rejects, Velocious marks the process failed and always runs final database cleanup. Successful cleanup preserves and rethrows the original command error unchanged; if cleanup also fails, an `AggregateError` retains the command error first and as its `cause`, followed by the cleanup error. Cleanup-only failures also exit nonzero. These failures therefore remain nonzero even when application code installs an `uncaughtException` listener that reports and consumes the error. See [CLI process exit behavior](docs/cli.md#process-exit-behavior).
+
 By default, migrations write `db/structure-<identifier>.sql` files for each database in non-test environments. Test skips these automatic writes unless you explicitly opt in. Configure allow/deny lists in your configuration:
 
 ```js

package/bin/velocious.js

@@ -39,10 +39,37 @@ const cli = new Cli({
   processArgs
 })
 
+let commandError
+let commandFailed = false
+
 try {
   await cli.execute()
-} finally {
+} catch (error) {
+  commandError = error
+  commandFailed = true
+  process.exitCode = 1
+}
+
+let cleanupError
+let cleanupFailed = false
+
+try {
   await configuration.closeDatabaseConnections()
+} catch (error) {
+  cleanupError = error
+  cleanupFailed = true
+  process.exitCode = 1
+}
+
+if (commandFailed && cleanupFailed) {
+  throw new AggregateError(
+    [commandError, cleanupError],
+    "Velocious CLI command execution and database cleanup both failed",
+    {cause: commandError}
+  )
 }
 
+if (commandFailed) throw commandError
+if (cleanupFailed) throw cleanupError
+
 process.exit(0)

package/build/bin/velocious.js

@@ -39,10 +39,37 @@ const cli = new Cli({
   processArgs
 })
 
+let commandError
+let commandFailed = false
+
 try {
   await cli.execute()
-} finally {
+} catch (error) {
+  commandError = error
+  commandFailed = true
+  process.exitCode = 1
+}
+
+let cleanupError
+let cleanupFailed = false
+
+try {
   await configuration.closeDatabaseConnections()
+} catch (error) {
+  cleanupError = error
+  cleanupFailed = true
+  process.exitCode = 1
+}
+
+if (commandFailed && cleanupFailed) {
+  throw new AggregateError(
+    [commandError, cleanupError],
+    "Velocious CLI command execution and database cleanup both failed",
+    {cause: commandError}
+  )
 }
 
+if (commandFailed) throw commandError
+if (cleanupFailed) throw cleanupError
+
 process.exit(0)

package/build/database/drivers/base-table.js

@@ -104,13 +104,15 @@ export default class VelociousDatabaseDriversBaseTable {
     }
 
     for (const foreignKey of await this.getForeignKeys()) {
-      tableData.addForeignKey(foreignKey.getTableDataForeignKey())
+      const tableDataForeignKey = foreignKey.getTableDataForeignKey()
+
+      tableData.addForeignKey(tableDataForeignKey)
 
       const tableDataColumn = tableDataColumns.find((tableDataColumn) => tableDataColumn.getName() == foreignKey.getColumnName())
 
       if (!tableDataColumn) throw new Error(`Couldn't find table data column for foreign key: ${foreignKey.getColumnName()}`)
 
-      tableDataColumn.setForeignKey(foreignKey)
+      tableDataColumn.setForeignKey(tableDataForeignKey)
     }
 
     for (const index of await this.getIndexes()) {
@@ -153,4 +155,3 @@ export default class VelociousDatabaseDriversBaseTable {
     return await this.getDriver().query(sql)
   }
 }
-

package/build/database/drivers/base.js

@@ -224,6 +224,34 @@ export default class VelociousDatabaseDriversBase {
     }
   }
 
+  /**
+   * Runs remove foreign key.
+   * @param {string} tableName - Table name.
+   * @param {import("./base-foreign-key.js").default} foreignKeyMetadata - Foreign key metadata.
+   * @returns {Promise<void>} - Resolves when complete.
+   */
+  async removeForeignKey(tableName, foreignKeyMetadata) {
+    this._assertNotReadOnly()
+
+    const tableForeignKey = new TableForeignKey({
+      columnName: foreignKeyMetadata.getColumnName(),
+      dropForeignKey: true,
+      name: foreignKeyMetadata.getName(),
+      referencedColumnName: foreignKeyMetadata.getReferencedColumnName(),
+      referencedTableName: foreignKeyMetadata.getReferencedTableName(),
+      tableName
+    })
+    const tableData = new TableData(tableName)
+
+    tableData.addForeignKey(tableForeignKey)
+
+    const alterTableSQLs = await this.alterTableSQLs(tableData)
+
+    for (const alterTableSQL of alterTableSQLs) {
+      await this.query(alterTableSQL)
+    }
+  }
+
   /**
    * Runs alter table sqls.
    * @abstract

package/build/database/drivers/index-metadata.js

@@ -0,0 +1,28 @@
+// @ts-check
+
+import { forcedBoolean, forcedString } from "typanic"
+
+/**
+ * IndexMetadataType type.
+ * @typedef {object} IndexMetadataType
+ * @property {string} column_name - Index column name.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
+
+/**
+ * Normalizes one untrusted database index metadata row.
+ * @param {import("./base.js").QueryRowType} row - Database index metadata row.
+ * @returns {IndexMetadataType} - Validated index metadata.
+ */
+export function normalizeIndexMetadataRow(row) {
+  return {
+    column_name: forcedString(row.column_name, "index column_name"),
+    index_name: forcedString(row.index_name, "index index_name"),
+    is_primary_key: forcedBoolean(row.is_primary_key, "index is_primary_key"),
+    is_unique: forcedBoolean(row.is_unique, "index is_unique"),
+    table_name: forcedString(row.table_name, "index table_name")
+  }
+}

package/build/database/drivers/mssql/column.js

@@ -1,7 +1,6 @@
 // @ts-check
 
 import BaseColumn from "../base-column.js"
-import ColumnsIndex from "./columns-index.js"
 import {digg} from "diggerize"
 
 export default class VelociousDatabaseDriversMssqlColumn extends BaseColumn {
@@ -19,39 +18,9 @@ export default class VelociousDatabaseDriversMssqlColumn extends BaseColumn {
   getAutoIncrement() { return digg(this, "data", "isIdentity") === 1 }
 
   async getIndexes() {
-    const options = this.getOptions()
-    const sql = `
-      SELECT
-        sys.tables.name AS TableName,
-        sys.columns.name AS ColumnName,
-        sys.indexes.name AS index_name,
-        sys.indexes.type_desc AS IndexType,
-        sys.index_columns.is_included_column AS IsIncludedColumn,
-        sys.indexes.is_unique,
-        sys.indexes.is_primary_key,
-        sys.indexes.is_unique_constraint
-      FROM sys.indexes
-      INNER JOIN sys.index_columns ON sys.indexes.object_id = sys.index_columns.object_id AND sys.indexes.index_id = sys.index_columns.index_id
-      INNER JOIN sys.columns ON sys.index_columns.object_id = sys.columns.object_id AND sys.index_columns.column_id = sys.columns.column_id
-      INNER JOIN sys.tables ON sys.indexes.object_id = sys.tables.object_id
-      WHERE
-        sys.tables.name = ${options.quote(this.getTable().getName())} AND
-        sys.columns.name = ${options.quote(this.getName())}
-      ORDER BY
-        sys.indexes.name,
-        sys.index_columns.key_ordinal
-    `
+    const indexes = await this.getTable().getIndexes()
 
-    const rows = await this.getDriver().query(sql)
-    const indexes = []
-
-    for (const row of rows) {
-      const index = new ColumnsIndex(this.getTable(), row)
-
-      indexes.push(index)
-    }
-
-    return indexes
+    return indexes.filter((index) => index.getColumnNames().includes(this.getName()))
   }
 
   getDefault() { return digg(this, "data", "COLUMN_DEFAULT") }
@@ -71,4 +40,3 @@ export default class VelociousDatabaseDriversMssqlColumn extends BaseColumn {
   getPrimaryKey() { return digg(this, "data", "isIdentity") === 1 }
   getType() { return digg(this, "data", "DATA_TYPE") }
 }
-

package/build/database/drivers/mssql/columns-index.js

@@ -1,6 +1,43 @@
 // @ts-check
 
 import BaseColumnsIndex from "../base-columns-index.js"
+import TableIndex from "../../table-data/table-index.js"
+
+/**
+ * MssqlColumnsIndexDataType type.
+ * @typedef {object} MssqlColumnsIndexDataType
+ * @property {string[]} columnNames - Ordered index column names.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
 
 export default class VelociousDatabaseDriversMssqlColumnsIndex extends BaseColumnsIndex {
+  /**
+   * Runs constructor.
+   * @param {import("../base-table.js").default} table - Table.
+   * @param {MssqlColumnsIndexDataType} data - Grouped index metadata.
+   */
+  constructor(table, data) {
+    super(table, data)
+    this.indexData = data
+  }
+
+  /**
+   * Runs get column names.
+   * @returns {string[]} - Ordered index column names.
+   */
+  getColumnNames() { return this.indexData.columnNames }
+
+  /**
+   * Runs get table data index.
+   * @returns {TableIndex} - Table-data index.
+   */
+  getTableDataIndex() {
+    return new TableIndex(this.getColumnNames(), {
+      name: this.getName(),
+      unique: this.isUnique()
+    })
+  }
 }

package/build/database/drivers/mssql/table.js

@@ -5,6 +5,51 @@ import Column from "./column.js"
 import ColumnsIndex from "./columns-index.js"
 import {digg} from "diggerize"
 import ForeignKey from "./foreign-key.js"
+import { normalizeIndexMetadataRow } from "../index-metadata.js"
+
+/**
+ * MssqlGroupedIndexDataType type.
+ * @typedef {object} MssqlGroupedIndexDataType
+ * @property {string[]} columnNames - Ordered index column names.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
+
+/**
+ * Groups ordered SQL Server index rows into one metadata value per index.
+ * @param {import("../index-metadata.js").IndexMetadataType[]} indexRows - Ordered index metadata rows.
+ * @returns {MssqlGroupedIndexDataType[]} - Grouped index metadata.
+ */
+export function groupMssqlIndexRows(indexRows) {
+  /** @type {Map<string, MssqlGroupedIndexDataType>} */
+  const indexDataByName = new Map()
+  /** @type {MssqlGroupedIndexDataType[]} */
+  const groupedIndexData = []
+
+  for (const indexRow of indexRows) {
+    const existingIndexData = indexDataByName.get(indexRow.index_name)
+
+    if (existingIndexData) {
+      existingIndexData.columnNames.push(indexRow.column_name)
+      continue
+    }
+
+    const indexData = {
+      columnNames: [indexRow.column_name],
+      index_name: indexRow.index_name,
+      is_primary_key: indexRow.is_primary_key,
+      is_unique: indexRow.is_unique,
+      table_name: indexRow.table_name
+    }
+
+    indexDataByName.set(indexRow.index_name, indexData)
+    groupedIndexData.push(indexData)
+  }
+
+  return groupedIndexData
+}
 
 export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
   /**
@@ -43,7 +88,7 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
     return await this.getDriver()._cachedTableSchemaMetadata(this.getName(), "foreignKeys", async () => {
       const sql = `
         SELECT
-            fk.name AS ForeignKeyName,
+            fk.name AS CONSTRAINT_NAME,
             tp.name AS ParentTable,
             ref.name AS ReferencedTable,
             cp.name AS ParentColumn,
@@ -63,7 +108,7 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
             ON fkc.referenced_object_id = cref.object_id
             AND fkc.referenced_column_id = cref.column_id
         WHERE tp.name = ${this.driver.quote(this.getName())}
-        ORDER BY ForeignKeyName, ParentTable, ReferencedTable;
+        ORDER BY CONSTRAINT_NAME, ParentTable, ReferencedTable;
       `
 
       const foreignKeyRows = await this.driver.query(sql)
@@ -84,20 +129,18 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
       const options = this.getOptions()
       const sql = `
         SELECT
-          sys.tables.name AS TableName,
-          sys.columns.name AS ColumnName,
+          sys.tables.name AS table_name,
+          sys.columns.name AS column_name,
           sys.indexes.name AS index_name,
-          sys.indexes.type_desc AS IndexType,
-          sys.index_columns.is_included_column AS IsIncludedColumn,
           sys.indexes.is_unique,
-          sys.indexes.is_primary_key,
-          sys.indexes.is_unique_constraint
+          sys.indexes.is_primary_key
         FROM sys.indexes
         INNER JOIN sys.index_columns ON sys.indexes.object_id = sys.index_columns.object_id AND sys.indexes.index_id = sys.index_columns.index_id
         INNER JOIN sys.columns ON sys.index_columns.object_id = sys.columns.object_id AND sys.index_columns.column_id = sys.columns.column_id
         INNER JOIN sys.tables ON sys.indexes.object_id = sys.tables.object_id
         WHERE
-          sys.tables.name = ${options.quote(this.getName())}
+          sys.tables.name = ${options.quote(this.getName())} AND
+          sys.index_columns.is_included_column = 0
         ORDER BY
           sys.indexes.name,
           sys.index_columns.key_ordinal
@@ -105,9 +148,10 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
 
       const rows = await this.getDriver().query(sql)
       const indexes = []
+      const indexRows = rows.map((row) => normalizeIndexMetadataRow(row))
 
-      for (const row of rows) {
-        const index = new ColumnsIndex(this, row)
+      for (const indexData of groupMssqlIndexRows(indexRows)) {
+        const index = new ColumnsIndex(this, indexData)
 
         indexes.push(index)
       }

package/build/database/drivers/mysql/sql/alter-table.js

@@ -4,6 +4,19 @@ import AlterTableBase from "../../../query/alter-table-base.js"
 import TableColumn from "../../../table-data/table-column.js"
 
 export default class VelociousDatabaseConnectionDriversMysqlSqlAlterTable extends AlterTableBase {
+  /**
+   * Runs get drop foreign key sql.
+   * @param {import("../../../table-data/table-foreign-key.js").default} foreignKey - Foreign key to drop.
+   * @returns {string} - SQL fragment that removes the foreign key.
+   */
+  getDropForeignKeySQL(foreignKey) {
+    const name = foreignKey.getName()
+
+    if (!name) throw new Error(`Cannot remove unnamed foreign key on ${foreignKey.getTableName()}.${foreignKey.getColumnName()}`)
+
+    return `DROP FOREIGN KEY ${this.getOptions().quoteIndexName(name)}`
+  }
+
   /**
    * Builds MySQL ALTER TABLE statements, adding indexes atomically with columns.
    * @returns {Promise<string[]>} - Resolves with SQL statements.

package/build/database/drivers/pgsql/column.js

@@ -1,7 +1,6 @@
 // @ts-check
 
 import BaseColumn from "../base-column.js"
-import ColumnsIndex from "./columns-index.js"
 import {digg} from "diggerize"
 
 export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumn {
@@ -25,33 +24,9 @@ export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumn {
   }
 
   async getIndexes() {
-    const options = this.getOptions()
+    const indexes = await this.getTable().getIndexes()
 
-    const indexesRows = await this.table.getDriver().query(`
-      SELECT
-        pg_attribute.attname AS column_name,
-        pg_index.indexrelid::regclass as index_name,
-        pg_class.relnamespace::regnamespace as schema_name,
-        pg_class.relname as table_name,
-        pg_index.indisprimary as is_primary_key,
-        pg_index.indisunique as is_unique
-      FROM pg_index
-      JOIN pg_class ON pg_class.oid = pg_index.indrelid
-      JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid AND pg_attribute.attnum = ANY(pg_index.indkey)
-      WHERE
-        pg_attribute.attname = ${options.quote(this.getName())} AND
-        pg_class.relname = ${options.quote(this.getTable().getName())}
-    `)
-
-    const indexes = []
-
-    for (const indexRow of indexesRows) {
-      const columnsIndex = new ColumnsIndex(this.getTable(), indexRow)
-
-      indexes.push(columnsIndex)
-    }
-
-    return indexes
+    return indexes.filter((index) => index.getColumnNames().includes(this.getName()))
   }
 
   getDefault() {

package/build/database/drivers/pgsql/columns-index.js

@@ -1,6 +1,43 @@
 // @ts-check
 
 import BaseColumnsIndex from "../base-columns-index.js"
+import TableIndex from "../../table-data/table-index.js"
+
+/**
+ * PgsqlColumnsIndexDataType type.
+ * @typedef {object} PgsqlColumnsIndexDataType
+ * @property {string[]} columnNames - Ordered index column names.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
 
 export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumnsIndex {
+  /**
+   * Runs constructor.
+   * @param {import("../base-table.js").default} table - Table.
+   * @param {PgsqlColumnsIndexDataType} data - Grouped index metadata.
+   */
+  constructor(table, data) {
+    super(table, data)
+    this.indexData = data
+  }
+
+  /**
+   * Runs get column names.
+   * @returns {string[]} - Ordered index column names.
+   */
+  getColumnNames() { return this.indexData.columnNames }
+
+  /**
+   * Runs get table data index.
+   * @returns {TableIndex} - Table-data index.
+   */
+  getTableDataIndex() {
+    return new TableIndex(this.getColumnNames(), {
+      name: this.getName(),
+      unique: this.isUnique()
+    })
+  }
 }

package/build/database/drivers/pgsql/table.js

@@ -4,6 +4,51 @@ import BaseTable from "../base-table.js"
 import Column from "./column.js"
 import ColumnsIndex from "./columns-index.js"
 import ForeignKey from "./foreign-key.js"
+import { normalizeIndexMetadataRow } from "../index-metadata.js"
+
+/**
+ * PgsqlGroupedIndexDataType type.
+ * @typedef {object} PgsqlGroupedIndexDataType
+ * @property {string[]} columnNames - Ordered index column names.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
+
+/**
+ * Groups ordered PostgreSQL index rows into one metadata value per index.
+ * @param {import("../index-metadata.js").IndexMetadataType[]} indexRows - Ordered index metadata rows.
+ * @returns {PgsqlGroupedIndexDataType[]} - Grouped index metadata.
+ */
+export function groupPgsqlIndexRows(indexRows) {
+  /** @type {Map<string, PgsqlGroupedIndexDataType>} */
+  const indexDataByName = new Map()
+  /** @type {PgsqlGroupedIndexDataType[]} */
+  const groupedIndexData = []
+
+  for (const indexRow of indexRows) {
+    const existingIndexData = indexDataByName.get(indexRow.index_name)
+
+    if (existingIndexData) {
+      existingIndexData.columnNames.push(indexRow.column_name)
+      continue
+    }
+
+    const indexData = {
+      columnNames: [indexRow.column_name],
+      index_name: indexRow.index_name,
+      is_primary_key: indexRow.is_primary_key,
+      is_unique: indexRow.is_unique,
+      table_name: indexRow.table_name
+    }
+
+    indexDataByName.set(indexRow.index_name, indexData)
+    groupedIndexData.push(indexData)
+  }
+
+  return groupedIndexData
+}
 
 export default class VelociousDatabaseDriversPgsqlTable extends BaseTable {
   /**
@@ -100,23 +145,29 @@ export default class VelociousDatabaseDriversPgsqlTable extends BaseTable {
 
       const indexesRows = await this.getDriver().query(`
         SELECT
-          pg_attribute.attname AS column_name,
-          pg_index.indexrelid::regclass as index_name,
-          pg_class.relnamespace::regnamespace as schema_name,
-          pg_class.relname as table_name,
-          pg_index.indisprimary as is_primary_key,
-          pg_index.indisunique as is_unique
+          index_attribute.attname AS column_name,
+          pg_index.indexrelid::regclass AS index_name,
+          pg_class.relname AS table_name,
+          pg_index.indisprimary AS is_primary_key,
+          pg_index.indisunique AS is_unique
         FROM pg_index
         JOIN pg_class ON pg_class.oid = pg_index.indrelid
-        JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid AND pg_attribute.attnum = ANY(pg_index.indkey)
+        JOIN LATERAL unnest(pg_index.indkey) WITH ORDINALITY AS index_columns(attribute_number, ordinal_position) ON true
+        JOIN pg_attribute AS index_attribute ON index_attribute.attrelid = pg_class.oid AND index_attribute.attnum = index_columns.attribute_number
         WHERE
-          pg_class.relname = ${options.quote(this.getName())}
+          pg_class.relname = ${options.quote(this.getName())} AND
+          index_columns.ordinal_position <= pg_index.indnkeyatts
+        ORDER BY
+          pg_index.indexrelid,
+          index_columns.ordinal_position
       `)
 
       const indexes = []
 
-      for (const indexRow of indexesRows) {
-        const columnsIndex = new ColumnsIndex(this, indexRow)
+      const indexRows = indexesRows.map((indexRow) => normalizeIndexMetadataRow(indexRow))
+
+      for (const indexData of groupPgsqlIndexRows(indexRows)) {
+        const columnsIndex = new ColumnsIndex(this, indexData)
 
         indexes.push(columnsIndex)
       }