rake-db 2.4.35 → 2.4.37

package/dist/index.d.ts

@@ -1,6 +1,10 @@
-import { ColumnType, EnumColumn, ColumnTypes, ColumnsShape, Adapter, DbResult, DefaultColumnTypes, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
+import { ColumnsShape, Db as Db$1, ColumnType, EnumColumn, ColumnTypes, 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 type CreateTableResult<Table extends string, Shape extends ColumnsShape> = {
+    table: Db$1<Table, Shape>;
+};
+
 declare function add(this: ColumnTypesBase, item: ColumnType, options?: {
     dropMode?: DropMode;
 }): RakeDbAst.ChangeTableItem.Column;
@@ -42,9 +46,9 @@ declare type MigrationColumnTypes = Omit<ColumnTypes, 'text' | 'string' | 'enum'
     citext: TextColumnCreator;
     enum: (name: string) => EnumColumn;
 };
-declare type ColumnsShapeCallback = (t: MigrationColumnTypes & {
+declare type ColumnsShapeCallback<Shape extends ColumnsShape = ColumnsShape> = (t: MigrationColumnTypes & {
     raw: typeof raw;
-}) => ColumnsShape;
+}) => Shape;
 declare type ChangeTableOptions = {
     snakeCase?: boolean;
     comment?: string | [string, string] | null;
@@ -79,10 +83,10 @@ declare class MigrationBase {
     up: boolean;
     options: RakeDbConfig;
     migratedAsts: RakeDbAst[];
-    createTable(tableName: string, options: TableOptions, fn: ColumnsShapeCallback): Promise<void>;
-    createTable(tableName: string, fn: ColumnsShapeCallback): Promise<void>;
-    dropTable(tableName: string, options: TableOptions, fn: ColumnsShapeCallback): Promise<void>;
-    dropTable(tableName: string, fn: ColumnsShapeCallback): Promise<void>;
+    createTable<Table extends string, Shape extends ColumnsShape>(tableName: Table, options: TableOptions, fn: ColumnsShapeCallback<Shape>): Promise<CreateTableResult<Table, Shape>>;
+    createTable<Table extends string, Shape extends ColumnsShape>(tableName: Table, fn: ColumnsShapeCallback<Shape>): Promise<CreateTableResult<Table, Shape>>;
+    dropTable<Table extends string, Shape extends ColumnsShape>(tableName: Table, options: TableOptions, fn: ColumnsShapeCallback<Shape>): Promise<CreateTableResult<Table, Shape>>;
+    dropTable<Table extends string, Shape extends ColumnsShape>(tableName: Table, fn: ColumnsShapeCallback<Shape>): Promise<CreateTableResult<Table, Shape>>;
     changeTable(tableName: string, options: ChangeTableOptions, fn?: ChangeTableCallback): Promise<void>;
     changeTable(tableName: string, fn: ChangeTableCallback): Promise<void>;
     renameTable(from: string, to: string): Promise<void>;

package/dist/index.js

@@ -569,6 +569,15 @@ const createTable$1 = async (migration, up, tableName, options, fn) => {
     then == null ? void 0 : then(result);
   }
   migration.migratedAsts.push(ast);
+  let table;
+  return {
+    get table() {
+      return table != null ? table : table = migration(tableName, shape, {
+        noPrimaryKey: options.noPrimaryKey ? "ignore" : void 0,
+        snakeCase: options.snakeCase
+      });
+    }
+  };
 };
 const makeAst$1 = (up, tableName, shape, tableData, options, noPrimaryKey) => {
   const shapePKeys = [];
@@ -2257,7 +2266,7 @@ const structureToAst = async (ctx, db) => {
       baseType: domains[`${it.schemaName}.${it.name}`],
       notNull: it.notNull,
       collation: it.collation,
-      default: it.default ? orchidCore.raw(it.default) : void 0,
+      default: pqb.simplifyColumnDefault(it.default),
       check: it.check ? orchidCore.raw(it.check) : void 0
     });
   }