rake-db 2.35.1 → 2.36.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ArrayColumn, Column, CustomTypeColumn, DomainColumn, EnumColumn, PostgisGeographyPointColumn, RawSql, TimestampColumn, TimestampTZColumn, UnknownColumn, addCode, assignDbDataToColumn, backtickQuote, codeToString, colors, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getColumnTypes, getImportPath, getStackTrace, indexInnerToCode, isRawSQL, logParamToLogObject, makeColumnTypes, makeColumnsByType, parseTableData, parseTableDataInput, pathToLog, primaryKeyInnerToCode, pushTableDataCode, quoteIdentifier, quoteObjectKey, raw, rawSqlToCode, referencesArgsToCode, setCurrentColumnName, setDefaultLanguage, singleQuote, tableDataMethods, toArray, toCamelCase, toSnakeCase } from "pqb/internal";
+import { ArrayColumn, Column, CustomTypeColumn, DomainColumn, EnumColumn, PostgisGeographyPointColumn, RawSql, TimestampColumn, TimestampTZColumn, UnknownColumn, addCode, assignDbDataToColumn, backtickQuote, codeToString, colors, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getColumnTypes, getDriverErrorCode, getImportPath, getStackTrace, indexInnerToCode, isRawSQL, logParamToLogObject, makeColumnTypes, makeColumnsByType, parseTableData, parseTableDataInput, pathToLog, primaryKeyInnerToCode, pushTableDataCode, quoteIdentifier, quoteObjectKey, raw, rawSqlToCode, referencesArgsToCode, setCurrentColumnName, setDefaultLanguage, singleQuote, tableDataMethods, toArray, toCamelCase, toSnakeCase } from "pqb/internal";
 import path, { join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { createDbWithAdapter } from "pqb";
@@ -77,11 +77,10 @@ const getCliParam = (args, name) => {
 	}
 };
 const createMigrationChangeFn = (config) => {
-	const conf = config.columnTypes ? config : { columnTypes: makeColumnTypes(defaultSchemaConfig) };
 	return (fn) => {
 		const change = {
 			fn,
-			config: conf
+			config
 		};
 		pushChange(change);
 		return change;
@@ -126,9 +125,15 @@ const columnToSql = (schema, name, item, values, hasMultiplePrimaryKeys, snakeCa
 	}
 	return line.join(" ");
 };
+const getDefaultEncode = (column) => {
+	return column.data.encode ?? (column.dataType === "jsonb" ? JSON.stringify : void 0);
+};
 const encodeColumnDefault = (def, values, column) => {
 	if (def !== void 0 && def !== null && typeof def !== "function") if (isRawSQL(def)) return `(${def.toSQL({ values })})`;
-	else return escapeForMigration(column instanceof ArrayColumn && Array.isArray(def) ? "{" + (column.data.item.data.encode ? def.map((x) => column.data.item.data.encode(x)) : def).join(",") + "}" : column?.data.encode ? column.data.encode(def) : def);
+	else {
+		let encode;
+		return escapeForMigration(column instanceof ArrayColumn && Array.isArray(def) ? "{" + ((encode = getDefaultEncode(column.data.item)) ? def.map((x) => encode(x)) : def).join(",") + "}" : column && (encode = getDefaultEncode(column)) ? encode(def) : def);
+	}
 	return null;
 };
 const identityToSql = (schema, identity) => {
@@ -370,12 +375,9 @@ const migrationsSchemaTableSql = (adapter, config) => {
 	const { schema, table } = getMigrationsSchemaAndTable(adapter, config);
 	return `${schema ? `"${schema}".` : ""}"${table}"`;
 };
-const tableMethods = { enum(name) {
-	return new EnumColumn(defaultSchemaConfig, name, [], void 0);
-} };
 var RakeDbError = class extends Error {};
 var NoPrimaryKey = class extends RakeDbError {};
-const createTable$1 = async (migration, up, tableName, first, second, third) => {
+const createTable$1 = async (migration, tableMethods, up, tableName, first, second, third) => {
 	let options;
 	let fn;
 	let dataFn;
@@ -763,7 +765,7 @@ function exclude(...args) {
 		options: { ...options }
 	} };
 }
-const tableChangeMethods = {
+const makeTableChangeMethods = (tableMethods) => ({
 	...tableMethods,
 	...tableDataMethods,
 	name(name) {
@@ -823,8 +825,8 @@ const tableChangeMethods = {
 			name
 		};
 	}
-};
-const changeTable = async (migration, up, tableName, options, fn) => {
+});
+const changeTable = async (migration, tableChangeMethods, up, tableName, options, fn) => {
 	const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
 	const language = "language" in options ? options.language : migration.options.language;
 	setDefaultLanguage(language);
@@ -1579,6 +1581,9 @@ const buildQuery = (ast, privileges, targetSql, grantable, isRevoke) => {
 const formatRoleSpec = (role) => {
 	return specialRoleSpecs.has(role) ? role : `"${role}"`;
 };
+const makeTableMethods = (schemaConfig) => ({ enum(name) {
+	return new EnumColumn(schemaConfig, name, [], void 0);
+} });
 /**
 * Creates a new `db` instance that is an instance of `pqb` with mixed in migration methods from the `Migration` class.
 * It overrides `query` and `array` db adapter methods to intercept SQL for the logging.
@@ -1628,15 +1633,25 @@ const createMigrationInterface = (tx, up, config) => {
 	};
 };
 var Migration = class {
+	getTableMethods() {
+		let { tableMethods } = this;
+		if (!tableMethods) tableMethods = makeTableMethods(defaultSchemaConfig());
+		return tableMethods;
+	}
+	getTableChangeMethods() {
+		let { tableChangeMethods } = this;
+		if (!tableChangeMethods) tableChangeMethods = makeTableChangeMethods(this.getTableMethods());
+		return tableChangeMethods;
+	}
 	createTable(tableName, first, second, third) {
-		return createTable$1(this, this.up, tableName, first, second, third);
+		return createTable$1(this, this.getTableMethods(), this.up, tableName, first, second, third);
 	}
 	dropTable(tableName, first, second, third) {
-		return createTable$1(this, !this.up, tableName, first, second, third);
+		return createTable$1(this, this.getTableMethods(), !this.up, tableName, first, second, third);
 	}
 	changeTable(tableName, cbOrOptions, cb) {
 		const [fn, options] = typeof cbOrOptions === "function" ? [cbOrOptions, {}] : [cb, cbOrOptions];
-		return changeTable(this, this.up, tableName, options, fn);
+		return changeTable(this, this.getTableChangeMethods(), this.up, tableName, options, fn);
 	}
 	/**
 	* Rename a table:
@@ -1703,7 +1718,7 @@ var Migration = class {
 	* @param fn - function returning a type of the column
 	*/
 	addColumn(tableName, columnName, fn) {
-		return addColumn(this, this.up, tableName, columnName, fn);
+		return addColumn(this, this.getTableChangeMethods(), this.up, tableName, columnName, fn);
 	}
 	/**
 	* Drop the schema, create it on rollback. See {@link addColumn}.
@@ -1713,7 +1728,7 @@ var Migration = class {
 	* @param fn - function returning a type of the column
 	*/
 	dropColumn(tableName, columnName, fn) {
-		return addColumn(this, !this.up, tableName, columnName, fn);
+		return addColumn(this, this.getTableChangeMethods(), !this.up, tableName, columnName, fn);
 	}
 	/**
 	* Add an index to the table on migrating, and remove it on rollback.
@@ -1741,7 +1756,7 @@ var Migration = class {
 	* @param args - index options
 	*/
 	addIndex(tableName, columns, ...args) {
-		return addIndex(this, this.up, tableName, columns, ...args);
+		return addIndex(this, this.getTableChangeMethods(), this.up, tableName, columns, ...args);
 	}
 	/**
 	* Drop the schema, create it on rollback. See {@link addIndex}.
@@ -1751,7 +1766,7 @@ var Migration = class {
 	* @param args - index options
 	*/
 	dropIndex(tableName, columns, ...args) {
-		return addIndex(this, !this.up, tableName, columns, ...args);
+		return addIndex(this, this.getTableChangeMethods(), !this.up, tableName, columns, ...args);
 	}
 	/**
 	* Rename index:
@@ -1816,7 +1831,7 @@ var Migration = class {
 	* @param options - foreign key options
 	*/
 	addForeignKey(tableName, columns, foreignTable, foreignColumns, options) {
-		return addForeignKey(this, this.up, tableName, columns, foreignTable, foreignColumns, options);
+		return addForeignKey(this, this.getTableChangeMethods(), this.up, tableName, columns, foreignTable, foreignColumns, options);
 	}
 	/**
 	* Drop the schema, create it on rollback. See {@link addForeignKey}.
@@ -1828,7 +1843,7 @@ var Migration = class {
 	* @param options - foreign key options
 	*/
 	dropForeignKey(tableName, columns, foreignTable, foreignColumns, options) {
-		return addForeignKey(this, !this.up, tableName, columns, foreignTable, foreignColumns, options);
+		return addForeignKey(this, this.getTableChangeMethods(), !this.up, tableName, columns, foreignTable, foreignColumns, options);
 	}
 	/**
 	* Add a primary key to a table on migrate, and remove it on rollback.
@@ -1853,7 +1868,7 @@ var Migration = class {
 	* @param name - optionally, set a primary key constraint name
 	*/
 	addPrimaryKey(tableName, columns, name) {
-		return addPrimaryKey(this, this.up, tableName, columns, name);
+		return addPrimaryKey(this, this.getTableChangeMethods(), this.up, tableName, columns, name);
 	}
 	/**
 	* Drop the schema, create it on rollback. See {@link addPrimaryKey}.
@@ -1863,7 +1878,7 @@ var Migration = class {
 	* @param name - optionally, set a primary key constraint name
 	*/
 	dropPrimaryKey(tableName, columns, name) {
-		return addPrimaryKey(this, !this.up, tableName, columns, name);
+		return addPrimaryKey(this, this.getTableChangeMethods(), !this.up, tableName, columns, name);
 	}
 	/**
 	* Add or drop a check for multiple columns.
@@ -1880,7 +1895,7 @@ var Migration = class {
 	* @param check - raw SQL for the check
 	*/
 	addCheck(tableName, check) {
-		return addCheck(this, this.up, tableName, check);
+		return addCheck(this, this.getTableChangeMethods(), this.up, tableName, check);
 	}
 	/**
 	* Drop the schema, create it on rollback. See {@link addCheck}.
@@ -1889,7 +1904,7 @@ var Migration = class {
 	* @param check - raw SQL for the check
 	*/
 	dropCheck(tableName, check) {
-		return addCheck(this, !this.up, tableName, check);
+		return addCheck(this, this.getTableChangeMethods(), !this.up, tableName, check);
 	}
 	/**
 	* Rename a table constraint such as a primary key or a database check.
@@ -2472,10 +2487,7 @@ const wrapWithEnhancingError = async (text, values, promise) => {
 	try {
 		return await promise;
 	} catch (err) {
-		if (err && typeof err === "object" && "message" in err && typeof err.message === "string" && (err.constructor.name === "PostgresError" || err.constructor.name === "DatabaseError")) {
-			err.message += `\nSQL: ${text}${values ? `\nVariables: ${JSON.stringify(values)}` : ""}`;
-			throw new err.constructor(err);
-		}
+		if (err && typeof err === "object" && "message" in err && typeof err.message === "string" && (err.constructor.name === "PostgresError" || err.constructor.name === "DatabaseError")) err.message += `\nSQL: ${text}${values ? `\nVariables: ${JSON.stringify(values)}` : ""}`;
 		throw err;
 	}
 };
@@ -2508,32 +2520,32 @@ const wrapWithLog = async (log, text, values, fn) => {
 /**
 * See {@link Migration.prototype.addColumn}
 */
-const addColumn = (migration, up, tableName, columnName, fn) => {
-	return changeTable(migration, up, tableName, {}, (t) => ({ [columnName]: t.add(fn(t)) }));
+const addColumn = (migration, tableChangeMethods, up, tableName, columnName, fn) => {
+	return changeTable(migration, tableChangeMethods, up, tableName, {}, (t) => ({ [columnName]: t.add(fn(t)) }));
 };
 /**
 * See {@link Migration.prototype.addIndex}
 */
-const addIndex = (migration, up, tableName, columns, ...args) => {
-	return changeTable(migration, up, tableName, {}, (t) => ({ ...t.add(t.index(columns, ...args)) }));
+const addIndex = (migration, tableChangeMethods, up, tableName, columns, ...args) => {
+	return changeTable(migration, tableChangeMethods, up, tableName, {}, (t) => ({ ...t.add(t.index(columns, ...args)) }));
 };
 /**
 * See {@link Migration.prototype.addForeignKey}
 */
-const addForeignKey = (migration, up, tableName, columns, foreignTable, foreignColumns, options) => {
-	return changeTable(migration, up, tableName, {}, (t) => ({ ...t.add(t.foreignKey(columns, foreignTable, foreignColumns, options)) }));
+const addForeignKey = (migration, tableChangeMethods, up, tableName, columns, foreignTable, foreignColumns, options) => {
+	return changeTable(migration, tableChangeMethods, up, tableName, {}, (t) => ({ ...t.add(t.foreignKey(columns, foreignTable, foreignColumns, options)) }));
 };
 /**
 * See {@link Migration.prototype.addPrimaryKey}
 */
-const addPrimaryKey = (migration, up, tableName, columns, name) => {
-	return changeTable(migration, up, tableName, {}, (t) => ({ ...t.add(t.primaryKey(columns, name)) }));
+const addPrimaryKey = (migration, tableChangeMethods, up, tableName, columns, name) => {
+	return changeTable(migration, tableChangeMethods, up, tableName, {}, (t) => ({ ...t.add(t.primaryKey(columns, name)) }));
 };
 /**
 * See {@link Migration.prototype.addCheck}
 */
-const addCheck = (migration, up, tableName, check) => {
-	return changeTable(migration, up, tableName, {}, (t) => ({ ...t.add(t.check(check)) }));
+const addCheck = (migration, tableChangeMethods, up, tableName, check) => {
+	return changeTable(migration, tableChangeMethods, up, tableName, {}, (t) => ({ ...t.add(t.check(check)) }));
 };
 /**
 * See {@link Migration.prototype.createSchema}
@@ -2937,11 +2949,6 @@ To keep using timestamp ids, set \`migrationId\` option of rake-db to 'timestamp
 function getMigrationVersion(config, name) {
 	return (config.migrationId === "timestamp" ? name.match(/^(\d{14})(_|\b)/) : name.match(/^(\d{4})(_|\b)/))?.[1];
 }
-function getDigitsPrefix(name) {
-	const value = name.match(/^(\d+)\D/)?.[1];
-	if (!value) throw new Error(`Migration file should be prefixed with a serial number, received ${name}`);
-	return value;
-}
 const getMaybeTransactionAdapter = (db) => "$getAdapter" in db ? db.$getAdapter() : db;
 const runSqlInSavePoint = async (db, sql, code) => {
 	const adapter = getMaybeTransactionAdapter(db);
@@ -3078,39 +3085,22 @@ const deleteMigratedVersion = async (adapter, version, name, config) => {
 	if ((await adapter.silentArrays(`DELETE FROM ${migrationsSchemaTableSql(adapter, config)} WHERE version = $1 AND name = $2`, [version, name])).rowCount === 0) throw new Error(`Migration ${version}_${name} was not found in db`);
 };
 var NoMigrationsTableError = class extends Error {};
-const getMigratedVersionsMap = async (ctx, adapter, config, renameTo) => {
+const getMigratedVersionsMap = async (_ctx, adapter, config, renameTo) => {
 	const table = migrationsSchemaTableSql(adapter, config);
-	const queryVersion = () => adapter.arrays(`SELECT * FROM ${table} ORDER BY version`);
+	const queryVersion = () => adapter.query(`SELECT * FROM ${table} ORDER BY version`);
 	let result;
 	try {
 		if (adapter.isInTransaction()) result = await adapter.savepoint("check_migrations_table", queryVersion);
 		else result = await queryVersion();
 	} catch (err) {
-		if (err.code === "42P01") throw new NoMigrationsTableError();
+		if (err && typeof err === "object" && getDriverErrorCode(err) === "42P01") throw new NoMigrationsTableError();
 		else throw err;
 	}
-	if (!result.fields[1]) {
-		const { migrations } = await getMigrations(ctx, config, true);
-		const map = {};
-		for (const item of migrations) {
-			const name = path.basename(item.path);
-			map[item.version] = name.slice(getDigitsPrefix(name).length + 1);
-		}
-		for (const row of result.rows) {
-			const [version] = row;
-			const name = map[version];
-			if (!name) throw new Error(`Migration for version ${version} is stored in db but is not found among available migrations`);
-			row[1] = name;
-		}
-		await adapter.arrays(`ALTER TABLE ${table} ADD COLUMN name TEXT`);
-		await Promise.all(result.rows.map(([version, name]) => adapter.arrays(`UPDATE ${table} SET name = $2 WHERE version = $1`, [version, name])));
-		await adapter.arrays(`ALTER TABLE ${table} ALTER COLUMN name SET NOT NULL`);
-	}
-	let versions = Object.fromEntries(result.rows);
+	let versions = Object.fromEntries(result.rows.map(({ version, name }) => [version, name]));
 	if (renameTo) versions = await renameMigrations(config, adapter, versions, renameTo);
 	return {
 		map: versions,
-		sequence: result.rows.map((row) => +row[0])
+		sequence: result.rows.map((row) => +row.version)
 	};
 };
 async function renameMigrations(config, trx, versions, renameTo) {
@@ -3415,7 +3405,7 @@ const getAdapterDatabase$1 = (adapter) => {
 };
 const rakeDbConfigDefaults = {
 	...migrateConfigDefaults,
-	schemaConfig: defaultSchemaConfig,
+	schemaConfig: defaultSchemaConfig(),
 	snakeCase: false,
 	commands: {},
 	log: true,
@@ -4728,8 +4718,11 @@ const constraintsSql = `SELECT
   t.relname AS "tableName",
   c.conname AS "name",
   (
-    SELECT json_agg(ccu.column_name)
+    SELECT json_agg(ccu.column_name ORDER BY a.attnum)
     FROM information_schema.constraint_column_usage ccu
+    JOIN pg_catalog.pg_attribute a
+      ON a.attrelid = c.conrelid
+     AND a.attname = ccu.column_name
     WHERE contype = 'p'
       AND ccu.constraint_name = c.conname
       AND ccu.table_schema = s.nspname
@@ -4743,15 +4736,21 @@ const constraintsSql = `SELECT
         ft.relname,
         'columns',
         (
-          SELECT json_agg(ccu.column_name)
+          SELECT json_agg(ccu.column_name ORDER BY a.attnum)
           FROM information_schema.key_column_usage ccu
+          JOIN pg_catalog.pg_attribute a
+            ON a.attrelid = c.conrelid
+           AND a.attname = ccu.column_name
           WHERE ccu.constraint_name = c.conname
             AND ccu.table_schema = cs.nspname
         ),
         'foreignColumns',
         (
-          SELECT json_agg(ccu.column_name)
+          SELECT json_agg(ccu.column_name ORDER BY a.attnum)
           FROM information_schema.constraint_column_usage ccu
+          JOIN pg_catalog.pg_attribute a
+            ON a.attrelid = c.confrelid
+           AND a.attname = ccu.column_name
           WHERE ccu.constraint_name = c.conname
             AND ccu.table_schema = cs.nspname
         ),
@@ -5903,10 +5902,10 @@ const makeRakeDbConfig = (config, args) => {
 	if (result.recurrentPath && !path.isAbsolute(result.recurrentPath)) result.recurrentPath = path.resolve(result.basePath, result.recurrentPath);
 	if ("baseTable" in config && config.baseTable) {
 		const { types } = config.baseTable.prototype;
-		result.columnTypes = types || makeColumnTypes(defaultSchemaConfig);
+		result.columnTypes = types || makeColumnTypes(defaultSchemaConfig());
 	} else {
 		const ct = "columnTypes" in config && config.columnTypes;
-		result.columnTypes = (typeof ct === "function" ? ct(makeColumnTypes(defaultSchemaConfig)) : ct) || makeColumnTypes(defaultSchemaConfig);
+		result.columnTypes = (typeof ct === "function" ? ct(makeColumnTypes(defaultSchemaConfig())) : ct) || makeColumnTypes(defaultSchemaConfig());
 	}
 	if (config.migrationId === "serial") result.migrationId = { serial: 4 };
 	const transaction = getCliParam(args, "transaction");