rake-db 2.1.4 → 2.1.6

package/.env.local

@@ -1,2 +1,2 @@
 DATABASE_URL=postgres://postgres:@localhost:5432/porm
-DATABASE_URL_TEST=postgres://postgres:@localhost:5432/porm_test
+#DATABASE_URL_TEST=postgres://postgres:@localhost:5432/porm_test

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # rake-db
 
+## 2.1.6
+
+### Patch Changes
+
+- Add required min and max parameters to text column
+- Updated dependencies
+  - pqb@0.7.3
+
+## 2.1.5
+
+### Patch Changes
+
+- Updated dependencies [9b8b3d5]
+  - pqb@0.7.2
+
 ## 2.1.4
 
 ### Patch Changes

package/db.ts

@@ -1,21 +1,25 @@
 import { config } from 'dotenv';
 import path from 'path';
 import { rakeDb } from './src/rakeDb';
+import { AdapterOptions } from 'pqb';
 
 config({ path: path.resolve(process.cwd(), '.env.local') });
 config();
 
+const options: AdapterOptions[] = [];
+
 const connectionString = process.env.DATABASE_URL;
 if (!connectionString) {
   throw new Error('DATABASE_URL is missing in .env');
 }
 
+options.push({ connectionString });
+
 const connectionStringTest = process.env.DATABASE_URL_TEST;
-if (!connectionStringTest) {
-  throw new Error('DATABASE_URL_TEST is missing in .env');
+if (connectionStringTest) {
+  options.push({ connectionString: connectionStringTest });
 }
 
-rakeDb(
-  [{ connectionString }, { connectionString: connectionStringTest }],
-  { migrationsPath: path.resolve(process.cwd(), 'migrations') },
-);
+rakeDb(options, {
+  migrationsPath: path.resolve(process.cwd(), 'migrations'),
+});

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as pqb from 'pqb';
-import { NoPrimaryKeyOption, QueryLogOptions, MaybeArray, AdapterOptions, ColumnTypes, EmptyObject, RawExpression, ColumnType, ForeignKey, SingleColumnIndexOptions, raw, ColumnsShape, IndexColumnOptions, IndexOptions, TransactionAdapter, QueryLogObject, QueryResultRow, QueryInput, TypeParsers, QueryResult, QueryArraysResult, ForeignKeyOptions } from 'pqb';
+import { NoPrimaryKeyOption, QueryLogOptions, MaybeArray, AdapterOptions, EmptyObject, RawExpression, ColumnType, ForeignKey, SingleColumnIndexOptions, ColumnTypes, raw, ColumnsShape, IndexColumnOptions, IndexOptions, TransactionAdapter, QueryLogObject, QueryResultRow, QueryInput, TypeParsers, QueryResult, QueryArraysResult, ForeignKeyOptions, TextColumn } from 'pqb';
 
 declare type MigrationConfig = {
     migrationsPath: string;
@@ -48,7 +48,7 @@ declare type ChangeItem = [
         dropMode?: DropMode;
     }
 ] | [action: 'change', from: ChangeArg, to: ChangeArg, options?: ChangeOptions] | ['rename', string];
-declare type TableChanger = ColumnTypes & TableChangeMethods;
+declare type TableChanger = MigrationColumnTypes & TableChangeMethods;
 declare type TableChangeData = Record<string, ChangeItem | EmptyObject>;
 
 declare type DropMode = 'CASCADE' | 'RESTRICT';
@@ -57,7 +57,12 @@ declare type TableOptions = {
     comment?: string;
     noPrimaryKey?: boolean;
 };
-declare type ColumnsShapeCallback = (t: ColumnTypes & {
+declare type TextColumnCreator = () => TextColumn;
+declare type MigrationColumnTypes = Omit<ColumnTypes, 'text' | 'string'> & {
+    text: TextColumnCreator;
+    string: TextColumnCreator;
+};
+declare type ColumnsShapeCallback = (t: MigrationColumnTypes & {
     raw: typeof raw;
 }) => ColumnsShape;
 declare type ChangeTableOptions = {
@@ -100,8 +105,8 @@ declare class Migration extends TransactionAdapter {
     changeTable(tableName: string, options: ChangeTableOptions, fn?: ChangeTableCallback): Promise<void>;
     changeTable(tableName: string, fn: ChangeTableCallback): Promise<void>;
     renameTable(from: string, to: string): Promise<void>;
-    addColumn(tableName: string, columnName: string, fn: (t: ColumnTypes) => ColumnType): Promise<void>;
-    dropColumn(tableName: string, columnName: string, fn: (t: ColumnTypes) => ColumnType): Promise<void>;
+    addColumn(tableName: string, columnName: string, fn: (t: MigrationColumnTypes) => ColumnType): Promise<void>;
+    dropColumn(tableName: string, columnName: string, fn: (t: MigrationColumnTypes) => ColumnType): Promise<void>;
     addIndex(tableName: string, columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): Promise<void>;
     dropIndex(tableName: string, columns: MaybeArray<string | IndexColumnOptions>, options?: IndexOptions): Promise<void>;
     addForeignKey(tableName: string, columns: [string, ...string[]], foreignTable: string, foreignColumns: [string, ...string[]], options?: ForeignKeyOptions): Promise<void>;
@@ -132,4 +137,4 @@ declare const change: (fn: ChangeCallback) => void;
 
 declare const rakeDb: (options: MaybeArray<AdapterOptions>, partialConfig?: Partial<MigrationConfig>, args?: string[]) => Promise<void>;
 
-export { ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnIndex, ColumnsShapeCallback, DropMode, ExtensionOptions, JoinTableOptions, Migration, TableOptions, change, createDb, dropDb, generate, migrate, rakeDb, resetDb, rollback };
+export { ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnIndex, ColumnsShapeCallback, DropMode, ExtensionOptions, JoinTableOptions, Migration, MigrationColumnTypes, TableOptions, change, createDb, dropDb, generate, migrate, rakeDb, resetDb, rollback };

package/dist/index.esm.js

@@ -423,7 +423,13 @@ class UnknownColumn extends ColumnType {
 const createJoinTable = async (migration, up, tables, options, fn) => {
   const tableName = options.tableName || joinWords(...tables);
   if (!up) {
-    return createTable(migration, up, tableName, options, () => ({}));
+    return createTable(
+      migration,
+      up,
+      tableName,
+      __spreadProps$1(__spreadValues$2({}, options), { noPrimaryKey: true }),
+      () => ({})
+    );
   }
   const tablesWithPrimaryKeys = await Promise.all(
     tables.map(async (table) => {