rake-db 2.0.1 → 2.0.2

package/src/migration/migrationUtils.ts

@@ -1,5 +1,4 @@
 import {
-  Adapter,
   ColumnType,
   ForeignKeyModel,
   ForeignKeyOptions,
@@ -10,7 +9,7 @@ import {
   toArray,
 } from 'pqb';
 import { ColumnComment, ColumnIndex, Migration } from './migration';
-import { joinColumns, joinWords } from '../common';
+import { joinColumns, joinWords, quoteTable } from '../common';
 
 export const columnToSql = (
   key: string,
@@ -121,7 +120,9 @@ export const referencesToSql = (
   columns: string[],
   foreignKey: Pick<ForeignKeyOptions, 'match' | 'onDelete' | 'onUpdate'>,
 ) => {
-  const sql: string[] = [`REFERENCES "${table}"(${joinColumns(columns)})`];
+  const sql: string[] = [
+    `REFERENCES ${quoteTable(table)}(${joinColumns(columns)})`,
+  ];
 
   if (foreignKey.match) {
     sql.push(`MATCH ${foreignKey.match.toUpperCase()}`);
@@ -176,7 +177,7 @@ export const migrateIndex = (
     sql.push('UNIQUE');
   }
 
-  sql.push(`INDEX "${indexName}" ON "${state.tableName}"`);
+  sql.push(`INDEX "${indexName}" ON ${quoteTable(state.tableName)}`);
 
   if (options.using) {
     sql.push(`USING ${options.using}`);
@@ -243,7 +244,9 @@ export const migrateComments = async (
 ) => {
   for (const { column, comment } of comments) {
     await state.migration.query(
-      `COMMENT ON COLUMN "${state.tableName}"."${column}" IS ${quote(comment)}`,
+      `COMMENT ON COLUMN ${quoteTable(state.tableName)}."${column}" IS ${quote(
+        comment,
+      )}`,
     );
   }
 };
@@ -258,11 +261,12 @@ export const primaryKeyToSql = (
 };
 
 export const getPrimaryKeysOfTable = async (
-  db: Adapter,
+  db: Migration,
   tableName: string,
 ): Promise<{ name: string; type: string }[]> => {
-  const { rows } = await db.query<{ name: string; type: string }>({
-    text: `SELECT
+  const { rows } = await db.query<{ name: string; type: string }>(
+    {
+      text: `SELECT
   pg_attribute.attname AS name,
   format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS type
 FROM pg_index, pg_class, pg_attribute, pg_namespace
@@ -274,8 +278,11 @@ WHERE
   pg_attribute.attrelid = pg_class.oid AND
   pg_attribute.attnum = any(pg_index.indkey) AND
   indisprimary`,
-    values: [tableName],
-  });
+      values: [tableName],
+    },
+    db.types,
+    undefined,
+  );
 
   return rows;
 };

package/src/rakeDb.ts

@@ -18,9 +18,9 @@ export const rakeDb = async (
   } else if (command === 'drop') {
     await dropDb(options);
   } else if (command === 'migrate') {
-    await migrate(options, config);
+    await migrate(options, config, args.slice(1));
   } else if (command === 'rollback') {
-    await rollback(options, config);
+    await rollback(options, config, args.slice(1));
   } else if (command === 'g' || command === 'generate') {
     await generate(config, args.slice(1));
   } else {

package/src/test-utils.ts

@@ -6,7 +6,9 @@ let db: Migration | undefined;
 export const getDb = () => {
   if (db) return db;
 
-  db = new Migration({} as unknown as TransactionAdapter, true);
+  db = new Migration({} as unknown as TransactionAdapter, true, {
+    log: false,
+  });
   db.query = queryMock;
   return db;
 };

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["./src", "jest-setup.ts"],
+  "include": ["./src", "jest-setup.ts", "db.ts", "./migrations"],
   "compilerOptions": {
     "outDir": "./dist",
     "noEmit": false,

package/migrations/20221009210200_second.ts

@@ -1,5 +0,0 @@
-import { change } from '../src';
-
-change(async () => {
-  console.log('second');
-});