rake-db 2.4.6 → 2.4.8

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { ColumnType, EnumColumn, ColumnTypes, ColumnsShape, DbResult, DefaultColumnTypes, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
+import { ColumnType, EnumColumn, UnknownColumn, ColumnTypes, ColumnsShape, DbResult, DefaultColumnTypes, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions, Adapter } from 'pqb';
+import * as orchid_core from 'orchid-core';
 import { EmptyObject, RawExpression, ColumnTypesBase, raw, MaybeArray } from 'orchid-core';
 
 declare function add(this: ColumnTypesBase, item: ColumnType, options?: {
@@ -24,6 +25,7 @@ declare const tableChangeMethods: {
     comment(comment: string | null): Change;
     rename(name: string): RakeDbAst.ChangeTableItem.Rename;
     enum(this: ColumnTypesBase, name: string): EnumColumn<string, [string, ...string[]]>;
+    check(this: ColumnTypesBase, value: RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>): UnknownColumn;
 };
 declare type TableChanger = MigrationColumnTypes & TableChangeMethods;
 declare type TableChangeData = Record<string, RakeDbAst.ChangeTableItem.Column | RakeDbAst.ChangeTableItem.Rename | Change | EmptyObject>;
@@ -139,6 +141,7 @@ declare namespace RakeDbAst {
         comment?: string | null;
         compression?: string;
         primaryKey?: boolean;
+        check?: RawExpression;
         foreignKeys?: ({
             table: string;
             columns: string[];
@@ -216,8 +219,9 @@ declare const createDb: (arg: MaybeArray<AdapterOptions>, config: RakeDbConfig)
 declare const dropDb: (arg: MaybeArray<AdapterOptions>) => Promise<void>;
 declare const resetDb: (arg: MaybeArray<AdapterOptions>, config: RakeDbConfig) => Promise<void>;
 
-declare const writeMigrationFile: (config: RakeDbConfig, name: string, content: string) => Promise<void>;
+declare const writeMigrationFile: (config: RakeDbConfig, version: string, name: string, content: string) => Promise<void>;
 declare const generate: (config: RakeDbConfig, args: string[]) => Promise<void>;
+declare const makeFileTimeStamp: () => string;
 
 declare type ChangeCallback = (db: Migration, up: boolean) => Promise<void>;
 declare const change: (fn: ChangeCallback) => void;
@@ -229,4 +233,8 @@ declare const rollback: (options: MaybeArray<AdapterOptions>, config: RakeDbConf
 
 declare const rakeDb: (options: MaybeArray<AdapterOptions>, partialConfig?: Partial<RakeDbConfig>, args?: string[]) => Promise<void>;
 
-export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, migrate, migrateOrRollback, rakeDb, resetDb, rollback, writeMigrationFile };
+declare const saveMigratedVersion: (db: Adapter, version: string, config: RakeDbConfig) => Promise<void>;
+declare const removeMigratedVersion: (db: Adapter, version: string, config: RakeDbConfig) => Promise<void>;
+declare const getMigratedVersionsMap: (db: Adapter, config: RakeDbConfig) => Promise<Record<string, boolean>>;
+
+export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };

package/dist/index.js

@@ -315,6 +315,9 @@ const columnToSql = (key, item, values, hasMultiplePrimaryKeys) => {
   } else if (!item.data.isNullable) {
     line.push("NOT NULL");
   }
+  if (item.data.check) {
+    line.push(`CHECK (${pqb.getRaw(item.data.check, values)})`);
+  }
   if (item.data.default !== void 0) {
     if (typeof item.data.default === "object" && item.data.default && orchidCore.isRaw(item.data.default)) {
       line.push(`DEFAULT ${pqb.getRaw(item.data.default, values)}`);
@@ -475,6 +478,9 @@ const primaryKeyToSql = (primaryKey) => {
 const tableMethods = {
   enum(name) {
     return new pqb.EnumColumn(this, name, []);
+  },
+  check(value) {
+    return new pqb.UnknownColumn(this).check(value);
   }
 };
 
@@ -676,14 +682,7 @@ const mergeTableData = (a, b) => {
 };
 function add(item, options) {
   if (item instanceof pqb.ColumnType) {
-    if (this[orchidCore.nameKey]) {
-      item.data.name = this[orchidCore.nameKey];
-    }
-    return {
-      type: "add",
-      item,
-      dropMode: options == null ? void 0 : options.dropMode
-    };
+    return addOrDrop(this, "add", item, options);
   } else if (item === orchidCore.emptyObject) {
     mergeTableData(changeTableData.add, pqb.getTableData());
     pqb.resetTableData();
@@ -702,14 +701,7 @@ function add(item, options) {
 }
 const drop = function(item, options) {
   if (item instanceof pqb.ColumnType) {
-    if (this[orchidCore.nameKey]) {
-      item.data.name = this[orchidCore.nameKey];
-    }
-    return {
-      type: "drop",
-      item,
-      dropMode: options == null ? void 0 : options.dropMode
-    };
+    return addOrDrop(this, "drop", item, options);
   } else if (item === orchidCore.emptyObject) {
     mergeTableData(changeTableData.drop, pqb.getTableData());
     pqb.resetTableData();
@@ -726,6 +718,35 @@ const drop = function(item, options) {
     return result;
   }
 };
+const addOrDrop = (types, type, item, options) => {
+  if (types[orchidCore.nameKey]) {
+    item.data.name = types[orchidCore.nameKey];
+  }
+  if (item instanceof pqb.UnknownColumn) {
+    const empty = columnTypeToColumnChange({
+      type: "change",
+      from: {},
+      to: {}
+    });
+    const add2 = columnTypeToColumnChange({
+      type: "change",
+      from: {},
+      to: {
+        check: item.data.check
+      }
+    });
+    return __spreadValues$3({
+      type: "change",
+      from: type === "add" ? empty : add2,
+      to: type === "add" ? add2 : empty
+    }, options);
+  }
+  return {
+    type,
+    item,
+    dropMode: options == null ? void 0 : options.dropMode
+  };
+};
 const columnTypeToColumnChange = (item) => {
   if (item instanceof pqb.ColumnType) {
     const foreignKeys = item.data.foreignKeys;
@@ -877,12 +898,13 @@ const astToQueries = (ast) => {
   for (const key in ast.shape) {
     const item = ast.shape[key];
     if (item.type === "add") {
-      addColumnIndex(addIndexes, key, item.item);
-      addColumnComment(comments, key, item.item);
+      const column = item.item;
+      addColumnIndex(addIndexes, key, column);
+      addColumnComment(comments, key, column);
       alterTable.push(
         `ADD COLUMN ${columnToSql(
           key,
-          item.item,
+          column,
           values,
           addPrimaryKeys.columns.length > 1
         )}`
@@ -894,7 +916,7 @@ const astToQueries = (ast) => {
       );
     } else if (item.type === "change") {
       const { from, to } = item;
-      if (from.type !== to.type || from.collate !== to.collate) {
+      if (to.type && (from.type !== to.type || from.collate !== to.collate)) {
         alterTable.push(
           `ALTER COLUMN "${item.name || key}" TYPE ${to.type}${to.collate ? ` COLLATE ${pqb.quote(to.collate)}` : ""}${item.using ? ` USING ${pqb.getRaw(item.using, values)}` : ""}`
         );
@@ -914,6 +936,18 @@ const astToQueries = (ast) => {
           `ALTER COLUMN "${item.name || key}" SET COMPRESSION ${to.compression || "DEFAULT"}`
         );
       }
+      if (from.check !== to.check) {
+        const name = `${ast.name}_${item.name || key}_check`;
+        if (from.check) {
+          alterTable.push(`DROP CONSTRAINT "${name}"`);
+        }
+        if (to.check) {
+          alterTable.push(
+            `ADD CONSTRAINT "${name}"
+    CHECK (${pqb.getRaw(to.check, values)})`
+          );
+        }
+      }
       const foreignKeysLen = Math.max(
         ((_a = from.foreignKeys) == null ? void 0 : _a.length) || 0,
         ((_b = to.foreignKeys) == null ? void 0 : _b.length) || 0
@@ -1250,6 +1284,36 @@ const queryExists = (db, sql) => {
   return db.adapter.query(sql).then(({ rowCount }) => rowCount > 0);
 };
 
+const saveMigratedVersion = async (db, version, config) => {
+  await db.query(
+    `INSERT INTO ${quoteWithSchema({
+      name: config.migrationsTable
+    })} VALUES ('${version}')`
+  );
+};
+const removeMigratedVersion = async (db, version, config) => {
+  await db.query(
+    `DELETE FROM ${quoteWithSchema({
+      name: config.migrationsTable
+    })} WHERE version = '${version}'`
+  );
+};
+const getMigratedVersionsMap = async (db, config) => {
+  try {
+    const result = await db.arrays(
+      `SELECT *
+       FROM ${quoteWithSchema({ name: config.migrationsTable })}`
+    );
+    return Object.fromEntries(result.rows.map((row) => [row[0], true]));
+  } catch (err) {
+    if (err.code === "42P01") {
+      await createSchemaMigrations(db, config);
+      return {};
+    }
+    throw err;
+  }
+};
+
 var __defProp$1 = Object.defineProperty;
 var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
 var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
@@ -1362,34 +1426,6 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
     }));
   }
 };
-const saveMigratedVersion = async (db, version, config) => {
-  await db.query(
-    `INSERT INTO ${quoteWithSchema({
-      name: config.migrationsTable
-    })} VALUES ('${version}')`
-  );
-};
-const removeMigratedVersion = async (db, version, config) => {
-  await db.query(
-    `DELETE FROM ${quoteWithSchema({
-      name: config.migrationsTable
-    })} WHERE version = '${version}'`
-  );
-};
-const getMigratedVersionsMap = async (db, config) => {
-  try {
-    const result = await db.arrays(
-      `SELECT * FROM ${quoteWithSchema({ name: config.migrationsTable })}`
-    );
-    return Object.fromEntries(result.rows.map((row) => [row[0], true]));
-  } catch (err) {
-    if (err.code === "42P01") {
-      await createSchemaMigrations(db, config);
-      return {};
-    }
-    throw err;
-  }
-};
 const migrate = (options, config, args = []) => migrateOrRollback(options, config, args, true);
 const rollback = (options, config, args = []) => migrateOrRollback(options, config, args, false);
 
@@ -1493,13 +1529,10 @@ const resetDb = async (arg, config) => {
   await migrate(arg, config);
 };
 
-const writeMigrationFile = async (config, name, content) => {
+const writeMigrationFile = async (config, version, name, content) => {
   var _a;
   await promises.mkdir(config.migrationsPath, { recursive: true });
-  const filePath = path__default["default"].resolve(
-    config.migrationsPath,
-    `${makeFileTimeStamp()}_${name}.ts`
-  );
+  const filePath = path__default["default"].resolve(config.migrationsPath, `${version}_${name}.ts`);
   await promises.writeFile(filePath, content);
   (_a = config.logger) == null ? void 0 : _a.log(`Created ${orchidCore.pathToLog(filePath)}`);
 };
@@ -1507,7 +1540,13 @@ const generate = async (config, args) => {
   const name = args[0];
   if (!name)
     throw new Error("Migration name is missing");
-  await writeMigrationFile(config, name, makeContent(name, args.slice(1)));
+  const version = makeFileTimeStamp();
+  await writeMigrationFile(
+    config,
+    version,
+    name,
+    makeContent(name, args.slice(1))
+  );
 };
 const makeFileTimeStamp = () => {
   const now = new Date();
@@ -1859,6 +1898,31 @@ GROUP BY n.nspname, t.typname`
     );
     return rows;
   }
+  async getChecks() {
+    const { rows } = await this.db.query(`SELECT
+  s.nspname AS "schemaName",
+  t.relname AS "tableName",
+  c.conname AS "name",
+  (
+    SELECT json_agg(ccu.column_name)
+    FROM information_schema.constraint_column_usage ccu
+    WHERE ccu.constraint_name = c.conname
+      AND ccu.table_schema = cs.nspname
+  ) AS "columnNames",
+  pg_get_expr(conbin, conrelid) AS "expression"
+FROM pg_catalog.pg_constraint c
+JOIN pg_class t ON t.oid = conrelid
+JOIN pg_catalog.pg_namespace s ON s.oid = t.relnamespace
+JOIN pg_catalog.pg_namespace cs ON cs.oid = c.connamespace
+WHERE contype = 'c'
+ORDER BY c.conname`);
+    for (const row of rows) {
+      if (row.expression[0] === "(" && row.expression[row.expression.length - 1] === ")") {
+        row.expression = row.expression.slice(1, -1);
+      }
+    }
+    return rows;
+  }
 }
 
 var __defProp = Object.defineProperty;
@@ -1982,7 +2046,8 @@ const getData = async (db) => {
     indexes,
     foreignKeys,
     extensions,
-    enums
+    enums,
+    checks
   ] = await Promise.all([
     db.getSchemas(),
     db.getTables(),
@@ -1991,7 +2056,8 @@ const getData = async (db) => {
     db.getIndexes(),
     db.getForeignKeys(),
     db.getExtensions(),
-    db.getEnums()
+    db.getEnums(),
+    db.getChecks()
   ]);
   return {
     schemas,
@@ -2001,7 +2067,8 @@ const getData = async (db) => {
     indexes,
     foreignKeys,
     extensions,
-    enums
+    enums,
+    checks
   };
 };
 const makeBelongsToTable = (schema, table) => (item) => item.schemaName === schema && item.tableName === table;
@@ -2031,6 +2098,12 @@ const pushTableAst = (ast, data, table, pendingTables, innerFKeys = data.foreign
   const primaryKey = data.primaryKeys.find(belongsToTable);
   const tableIndexes = data.indexes.filter(belongsToTable);
   const tableForeignKeys = innerFKeys.filter(belongsToTable);
+  const columnChecks = {};
+  for (const check of data.checks) {
+    if (check.columnNames.length === 1) {
+      columnChecks[check.columnNames[0]] = check;
+    }
+  }
   const shape = {};
   for (let item of columns) {
     const isSerial = getIsSerial(item);
@@ -2093,6 +2166,10 @@ const pushTableAst = (ast, data, table, pendingTables, innerFKeys = data.foreign
         }
       );
     }
+    const check = columnChecks[item.name];
+    if (check) {
+      column.data.check = orchidCore.raw(check.expression);
+    }
     delete column.data.name;
     shape[item.name] = column;
   }
@@ -2293,7 +2370,9 @@ const pullDbStructure = async (options, config) => {
   const result = astToMigration(config, ast);
   if (!result)
     return;
-  await writeMigrationFile(config, "pull", result);
+  const version = makeFileTimeStamp();
+  await writeMigrationFile(config, version, "pull", result);
+  await saveMigratedVersion(adapter, version, config);
   const cache = {};
   for (const item of ast) {
     await ((_a = config == null ? void 0 : config.appCodeUpdater) == null ? void 0 : _a.call(config, {
@@ -2381,10 +2460,14 @@ exports.createDb = createDb;
 exports.createMigrationInterface = createMigrationInterface;
 exports.dropDb = dropDb;
 exports.generate = generate;
+exports.getMigratedVersionsMap = getMigratedVersionsMap;
+exports.makeFileTimeStamp = makeFileTimeStamp;
 exports.migrate = migrate;
 exports.migrateOrRollback = migrateOrRollback;
 exports.rakeDb = rakeDb;
+exports.removeMigratedVersion = removeMigratedVersion;
 exports.resetDb = resetDb;
 exports.rollback = rollback;
+exports.saveMigratedVersion = saveMigratedVersion;
 exports.writeMigrationFile = writeMigrationFile;
 //# sourceMappingURL=index.js.map