rake-db 2.27.20 → 2.27.22

package/dist/index.d.ts

@@ -275,7 +275,7 @@ declare const getSchemaAndTableFromName: (name: string) => [string | undefined,
 declare const concatSchemaAndName: ({ schema, name, }: {
     schema?: string;
     name: string;
-}) => string;
+}, excludeCurrentSchema?: string) => string;
 
 interface MigrationItemHasLoad {
     path?: string;

package/dist/index.js

@@ -3222,14 +3222,14 @@ const quoteCustomType = (s) => {
   const [schema, type] = getSchemaAndTableFromName(s);
   return schema ? '"' + schema + '".' + type : type;
 };
-const quoteSchemaTable = (arg) => {
-  return pqb.singleQuote(concatSchemaAndName(arg));
+const quoteSchemaTable = (arg, excludeCurrentSchema) => {
+  return pqb.singleQuote(concatSchemaAndName(arg, excludeCurrentSchema));
 };
 const concatSchemaAndName = ({
   schema,
   name
-}) => {
-  return schema ? `${schema}.${name}` : name;
+}, excludeCurrentSchema) => {
+  return schema && schema !== excludeCurrentSchema ? `${schema}.${name}` : name;
 };
 const makePopulateEnumQuery = (item) => {
   const [schema, name] = getSchemaAndTableFromName(item.enumName);
@@ -4319,7 +4319,7 @@ const instantiateDbColumn = (ctx, data, domains, dbColumn) => {
       if (enumType) {
         column = new pqb.EnumColumn(
           ctx.columnSchemaConfig,
-          typeId,
+          typeSchema === ctx.currentSchema ? typeName : typeId,
           enumType.values,
           ctx.columnSchemaConfig.type
         );
@@ -5252,24 +5252,27 @@ const astEncoders = {
     pqb.addCode(code, ");");
     return code;
   },
-  enum(ast) {
-    return `await db.${ast.action === "create" ? "createEnum" : "dropEnum"}(${quoteSchemaTable(ast)}, [${ast.values.map(pqb.singleQuote).join(", ")}]);`;
+  enum(ast, _, currentSchema) {
+    return `await db.${ast.action === "create" ? "createEnum" : "dropEnum"}(${quoteSchemaTable(ast, currentSchema)}, [${ast.values.map(pqb.singleQuote).join(", ")}]);`;
   },
-  enumValues(ast) {
+  enumValues(ast, _, currentSchema) {
     return `await db.${ast.action}EnumValues(${quoteSchemaTable(
-      ast
+      ast,
+      currentSchema
     )}, [${ast.values.map(pqb.singleQuote).join(", ")}]);`;
   },
-  renameEnumValues(ast, config) {
+  renameEnumValues(ast, config, currentSchema) {
     return `await db.renameEnumValues(${quoteSchemaTable(
-      ast
+      ast,
+      currentSchema
     )}, { ${Object.entries(ast.values).map(
       ([from, to]) => `${pqb.quoteObjectKey(from, config.snakeCase)}: ${pqb.singleQuote(to)}`
     ).join(", ")} });`;
   },
-  changeEnumValues(ast) {
+  changeEnumValues(ast, _, currentSchema) {
     return `await db.changeEnumValues(${quoteSchemaTable(
-      ast
+      ast,
+      currentSchema
     )}, [${ast.fromValues.map(pqb.singleQuote).join(", ")}], [${ast.toValues.map(pqb.singleQuote).join(", ")}]);`;
   },
   domain(ast, _, currentSchema) {