rake-db 2.1.3 → 2.1.5

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,21 @@
 # rake-db
 
+## 2.1.5
+
+### Patch Changes
+
+- Updated dependencies [9b8b3d5]
+  - pqb@0.7.2
+
+## 2.1.4
+
+### Patch Changes
+
+- Handle tables without primary key
+- ecd7521: Support copy
+- Updated dependencies
+  - pqb@0.7.1
+
 ## 2.1.3
 
 ### 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,10 +1,11 @@
 import * as pqb from 'pqb';
-import { 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, ColumnTypes, EmptyObject, RawExpression, ColumnType, ForeignKey, SingleColumnIndexOptions, raw, ColumnsShape, IndexColumnOptions, IndexOptions, TransactionAdapter, QueryLogObject, QueryResultRow, QueryInput, TypeParsers, QueryResult, QueryArraysResult, ForeignKeyOptions } from 'pqb';
 
 declare type MigrationConfig = {
     migrationsPath: string;
     migrationsTable: string;
     requireTs(path: string): void;
+    noPrimaryKey?: NoPrimaryKeyOption;
 } & QueryLogOptions;
 
 declare const createDb: (arg: MaybeArray<AdapterOptions>, config: MigrationConfig) => Promise<void>;
@@ -54,6 +55,7 @@ declare type DropMode = 'CASCADE' | 'RESTRICT';
 declare type TableOptions = {
     dropMode?: DropMode;
     comment?: string;
+    noPrimaryKey?: boolean;
 };
 declare type ColumnsShapeCallback = (t: ColumnTypes & {
     raw: typeof raw;
@@ -82,8 +84,9 @@ declare type ExtensionOptions = {
 };
 declare class Migration extends TransactionAdapter {
     up: boolean;
+    options: MigrationConfig;
     log?: QueryLogObject;
-    constructor(tx: TransactionAdapter, up: boolean, options: QueryLogOptions);
+    constructor(tx: TransactionAdapter, up: boolean, options: MigrationConfig);
     query<T extends QueryResultRow = any>(query: QueryInput, types?: TypeParsers, log?: QueryLogObject | undefined): Promise<QueryResult<T>>;
     arrays<R extends any[] = any[]>(query: QueryInput, types?: TypeParsers, log?: QueryLogObject | undefined): Promise<QueryArraysResult<R>>;
     createTable(tableName: string, options: TableOptions, fn: ColumnsShapeCallback): Promise<void>;

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) => {
@@ -473,7 +479,29 @@ const types = Object.assign(Object.create(columnTypes), {
   raw
 });
 const createTable = async (migration, up, tableName, options, fn) => {
+  var _a, _b;
   const shape = getColumnTypes(types, fn);
+  const tableData = getTableData();
+  const { noPrimaryKey } = migration.options;
+  if (!options.noPrimaryKey && (!noPrimaryKey || noPrimaryKey !== "ignore")) {
+    let hasPrimaryKey = !!((_b = (_a = tableData.primaryKey) == null ? void 0 : _a.columns) == null ? void 0 : _b.length);
+    if (!hasPrimaryKey) {
+      for (const key in shape) {
+        if (shape[key].isPrimaryKey) {
+          hasPrimaryKey = true;
+          break;
+        }
+      }
+    }
+    if (!hasPrimaryKey) {
+      const message = `Table ${tableName} has no primary key`;
+      if (!noPrimaryKey || noPrimaryKey === "error") {
+        throw new Error(message);
+      } else {
+        console.warn(message);
+      }
+    }
+  }
   if (!up) {
     const { dropMode } = options;
     await migration.query(
@@ -496,7 +524,6 @@ const createTable = async (migration, up, tableName, options, fn) => {
     lines.push(`
   ${columnToSql(key, item, state)}`);
   }
-  const tableData = getTableData();
   if (tableData.primaryKey) {
     lines.push(`
   ${primaryKeyToSql(tableData.primaryKey)}`);
@@ -852,6 +879,7 @@ class Migration extends TransactionAdapter {
   constructor(tx, up, options) {
     super(tx.pool, tx.client, tx.types);
     this.up = up;
+    this.options = options;
     this.log = logParamToLogObject(options.logger || console, options.log);
   }
   async query(query, types = this.types, log = this.log) {