rake-db 2.8.7 → 2.8.8

package/dist/index.d.ts

@@ -1,17 +1,17 @@
-import * as pqb from 'pqb';
-import { ColumnsShape, Db as Db$1, ColumnType, EnumColumn, Adapter, DefaultColumnTypes, DbResult, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
 import * as orchid_core from 'orchid-core';
 import { ColumnTypesBase, EmptyObject, RawExpression, raw, MaybeArray } from 'orchid-core';
+import * as pqb from 'pqb';
+import { ColumnsShape, Db as Db$1, ColumnType, EnumColumn, Adapter, DefaultColumnTypes, DbResult, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
 
 type CreateTableResult<Table extends string, Shape extends ColumnsShape> = {
     table: Db$1<Table, Shape>;
 };
 
-declare function add(this: ColumnTypesBase, item: ColumnType, options?: {
+declare function add(item: ColumnType, options?: {
     dropMode?: DropMode;
 }): RakeDbAst.ChangeTableItem.Column;
-declare function add(this: ColumnTypesBase, emptyObject: EmptyObject): EmptyObject;
-declare function add(this: ColumnTypesBase, items: Record<string, ColumnType>, options?: {
+declare function add(emptyObject: EmptyObject): EmptyObject;
+declare function add(items: Record<string, ColumnType>, options?: {
     dropMode?: DropMode;
 }): Record<string, RakeDbAst.ChangeTableItem.Column>;
 type Change = RakeDbAst.ChangeTableItem.Change & ChangeOptions;
@@ -21,6 +21,7 @@ type ChangeOptions = {
 };
 type TableChangeMethods = typeof tableChangeMethods;
 declare const tableChangeMethods: {
+    name(this: ColumnTypesBase, name: string): any;
     add: typeof add;
     drop: typeof add;
     change(this: ColumnTypesBase, from: ColumnType | Change, to: ColumnType | Change, options?: ChangeOptions): Change;
@@ -29,7 +30,7 @@ declare const tableChangeMethods: {
     nonNullable(): Change;
     comment(comment: string | null): Change;
     rename(name: string): RakeDbAst.ChangeTableItem.Rename;
-    enum(this: ColumnTypesBase, name: string): EnumColumn<string, [string, ...string[]]>;
+    enum(name: string): EnumColumn<string, [string, ...string[]]>;
 };
 type TableChanger<CT extends ColumnTypesBase> = MigrationColumnTypes<CT> & TableChangeMethods;
 type TableChangeData = Record<string, RakeDbAst.ChangeTableItem.Column | RakeDbAst.ChangeTableItem.Rename | Change | EmptyObject>;
@@ -78,7 +79,7 @@ type ConstraintArg = {
     check?: RawExpression;
     dropMode?: DropMode;
 };
-declare const createMigrationInterface: <CT extends ColumnTypesBase>(tx: TransactionAdapter, up: boolean, config: RakeDbConfig<CT>) => Migration;
+declare const createMigrationInterface: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(tx: TransactionAdapter, up: boolean, config: RakeDbConfig<CT>) => Migration;
 declare class MigrationBase<CT extends ColumnTypesBase> {
     adapter: TransactionAdapter;
     log?: QueryLogObject;
@@ -310,23 +311,23 @@ type AppCodeUpdater = {
     afterAll(params: AppCodeUpdaterParams): Promise<void>;
 };
 
-declare const createDb: <CT extends ColumnTypesBase>(arg: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>) => Promise<void>;
+declare const createDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(arg: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>) => Promise<void>;
 declare const dropDb: (arg: MaybeArray<AdapterOptions>) => Promise<void>;
-declare const resetDb: <CT extends ColumnTypesBase>(arg: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>) => Promise<void>;
+declare const resetDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(arg: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>) => Promise<void>;
 
-declare const writeMigrationFile: <CT extends ColumnTypesBase>(config: RakeDbConfig<CT>, version: string, name: string, content: (importPath: string, name: string) => string) => Promise<void>;
-declare const generate: <CT extends ColumnTypesBase>(config: RakeDbConfig<CT>, [name]: string[]) => Promise<void>;
+declare const writeMigrationFile: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(config: RakeDbConfig<CT>, version: string, name: string, content: (importPath: string, name: string) => string) => Promise<void>;
+declare const generate: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(config: RakeDbConfig<CT>, [name]: string[]) => Promise<void>;
 declare const makeFileTimeStamp: () => string;
 
 type ChangeCallback<CT extends ColumnTypesBase = ColumnTypesBase> = (db: Migration<CT>, up: boolean) => Promise<void>;
 
-declare const migrateOrRollback: <CT extends ColumnTypesBase>(options: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>, args: string[], up: boolean) => Promise<void>;
+declare const migrateOrRollback: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(options: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>, args: string[], up: boolean) => Promise<void>;
 declare const changeCache: Record<string, ChangeCallback[] | undefined>;
-declare const migrate: <CT extends ColumnTypesBase>(options: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>, args?: string[]) => Promise<void>;
-declare const rollback: <CT extends ColumnTypesBase>(options: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>, args?: string[]) => Promise<void>;
-declare const redo: <CT extends ColumnTypesBase>(options: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>, args?: string[]) => Promise<void>;
+declare const migrate: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(options: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>, args?: string[]) => Promise<void>;
+declare const rollback: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(options: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>, args?: string[]) => Promise<void>;
+declare const redo: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(options: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>, args?: string[]) => Promise<void>;
 
-declare const rakeDb: <CT extends ColumnTypesBase = {
+declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreator> = {
     timestamps: <T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
         name(name: string): {
             timestamp(): T;
@@ -347,49 +348,49 @@ declare const rakeDb: <CT extends ColumnTypesBase = {
     };
     name: typeof orchid_core.name;
     raw: (sql: string, values?: false | Record<string, unknown> | undefined) => orchid_core.RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>;
-    smallint(this: ColumnTypesBase): pqb.SmallIntColumn;
-    integer(this: ColumnTypesBase): pqb.IntegerColumn;
-    bigint(this: ColumnTypesBase): pqb.BigIntColumn;
-    numeric<Precision extends number | undefined = undefined, Scale extends number | undefined = undefined>(this: ColumnTypesBase, precision?: Precision | undefined, scale?: Scale | undefined): pqb.DecimalColumn<Precision, Scale>;
-    decimal<Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(this: ColumnTypesBase, precision?: Precision_1 | undefined, scale?: Scale_1 | undefined): pqb.DecimalColumn<Precision_1, Scale_1>;
-    real(this: ColumnTypesBase): pqb.RealColumn;
-    doublePrecision(this: ColumnTypesBase): pqb.DoublePrecisionColumn;
-    identity(this: ColumnTypesBase, options?: pqb.TableData.Identity | undefined): pqb.IntegerColumn;
-    smallSerial(this: ColumnTypesBase): pqb.SmallSerialColumn;
-    serial(this: ColumnTypesBase): pqb.SerialColumn;
-    bigSerial(this: ColumnTypesBase): pqb.BigSerialColumn;
-    money(this: ColumnTypesBase): pqb.MoneyColumn;
-    varchar<Limit extends number | undefined = undefined>(this: ColumnTypesBase, limit?: Limit | undefined): pqb.VarCharColumn<Limit>;
-    char<Limit_1 extends number | undefined = undefined>(this: ColumnTypesBase, limit?: Limit_1 | undefined): pqb.CharColumn<Limit_1>;
-    text: (this: ColumnTypesBase, min: number, max: number) => pqb.TextColumn;
-    string: (this: ColumnTypesBase, min: number, max: number) => pqb.TextColumn;
-    citext(this: ColumnTypesBase, min: number, max: number): pqb.CitextColumn;
-    bytea(this: ColumnTypesBase): pqb.ByteaColumn;
-    date(this: ColumnTypesBase): pqb.DateColumn;
-    timestampWithoutTimeZone<Precision_2 extends number>(this: ColumnTypesBase, precision?: Precision_2 | undefined): pqb.TimestampColumn<Precision_2>;
-    timestamp<Precision_3 extends number | undefined = undefined>(this: ColumnTypesBase, precision?: Precision_3 | undefined): pqb.TimestampTzColumn<number>;
-    time<Precision_4 extends number | undefined = undefined>(this: ColumnTypesBase, precision?: Precision_4 | undefined): pqb.TimeColumn<Precision_4>;
-    interval<Fields extends string | undefined = undefined, Precision_5 extends number | undefined = undefined>(this: ColumnTypesBase, fields?: Fields | undefined, precision?: Precision_5 | undefined): pqb.IntervalColumn<Fields, Precision_5>;
-    boolean(this: ColumnTypesBase): pqb.BooleanColumn;
-    enum<U extends string, T_2 extends [U, ...U[]]>(this: ColumnTypesBase, dataType: string, type: T_2): pqb.EnumColumn<U, T_2>;
-    point(this: ColumnTypesBase): pqb.PointColumn;
-    line(this: ColumnTypesBase): pqb.LineColumn;
-    lseg(this: ColumnTypesBase): pqb.LsegColumn;
-    box(this: ColumnTypesBase): pqb.BoxColumn;
-    path(this: ColumnTypesBase): pqb.PathColumn;
-    polygon(this: ColumnTypesBase): pqb.PolygonColumn;
-    circle(this: ColumnTypesBase): pqb.CircleColumn;
-    cidr(this: ColumnTypesBase): pqb.CidrColumn;
-    inet(this: ColumnTypesBase): pqb.InetColumn;
-    macaddr(this: ColumnTypesBase): pqb.MacAddrColumn;
-    macaddr8(this: ColumnTypesBase): pqb.MacAddr8Column;
-    bit<Length extends number>(this: ColumnTypesBase, length: Length): pqb.BitColumn<Length>;
-    bitVarying<Length_1 extends number | undefined = undefined>(this: ColumnTypesBase, length?: Length_1 | undefined): pqb.BitVaryingColumn<Length_1>;
-    tsvector(this: ColumnTypesBase): pqb.TsVectorColumn;
-    tsquery(this: ColumnTypesBase): pqb.TsQueryColumn;
-    uuid(this: ColumnTypesBase): pqb.UUIDColumn;
-    xml(this: ColumnTypesBase): pqb.XMLColumn;
-    json<Type extends orchid_core.JSONTypeAny>(this: ColumnTypesBase, schemaOrFn: Type | ((j: {
+    smallint(): pqb.SmallIntColumn;
+    integer(): pqb.IntegerColumn;
+    bigint(): pqb.BigIntColumn;
+    numeric<Precision extends number | undefined = undefined, Scale extends number | undefined = undefined>(precision?: Precision | undefined, scale?: Scale | undefined): pqb.DecimalColumn<Precision, Scale>;
+    decimal<Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(precision?: Precision_1 | undefined, scale?: Scale_1 | undefined): pqb.DecimalColumn<Precision_1, Scale_1>;
+    real(): pqb.RealColumn;
+    doublePrecision(): pqb.DoublePrecisionColumn;
+    identity(options?: pqb.TableData.Identity | undefined): pqb.IntegerColumn;
+    smallSerial(): pqb.SmallSerialColumn;
+    serial(): pqb.SerialColumn;
+    bigSerial(): pqb.BigSerialColumn;
+    money(): pqb.MoneyColumn;
+    varchar<Limit extends number | undefined = undefined>(limit?: Limit | undefined): pqb.VarCharColumn<Limit>;
+    char<Limit_1 extends number | undefined = undefined>(limit?: Limit_1 | undefined): pqb.CharColumn<Limit_1>;
+    text: (min: number, max: number) => pqb.TextColumn;
+    string: (min: number, max: number) => pqb.TextColumn;
+    citext(min: number, max: number): pqb.CitextColumn;
+    bytea(): pqb.ByteaColumn;
+    date(): pqb.DateColumn;
+    timestampWithoutTimeZone<Precision_2 extends number>(precision?: Precision_2 | undefined): pqb.TimestampColumn<Precision_2>;
+    timestamp<Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined): pqb.TimestampTzColumn<number>;
+    time<Precision_4 extends number | undefined = undefined>(precision?: Precision_4 | undefined): pqb.TimeColumn<Precision_4>;
+    interval<Fields extends string | undefined = undefined, Precision_5 extends number | undefined = undefined>(fields?: Fields | undefined, precision?: Precision_5 | undefined): pqb.IntervalColumn<Fields, Precision_5>;
+    boolean(): pqb.BooleanColumn;
+    enum<U extends string, T_2 extends [U, ...U[]]>(dataType: string, type: T_2): pqb.EnumColumn<U, T_2>;
+    point(): pqb.PointColumn;
+    line(): pqb.LineColumn;
+    lseg(): pqb.LsegColumn;
+    box(): pqb.BoxColumn;
+    path(): pqb.PathColumn;
+    polygon(): pqb.PolygonColumn;
+    circle(): pqb.CircleColumn;
+    cidr(): pqb.CidrColumn;
+    inet(): pqb.InetColumn;
+    macaddr(): pqb.MacAddrColumn;
+    macaddr8(): pqb.MacAddr8Column;
+    bit<Length extends number>(length: Length): pqb.BitColumn<Length>;
+    bitVarying<Length_1 extends number | undefined = undefined>(length?: Length_1 | undefined): pqb.BitVaryingColumn<Length_1>;
+    tsvector(): pqb.TsVectorColumn;
+    tsquery(): pqb.TsQueryColumn;
+    uuid(): pqb.UUIDColumn;
+    xml(): pqb.XMLColumn;
+    json<Type extends orchid_core.JSONTypeAny>(schemaOrFn: Type | ((j: {
         set: <Value extends orchid_core.JSONTypeAny>(valueType: Value) => orchid_core.JSONSet<Value>;
         tuple: <T_3 extends [] | orchid_core.JSONTupleItems, Rest extends orchid_core.JSONTypeAny | null = null>(items: T_3, rest?: Rest) => orchid_core.JSONTuple<T_3, Rest>;
         union: <T_4 extends [orchid_core.JSONTypeAny, orchid_core.JSONTypeAny, ...orchid_core.JSONTypeAny[]]>(types: T_4) => orchid_core.JSONUnion<T_4>;
@@ -422,10 +423,10 @@ declare const rakeDb: <CT extends ColumnTypesBase = {
         optional: <T_17 extends orchid_core.JSONTypeAny>(type: T_17) => orchid_core.JSONOptional<T_17>;
         record: typeof orchid_core.record;
     }) => Type)): pqb.JSONColumn<Type>;
-    jsonText(this: ColumnTypesBase): pqb.JSONTextColumn;
-    array<Item extends pqb.ColumnType<unknown, orchid_core.BaseOperators, unknown>>(this: ColumnTypesBase, item: Item): pqb.ArrayColumn<Item>;
-    type(this: ColumnTypesBase, dataType: string): pqb.CustomTypeColumn;
-    domain(this: ColumnTypesBase, dataType: string): pqb.DomainColumn;
+    jsonText(): pqb.JSONTextColumn;
+    array<Item extends pqb.ColumnType<unknown, orchid_core.BaseOperators, unknown>>(item: Item): pqb.ArrayColumn<Item>;
+    type(dataType: string): pqb.CustomTypeColumn;
+    domain(dataType: string): pqb.DomainColumn;
     primaryKey(columns: string[], options?: {
         name?: string | undefined;
     } | undefined): {};
@@ -446,8 +447,8 @@ declare const rakeDb: <CT extends ColumnTypesBase = {
     promise: Promise<void>;
 };
 
-declare const saveMigratedVersion: <CT extends ColumnTypesBase>(db: SilentQueries, version: string, config: RakeDbConfig<CT>) => Promise<void>;
-declare const removeMigratedVersion: <CT extends ColumnTypesBase>(db: SilentQueries, version: string, config: RakeDbConfig<CT>) => Promise<void>;
-declare const getMigratedVersionsMap: <CT extends ColumnTypesBase>(db: Adapter, config: RakeDbConfig<CT>) => Promise<Record<string, boolean>>;
+declare const saveMigratedVersion: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(db: SilentQueries, version: string, config: RakeDbConfig<CT>) => Promise<void>;
+declare const removeMigratedVersion: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(db: SilentQueries, version: string, config: RakeDbConfig<CT>) => Promise<void>;
+declare const getMigratedVersionsMap: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(db: Adapter, config: RakeDbConfig<CT>) => Promise<Record<string, boolean>>;
 
 export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, SilentQueries, TableOptions, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };

package/dist/index.js

@@ -526,7 +526,7 @@ const primaryKeyToSql = (primaryKey) => {
 
 const tableMethods = {
   enum(name) {
-    return new pqb.EnumColumn(this, name, []);
+    return new pqb.EnumColumn(name, []);
   }
 };
 
@@ -774,7 +774,7 @@ const mergeTableData = (a, b) => {
 };
 function add(item, options) {
   if (item instanceof pqb.ColumnType) {
-    return addOrDrop(this, "add", item, options);
+    return addOrDrop("add", item, options);
   } else if (item === orchidCore.emptyObject) {
     mergeTableData(changeTableData.add, pqb.getTableData());
     pqb.resetTableData();
@@ -793,7 +793,7 @@ function add(item, options) {
 }
 const drop = function(item, options) {
   if (item instanceof pqb.ColumnType) {
-    return addOrDrop(this, "drop", item, options);
+    return addOrDrop("drop", item, options);
   } else if (item === orchidCore.emptyObject) {
     mergeTableData(changeTableData.drop, pqb.getTableData());
     pqb.resetTableData();
@@ -810,9 +810,10 @@ const drop = function(item, options) {
     return result;
   }
 };
-const addOrDrop = (types, type, item, options) => {
-  if (types[orchidCore.nameKey]) {
-    item.data.name = types[orchidCore.nameKey];
+const addOrDrop = (type, item, options) => {
+  const name = orchidCore.consumeColumnName();
+  if (name) {
+    item.data.name = name;
   }
   if (item instanceof pqb.UnknownColumn) {
     const empty = columnTypeToColumnChange({
@@ -856,13 +857,19 @@ const columnTypeToColumnChange = (item) => {
   }
   return item.to;
 };
+const nameKey = Symbol("name");
 const tableChangeMethods = __spreadProps$2(__spreadValues$3({}, tableMethods), {
+  name(name) {
+    const types = Object.create(pqb.columnTypes.name.call(this, name));
+    types[nameKey] = name;
+    return types;
+  },
   add,
   drop,
   change(from, to, options) {
     return __spreadValues$3({
       type: "change",
-      name: this[orchidCore.nameKey],
+      name: this[nameKey],
       from: columnTypeToColumnChange(from),
       to: columnTypeToColumnChange(to)
     }, options);
@@ -2517,22 +2524,22 @@ const getColumn = (ctx, data, domains, _a) => {
   } else {
     const domainColumn = domains[`${typeSchema}.${type}`];
     if (domainColumn) {
-      column = new pqb.DomainColumn({}, type).as(domainColumn);
+      column = new pqb.DomainColumn(type).as(domainColumn);
     } else {
       const enumType = data.enums.find(
         (item) => item.name === type && item.schemaName === typeSchema
       );
       if (enumType) {
-        column = new pqb.EnumColumn({}, type, enumType.values);
+        column = new pqb.EnumColumn(type, enumType.values);
       } else {
-        column = new pqb.CustomTypeColumn({}, type);
+        column = new pqb.CustomTypeColumn(type);
         ((_b2 = (_a2 = ctx.unsupportedTypes)[type]) != null ? _b2 : _a2[type] = []).push(
           `${schemaName}${tableName ? `.${tableName}` : ""}.${name}`
         );
       }
     }
   }
-  return isArray ? new pqb.ArrayColumn({}, column) : column;
+  return isArray ? new pqb.ArrayColumn(column) : column;
 };
 const getColumnType = (type, isSerial) => {
   if (!isSerial)
@@ -2772,9 +2779,10 @@ const makeColumnsShape = (ctx, data, domains, tableName, columns, primaryKey, in
     const camelCaseName = orchidCore.toCamelCase(item.name);
     if (ctx.snakeCase) {
       const snakeCaseName = orchidCore.toSnakeCase(camelCaseName);
-      column.data.name = snakeCaseName === item.name ? void 0 : item.name;
-    } else {
-      column.data.name = camelCaseName === item.name ? void 0 : item.name;
+      if (snakeCaseName !== item.name)
+        column.data.name = item.name;
+    } else if (camelCaseName !== item.name) {
+      column.data.name = item.name;
     }
     shape[camelCaseName] = column;
   }