rake-db 2.4.30 → 2.4.33

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ColumnType, EnumColumn, ColumnTypes, ColumnsShape, DbResult, DefaultColumnTypes, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions, Adapter } from 'pqb';
+import { ColumnType, EnumColumn, ColumnTypes, ColumnsShape, Adapter, DbResult, DefaultColumnTypes, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
 import { EmptyObject, RawExpression, ColumnTypesBase, raw, MaybeArray } from 'orchid-core';
 
 declare function add(this: ColumnTypesBase, item: ColumnType, options?: {
@@ -54,7 +54,13 @@ declare type ColumnComment = {
     column: string;
     comment: string | null;
 };
-declare type Migration = DbResult<DefaultColumnTypes> & MigrationBase;
+declare type SilentQueries = {
+    silentQuery: Adapter['query'];
+    silentArrays: Adapter['arrays'];
+};
+declare type Migration = DbResult<DefaultColumnTypes> & MigrationBase & {
+    adapter: SilentQueries;
+};
 declare type ConstraintArg = {
     name?: string;
     references?: [
@@ -264,8 +270,8 @@ declare const redo: (options: MaybeArray<AdapterOptions>, config: RakeDbConfig,
 
 declare const rakeDb: (options: MaybeArray<AdapterOptions>, partialConfig?: Partial<RakeDbConfig>, args?: string[]) => Promise<void>;
 
-declare const saveMigratedVersion: (db: Adapter, version: string, config: RakeDbConfig) => Promise<void>;
-declare const removeMigratedVersion: (db: Adapter, version: string, config: RakeDbConfig) => Promise<void>;
+declare const saveMigratedVersion: (db: SilentQueries, version: string, config: RakeDbConfig) => Promise<void>;
+declare const removeMigratedVersion: (db: SilentQueries, version: string, config: RakeDbConfig) => Promise<void>;
 declare const getMigratedVersionsMap: (db: Adapter, config: RakeDbConfig) => Promise<Record<string, boolean>>;
 
-export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };
+export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, SilentQueries, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };

package/dist/index.js

@@ -472,6 +472,9 @@ const indexesToQuery = (up, { schema, name }, indexes) => {
         `INCLUDE (${orchidCore.toArray(options.include).map((column) => `"${column}"`).join(", ")})`
       );
     }
+    if (options.nullsNotDistinct) {
+      sql.push(`NULLS NOT DISTINCT`);
+    }
     if (options.with) {
       sql.push(`WITH (${options.with})`);
     }
@@ -1194,6 +1197,7 @@ const createMigrationInterface = (tx, up, options) => {
   adapter.arrays = (q, types) => {
     return wrapWithLog(log, q, () => arrays.call(adapter, q, types));
   };
+  Object.assign(adapter, { silentQuery: query, silentArrays: arrays });
   const db = pqb.createDb({ adapter });
   const { prototype: proto } = MigrationBase;
   for (const key of Object.getOwnPropertyNames(proto)) {
@@ -1457,14 +1461,14 @@ const queryExists = (db, sql) => {
 };
 
 const saveMigratedVersion = async (db, version, config) => {
-  await db.query(
+  await db.silentArrays(
     `INSERT INTO ${quoteWithSchema({
       name: config.migrationsTable
     })} VALUES ('${version}')`
   );
 };
 const removeMigratedVersion = async (db, version, config) => {
-  await db.query(
+  await db.silentArrays(
     `DELETE FROM ${quoteWithSchema({
       name: config.migrationsTable
     })} WHERE version = '${version}'`
@@ -1965,6 +1969,7 @@ ORDER BY c.ordinal_position`
     )
     FROM unnest(i.indkey[indnkeyatts:]) AS j(e)
   ) AS "include",
+  (to_jsonb(i.*)->'indnullsnotdistinct')::bool AS "nullsNotDistinct",
   NULLIF(pg_catalog.array_to_string(
     ic.reloptions || array(SELECT 'toast.' || x FROM pg_catalog.unnest(tc.reloptions) x),
     ', '
@@ -2461,6 +2466,7 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
         using: index.using === "btree" ? void 0 : index.using,
         unique: index.isUnique,
         include: index.include,
+        nullsNotDistinct: index.nullsNotDistinct,
         with: index.with,
         tablespace: index.tablespace,
         where: index.where
@@ -2513,6 +2519,7 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
         using: index.using === "btree" ? void 0 : index.using,
         unique: index.isUnique,
         include: index.include,
+        nullsNotDistinct: index.nullsNotDistinct,
         with: index.with,
         tablespace: index.tablespace,
         where: index.where