rake-db 2.22.34 → 2.22.35

package/dist/index.d.ts

@@ -1727,6 +1727,7 @@ declare const commentsToQuery: (schemaTable: {
     name: string;
 }, comments: ColumnComment[]) => SingleSql[];
 declare const primaryKeyToSql: (primaryKey: Exclude<TableData['primaryKey'], undefined>) => string;
+declare const interpolateSqlValues: ({ text, values }: TableQuery) => string;
 
 /**
  * Type of {@link rakeDb} function
@@ -1812,4 +1813,4 @@ declare const promptText: ({ message, default: def, password, min, }: {
     min?: number;
 }) => Promise<string>;
 
-export { AnyRakeDbConfig, ChangeCallback, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, CommandFn, DbMigration, DbStructure, DbStructureDomainsMap, DropMode, InputRakeDbConfig, InputRakeDbConfigBase, IntrospectedStructure, Migration, MigrationAdapter, MigrationColumnTypes, ModuleExportsRecord, NoMigrationsTableError, RAKE_DB_LOCK_KEY, RakeDbAppliedVersions, RakeDbAst, RakeDbBaseTable, RakeDbChangeFn, RakeDbConfig, RakeDbCtx, RakeDbFn, RakeDbFnReturns, RakeDbLazyFn, RakeDbMigrationId, RakeDbRenameMigrations, RakeDbRenameMigrationsInput, RakeDbRenameMigrationsMap, RakeDbResult, SilentQueries, StructureToAstCtx, StructureToAstTableData, TableOptions, addColumnComment, addColumnIndex, addOrDropEnumValues, astToMigration, changeCache, changeEnumValues, clearChanges, colors, columnToSql, columnTypeToSql, commentsToQuery, concatSchemaAndName, constraintToSql, createDb, createMigrationInterface, dbColumnToAst, deleteMigratedVersion, dropDb, encodeColumnDefault, exhaustive, generateTimeStamp, getColumnName, getConstraintName, getCurrentChanges, getDatabaseAndUserFromOptions, getDbStructureTableData, getDbTableColumnsChecks, getFirstWordAndRest, getForeignKeyTable, getIndexName, getMigratedVersionsMap, getSchemaAndTableFromName, getTextAfterFrom, getTextAfterTo, identityToSql, indexesToQuery, instantiateDbColumn, introspectDbSchema, joinColumns, joinWords, makeDbStructureColumnsShape, makeDomainsMap, makeFileVersion, makePopulateEnumQuery, makeStructureToAstCtx, migrate, migrateOrRollback, migrationConfigDefaults, newMigration, pluralize, primaryKeyToSql, processRakeDbConfig, promptConfirm, promptSelect, promptText, pushChange, queryLock, quoteNameFromString, quoteSchemaTable, quoteTable, quoteWithSchema, rakeDb, rakeDbAliases, rakeDbCommands, redo, referencesToSql, renameType, resetDb, rollback, saveMigratedVersion, structureToAst, tableToAst, transaction, versionToString, writeMigrationFile };
+export { AnyRakeDbConfig, ChangeCallback, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, CommandFn, DbMigration, DbStructure, DbStructureDomainsMap, DropMode, InputRakeDbConfig, InputRakeDbConfigBase, IntrospectedStructure, Migration, MigrationAdapter, MigrationColumnTypes, ModuleExportsRecord, NoMigrationsTableError, RAKE_DB_LOCK_KEY, RakeDbAppliedVersions, RakeDbAst, RakeDbBaseTable, RakeDbChangeFn, RakeDbConfig, RakeDbCtx, RakeDbFn, RakeDbFnReturns, RakeDbLazyFn, RakeDbMigrationId, RakeDbRenameMigrations, RakeDbRenameMigrationsInput, RakeDbRenameMigrationsMap, RakeDbResult, SilentQueries, StructureToAstCtx, StructureToAstTableData, TableOptions, addColumnComment, addColumnIndex, addOrDropEnumValues, astToMigration, changeCache, changeEnumValues, clearChanges, colors, columnToSql, columnTypeToSql, commentsToQuery, concatSchemaAndName, constraintToSql, createDb, createMigrationInterface, dbColumnToAst, deleteMigratedVersion, dropDb, encodeColumnDefault, exhaustive, generateTimeStamp, getColumnName, getConstraintName, getCurrentChanges, getDatabaseAndUserFromOptions, getDbStructureTableData, getDbTableColumnsChecks, getFirstWordAndRest, getForeignKeyTable, getIndexName, getMigratedVersionsMap, getSchemaAndTableFromName, getTextAfterFrom, getTextAfterTo, identityToSql, indexesToQuery, instantiateDbColumn, interpolateSqlValues, introspectDbSchema, joinColumns, joinWords, makeDbStructureColumnsShape, makeDomainsMap, makeFileVersion, makePopulateEnumQuery, makeStructureToAstCtx, migrate, migrateOrRollback, migrationConfigDefaults, newMigration, pluralize, primaryKeyToSql, processRakeDbConfig, promptConfirm, promptSelect, promptText, pushChange, queryLock, quoteNameFromString, quoteSchemaTable, quoteTable, quoteWithSchema, rakeDb, rakeDbAliases, rakeDbCommands, redo, referencesToSql, renameType, resetDb, rollback, saveMigratedVersion, structureToAst, tableToAst, transaction, versionToString, writeMigrationFile };

package/dist/index.js

@@ -175,7 +175,7 @@ const encodeColumnDefault = (def, values, column) => {
     if (orchidCore.isRawSQL(def)) {
       return def.toSQL({ values });
     } else {
-      return pqb.quote((column == null ? void 0 : column.encodeFn) ? column.encodeFn(def) : def);
+      return pqb.escapeForMigration((column == null ? void 0 : column.encodeFn) ? column.encodeFn(def) : def);
     }
   }
   return null;
@@ -373,13 +373,19 @@ const commentsToQuery = (schemaTable, comments) => {
   return comments.map(({ column, comment }) => ({
     text: `COMMENT ON COLUMN ${quoteWithSchema(
       schemaTable
-    )}."${column}" IS ${pqb.quote(comment)}`,
+    )}."${column}" IS ${pqb.escapeForMigration(comment)}`,
     values: []
   }));
 };
 const primaryKeyToSql = (primaryKey) => {
   return `${primaryKey.name ? `CONSTRAINT "${primaryKey.name}" ` : ""}PRIMARY KEY (${joinColumns(primaryKey.columns)})`;
 };
+const interpolateSqlValues = ({ text, values }) => {
+  return (values == null ? void 0 : values.length) ? text.replace(/\$(\d+)/g, (_, n) => {
+    const i = +n - 1;
+    return pqb.escapeForMigration(values[i]);
+  }) : text;
+};
 
 const tableMethods = {
   enum(name) {
@@ -474,7 +480,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
   const queries = astToQueries$1(ast, snakeCase, language);
   for (const _b of queries) {
     const _c = _b, { then } = _c, query = __objRest$1(_c, ["then"]);
-    const result = await migration.adapter.arrays(query);
+    const result = await migration.adapter.arrays(interpolateSqlValues(query));
     then == null ? void 0 : then(result);
   }
   let table;
@@ -618,7 +624,9 @@ const astToQueries$1 = (ast, snakeCase, language) => {
   );
   if (ast.comment) {
     queries.push({
-      text: `COMMENT ON TABLE ${quoteWithSchema(ast)} IS ${pqb.quote(ast.comment)}`
+      text: `COMMENT ON TABLE ${quoteWithSchema(ast)} IS ${pqb.escapeString(
+        ast.comment
+      )}`
     });
   }
   return queries;
@@ -851,7 +859,7 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   const ast = makeAst$1(up, tableName, changeData, changeTableData, options);
   const queries = astToQueries(ast, snakeCase, language);
   for (const query of queries) {
-    const result = await migration.adapter.arrays(query);
+    const result = await migration.adapter.arrays(interpolateSqlValues(query));
     (_a = query.then) == null ? void 0 : _a.call(query, result);
   }
 };
@@ -914,7 +922,9 @@ const astToQueries = (ast, snakeCase, language) => {
   const queries = [];
   if (ast.comment !== void 0) {
     queries.push({
-      text: `COMMENT ON TABLE ${quoteWithSchema(ast)} IS ${pqb.quote(ast.comment)}`
+      text: `COMMENT ON TABLE ${quoteWithSchema(ast)} IS ${ast.comment === null ? "NULL" : pqb.escapeString(
+        typeof ast.comment === "string" ? ast.comment : ast.comment[1]
+      )}`
     });
   }
   const addPrimaryKeys = {
@@ -1255,7 +1265,7 @@ const renameColumnSql = (from, to) => {
 const createView = async (migration, up, name, options, sql) => {
   const ast = makeAst(up, name, options, sql);
   const query = astToQuery(ast);
-  await migration.adapter.query(query);
+  await migration.adapter.arrays(interpolateSqlValues(query));
 };
 const makeAst = (up, name, options, sql) => {
   if (typeof sql === "string") {
@@ -2261,7 +2271,7 @@ const createEnum = async (migration, up, name, values, options = {}) => {
   let query;
   const quotedName = quoteWithSchema(ast);
   if (ast.action === "create") {
-    query = `CREATE TYPE ${quotedName} AS ENUM (${values.map(pqb.quote).join(", ")})`;
+    query = `CREATE TYPE ${quotedName} AS ENUM (${values.map(pqb.escapeForMigration).join(", ")})`;
   } else {
     query = `DROP TYPE${ast.dropIfExists ? " IF EXISTS" : ""} ${quotedName}${ast.cascade ? " CASCADE" : ""}`;
   }
@@ -2290,10 +2300,12 @@ DEFAULT ${encodeColumnDefault(column.data.default, values)}` : ""}${!column.data
   } else {
     query = `DROP DOMAIN ${quotedName}`;
   }
-  await migration.adapter.query({
-    text: query,
-    values
-  });
+  await migration.adapter.query(
+    interpolateSqlValues({
+      text: query,
+      values
+    })
+  );
 };
 const createCollation = async (migration, up, name, options) => {
   const [schema, collationName] = getSchemaAndTableFromName(name);
@@ -2330,9 +2342,7 @@ const createCollation = async (migration, up, name, options) => {
   } else {
     query = `DROP COLLATION${ast.dropIfExists ? " IF EXISTS" : ""} ${quotedName}${ast.cascade ? ` CASCADE` : ""}`;
   }
-  await migration.adapter.query({
-    text: query
-  });
+  await migration.adapter.query(query);
 };
 const queryExists = (db, sql) => {
   return db.adapter.query(sql).then(({ rowCount }) => rowCount > 0);
@@ -5935,6 +5945,7 @@ exports.getTextAfterTo = getTextAfterTo;
 exports.identityToSql = identityToSql;
 exports.indexesToQuery = indexesToQuery;
 exports.instantiateDbColumn = instantiateDbColumn;
+exports.interpolateSqlValues = interpolateSqlValues;
 exports.introspectDbSchema = introspectDbSchema;
 exports.joinColumns = joinColumns;
 exports.joinWords = joinWords;