relq 1.0.121 → 1.0.122

package/dist/cjs/cli/commands/generate.cjs

@@ -206,6 +206,7 @@ exports.default = (0, citty_1.defineCommand)({
         const format = config.migrations?.format || 'sequential';
         const includeFunctions = config.includeFunctions ?? false;
         const includeTriggers = config.includeTriggers ?? false;
+        const includePolicies = config.includePolicies ?? false;
         const isEmpty = args.empty === true;
         const noDown = args['no-down'] === true;
         const dryRun = args['dry-run'] === true;
@@ -277,6 +278,10 @@ exports.default = (0, citty_1.defineCommand)({
                 dbParsedSchema.triggers = [];
                 desiredASTCopy.triggers = [];
             }
+            if (!includePolicies) {
+                dbParsedSchema.policies = [];
+                desiredASTCopy.policies = [];
+            }
             const comparison = (0, schema_diff_1.compareSchemas)(dbParsedSchema, desiredASTCopy);
             applyIgnorePatterns(comparison, rawPatterns);
             spin.stop('Diff computed');

package/dist/cjs/cli/commands/import.cjs

@@ -210,6 +210,7 @@ async function runImport(sqlFilePath, options, projectRoot, config) {
         views: parsedSchema.views,
         functions: parsedSchema.functions,
         triggers: parsedSchema.triggers,
+        policies: parsedSchema.policies || [],
         extensions: parsedSchema.extensions,
     };
     if (ignoredCount > 0) {

package/dist/cjs/cli/commands/pull.cjs

@@ -174,6 +174,7 @@ function parseSchemaFileForSnapshot(schemaPath) {
         collations: [],
         functions: [],
         triggers: [],
+        policies: [],
         extensions: [],
     };
 }
@@ -919,6 +920,7 @@ async function runPull(config, projectRoot, opts = {}) {
             tables: [],
             functions: [],
             triggers: [],
+            policies: [],
         };
         const afterSchema = {
             extensions: dbSchema.extensions || [],

package/dist/cjs/cli/commands/push.cjs

@@ -265,6 +265,7 @@ async function runPush(config, projectRoot, opts = {}) {
     const connection = config.connection;
     const includeFunctions = config.includeFunctions ?? false;
     const includeTriggers = config.includeTriggers ?? false;
+    const includePolicies = config.includePolicies ?? false;
     const spin = p.spinner();
     const startTime = Date.now();
     console.log('');
@@ -358,6 +359,10 @@ async function runPush(config, projectRoot, opts = {}) {
             dbParsedSchema.triggers = [];
             desiredASTCopy.triggers = [];
         }
+        if (!includePolicies || desiredASTCopy.policies.length === 0) {
+            dbParsedSchema.policies = [];
+            desiredASTCopy.policies = [];
+        }
         if (desiredASTCopy.sequences.length === 0) {
             dbParsedSchema.sequences = [];
         }

package/dist/cjs/cli/utils/ast-codegen.cjs

@@ -128,6 +128,11 @@ function assignTrackingIds(schema) {
             tr.trackingId = generateTrackingId('r');
         }
     }
+    for (const pol of schema.policies) {
+        if (!pol.trackingId) {
+            pol.trackingId = generateTrackingId('y');
+        }
+    }
     return schema;
 }
 function mergeTrackingIdsFromParsed(target, source) {
@@ -900,6 +905,44 @@ function generateTriggerCode(trigger, useCamelCase, functionNames) {
     }
     return parts.join('\n');
 }
+function generatePolicyCode(policy, useCamelCase, tableNames) {
+    const policyName = useCamelCase ? (0, utils_1.toCamelCase)(policy.name) : policy.name;
+    const tableName = useCamelCase ? (0, utils_1.toCamelCase)(policy.table) : policy.table;
+    const parts = [];
+    parts.push(`export const ${policyName} = pgPolicy('${policy.name}', {`);
+    if (tableNames.has(policy.table)) {
+        parts.push(`    on: ${tableName},`);
+    }
+    else {
+        parts.push(`    on: '${policy.table}',`);
+    }
+    if (policy.command !== 'ALL') {
+        parts.push(`    for: '${policy.command}',`);
+    }
+    if (!policy.permissive) {
+        parts.push(`    permissive: false,`);
+    }
+    if (policy.roles.length > 0) {
+        parts.push(`    to: [${policy.roles.map(r => `'${r}'`).join(', ')}],`);
+    }
+    if (policy.using) {
+        const escapedUsing = policy.using.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
+        parts.push(`    using: '${escapedUsing}',`);
+    }
+    if (policy.withCheck) {
+        const escapedCheck = policy.withCheck.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
+        parts.push(`    withCheck: '${escapedCheck}',`);
+    }
+    if (policy.comment) {
+        const escapedComment = policy.comment.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
+        parts.push(`    comment: '${escapedComment}',`);
+    }
+    parts.push(`})`);
+    if (policy.trackingId) {
+        parts[parts.length - 1] = parts[parts.length - 1].replace('})', `}).$id('${policy.trackingId}')`);
+    }
+    return parts.join('\n');
+}
 function generateTypeScriptFromAST(schema, options) {
     const { camelCase = true, importPath, includeEnums = true, includeDomains = true, includeTables = true, includeFunctions = true, includeTriggers = true, columnTypeMap = {}, typesImportPath, } = options;
     const parts = [];
@@ -917,6 +960,7 @@ function generateTypeScriptFromAST(schema, options) {
     const needsPgSequence = schema.sequences.length > 0;
     const needsPgFunction = includeFunctions && schema.functions.length > 0;
     const needsPgTrigger = includeTriggers && schema.triggers.length > 0;
+    const needsPgPolicy = options.includePolicies !== false && schema.policies.length > 0;
     const needsPgEnum = includeEnums && schema.enums.length > 0;
     const needsPgView = options.includeViews !== false && schema.views.filter(v => !v.isMaterialized).length > 0;
     const needsPgMaterializedView = options.includeViews !== false && schema.views.filter(v => v.isMaterialized).length > 0;
@@ -969,6 +1013,8 @@ function generateTypeScriptFromAST(schema, options) {
         imports.push('pgFunction');
     if (needsPgTrigger)
         imports.push('pgTrigger');
+    if (needsPgPolicy)
+        imports.push('pgPolicy');
     const finalNeedsDefaultImport = needsDefaultImport || (0, defaults_1.getDefaultImportNeeded)();
     const finalNeedsSqlImport = needsSqlImport || (0, constraints_1.getSqlImportNeeded)() || (0, defaults_1.getDefaultSqlImportNeeded)();
     if (finalNeedsDefaultImport)
@@ -1079,6 +1125,17 @@ function generateTypeScriptFromAST(schema, options) {
             parts.push('');
         }
     }
+    if (needsPgPolicy) {
+        parts.push('// =============================================================================');
+        parts.push('// POLICIES');
+        parts.push('// =============================================================================');
+        parts.push('');
+        const definedTableNames = new Set(schema.tables.map(t => t.name));
+        for (const policy of schema.policies) {
+            parts.push(generatePolicyCode(policy, camelCase, definedTableNames));
+            parts.push('');
+        }
+    }
     parts.push('// =============================================================================');
     parts.push('// SCHEMA EXPORT');
     parts.push('// =============================================================================');

package/dist/cjs/cli/utils/ast-transformer.cjs

@@ -515,6 +515,7 @@ async function parseSQL(sql) {
         views: [],
         functions: [],
         triggers: [],
+        policies: [],
         extensions: [],
     };
     for (const stmtWrapper of result.stmts || []) {
@@ -589,6 +590,7 @@ async function introspectedToParsedSchema(schema) {
         views: [],
         functions: [],
         triggers: [],
+        policies: [],
         extensions: schema.extensions || [],
     };
     for (const e of schema.enums || []) {
@@ -1053,5 +1055,6 @@ function normalizedToParsedSchema(schema) {
             comment: t.comment,
             trackingId: t.trackingId,
         })),
+        policies: [],
     };
 }

package/dist/cjs/cli/utils/schema-diff.cjs

@@ -214,6 +214,7 @@ function compareSchemas(oldSchema, newSchema) {
             views: [],
             functions: [],
             triggers: [],
+            policies: [],
             extensions: [],
         },
         removed: {
@@ -228,6 +229,7 @@ function compareSchemas(oldSchema, newSchema) {
             views: [],
             functions: [],
             triggers: [],
+            policies: [],
             extensions: [],
         },
         renamed: {

package/dist/cjs/cli/utils/schema-to-ast.cjs

@@ -7,6 +7,7 @@ exports.isCompositeConfig = isCompositeConfig;
 exports.isSequenceConfig = isSequenceConfig;
 exports.isViewConfig = isViewConfig;
 exports.isMaterializedViewConfig = isMaterializedViewConfig;
+exports.isPolicyConfig = isPolicyConfig;
 exports.isFunctionConfig = isFunctionConfig;
 exports.isTriggerConfig = isTriggerConfig;
 exports.isExtensionsConfig = isExtensionsConfig;
@@ -26,6 +27,7 @@ exports.compositeToAST = compositeToAST;
 exports.sequenceToAST = sequenceToAST;
 exports.viewToAST = viewToAST;
 exports.materializedViewToAST = materializedViewToAST;
+exports.policyToAST = policyToAST;
 exports.functionToAST = functionToAST;
 exports.triggerToAST = triggerToAST;
 exports.parsedColumnToColumnInfo = parsedColumnToColumnInfo;
@@ -61,14 +63,19 @@ function isSequenceConfig(value) {
 function isViewConfig(value) {
     return value && typeof value === 'object' &&
         value.$type === 'view' &&
-        typeof value.name === 'string' &&
-        typeof value.definition === 'string';
+        (typeof value.$viewName === 'string' || typeof value.name === 'string') &&
+        (typeof value.$definition === 'string' || typeof value.definition === 'string');
 }
 function isMaterializedViewConfig(value) {
     return value && typeof value === 'object' &&
         value.$type === 'materialized_view' &&
-        typeof value.name === 'string' &&
-        typeof value.definition === 'string';
+        (typeof value.$viewName === 'string' || typeof value.name === 'string') &&
+        (typeof value.$definition === 'string' || typeof value.definition === 'string');
+}
+function isPolicyConfig(value) {
+    return value && typeof value === 'object' &&
+        value.$type === 'policy' &&
+        (typeof value.$policyName === 'string' || typeof value.name === 'string');
 }
 function isFunctionConfig(value) {
     return value && typeof value === 'object' &&
@@ -198,6 +205,7 @@ function schemaToAST(schema) {
         views: [],
         functions: [],
         triggers: [],
+        policies: [],
         extensions: [],
     };
     const pendingRelations = [];
@@ -258,6 +266,12 @@ function schemaToAST(schema) {
                 result.triggers.push(trigger);
             continue;
         }
+        if (isPolicyConfig(value)) {
+            const policy = policyToAST(value);
+            if (policy)
+                result.policies.push(policy);
+            continue;
+        }
         if (isExtensionsConfig(value)) {
             result.extensions.push(...value.extensions);
             continue;
@@ -723,10 +737,11 @@ function viewToAST(view) {
     if (!isViewConfig(view))
         return null;
     return {
-        name: view.name,
+        name: view.$viewName || view.name,
         schema: view.schema || 'public',
-        definition: view.definition,
+        definition: view.$definition || view.definition,
         isMaterialized: false,
+        comment: view.$commentText,
         trackingId: extractTrackingId(view),
     };
 }
@@ -734,14 +749,34 @@ function materializedViewToAST(matView) {
     if (!isMaterializedViewConfig(matView))
         return null;
     return {
-        name: matView.name,
+        name: matView.$viewName || matView.name,
         schema: matView.schema || 'public',
-        definition: matView.definition,
+        definition: matView.$definition || matView.definition,
         isMaterialized: true,
-        withData: matView.withData,
+        withData: matView.$withData ?? matView.withData,
+        comment: matView.$commentText,
         trackingId: extractTrackingId(matView),
     };
 }
+function policyToAST(policy) {
+    if (!isPolicyConfig(policy))
+        return null;
+    const opts = policy.$options || {};
+    const tableName = typeof opts.on === 'string'
+        ? opts.on
+        : (opts.on?.$name || opts.on?.$tableName || opts.on?.name || '');
+    return {
+        name: policy.$policyName || policy.name,
+        table: tableName,
+        command: opts.for || 'ALL',
+        permissive: opts.permissive !== false,
+        roles: opts.to || [],
+        using: opts.using,
+        withCheck: opts.withCheck,
+        comment: policy.$commentText || opts.comment,
+        trackingId: extractTrackingId(policy),
+    };
+}
 function functionToAST(func) {
     if (!isFunctionConfig(func))
         return null;

package/dist/cjs/cli/utils/source-id-validator.cjs

@@ -175,7 +175,7 @@ function validateCallbackArray(optionsObj, callbackName, entityType, tableName,
 }
 const TOP_LEVEL_BUILDERS = new Set([
     'pgEnum', 'pgDomain', 'pgFunction', 'pgTrigger',
-    'pgView', 'pgMaterializedView',
+    'pgView', 'pgMaterializedView', 'pgPolicy',
 ]);
 const SEQUENCE_BUILDER = 'pgSequence';
 function getBuilderName(init) {
@@ -232,6 +232,7 @@ function validateTopLevelExport(init, exportName, builderName, issues) {
             pgTrigger: 'trigger',
             pgView: 'view',
             pgMaterializedView: 'materialized view',
+            pgPolicy: 'policy',
         };
         const entityType = entityMap[builderName] || builderName;
         issues.push({

package/dist/cjs/cockroachdb-builder.cjs

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customType = exports.jsonb = exports.json = exports.uuid = exports.tsquery = exports.tsvector = exports.varbit = exports.bitVarying = exports.bit = exports.macaddr8 = exports.macaddr = exports.cidr = exports.inet = exports.bool = exports.boolean = exports.interval = exports.timeWithTimeZone = exports.timetz = exports.time = exports.date = exports.timestampWithTimeZone = exports.timestamptz = exports.timestamp = exports.bytea = exports.text = exports.character = exports.char = exports.characterVarying = exports.varchar = exports.float8 = exports.doublePrecision = exports.float4 = exports.real = exports.numeric = exports.decimal = exports.epoch = exports.serial8 = exports.bigserial = exports.serial2 = exports.smallserial = exports.serial4 = exports.serial = exports.int8 = exports.bigint = exports.int2 = exports.smallint = exports.int4 = exports.int = exports.integer = exports.DIALECT = void 0;
 exports.pgView = exports.isSequenceConfig = exports.dropSequenceSQL = exports.generateSequenceSQL = exports.pgSequence = exports.isFunctionConfig = exports.dropFunctionSQL = exports.generateFunctionSQL = exports.pgFunction = exports.addEnumValueSQL = exports.dropEnumSQL = exports.generateEnumSQL = exports.pgEnum = exports.matchCodeToString = exports.stringToActionCode = exports.actionCodeToString = exports.generateReferencesSQL = exports.defineSchema = exports.defineRelations = exports.pgRelations = exports.introspectMultiple = exports.introspectSQL = exports.generateSchemaCode = exports.parseCreateTable = exports.createExpressionBuilder = exports.expressionBuilder = exports.createTableColumnRefs = exports.createGeneratedExprBuilder = exports.createWhereBuilder = exports.getSql = exports.pgExtensions = exports.sqlFunctions = exports.defineTable = exports.createFluentGenExpr = exports.SQL_BRAND = exports.EMPTY_ARRAY = exports.EMPTY_OBJECT = exports.index = exports.raw = exports.sql = exports.emptyArray = exports.emptyObject = exports.currentDate = exports.currentTimestamp = exports.now = exports.genRandomUuid = exports.generateCompositeTypeSQL = exports.pgComposite = exports.generateDomainSQL = exports.pgDomain = void 0;
-exports.validateCrdbTriggers = exports.validateCrdbTrigger = exports.BLOCKED_CONSTRAINT_FEATURES = exports.isConstraintTypeSupported = exports.validateCrdbConstraints = exports.validateCrdbConstraint = exports.getWarningTypes = exports.getBlockedTypes = exports.getCrdbAlternative = exports.checkTypeSupport = exports.validateCrdbColumnTypes = exports.validateCrdbColumnType = exports.getTypesWithDifferences = exports.getUnsupportedTypesByCategory = exports.isCrdbTypeSupported = exports.getCrdbTypeMapping = exports.CRDB_TYPE_MAP = exports.createCrdbValidationResult = exports.formatCrdbValidationResult = exports.formatCrdbMessage = exports.createCrdbMessage = exports.lookupErrorCode = exports.CRDB_INFO = exports.CRDB_WARNINGS = exports.CRDB_ERRORS = exports.UNSUPPORTED_FEATURES = exports.createFunction = exports.formatValidationReport = exports.getSchemaUnsupportedFeatures = exports.isColumnTypeSupported = exports.validateTableForDialect = exports.validateSchemaForDialect = exports.DIALECT_FEATURES = exports.COCKROACHDB_FEATURES = exports.getPortableFeatureSet = exports.compareDialectFeatures = exports.getUnsupportedFeatures = exports.isFeatureSupported = exports.getSupportedIndexMethods = exports.isIndexMethodSupported = exports.validateColumnTypes = exports.validateColumnType = exports.getDialectFeatures = exports.DEFAULT = exports.generateChildPartitionSQL = exports.generatePartitionBySQL = exports.partitionStrategyFactory = exports.materializedViewToSQL = exports.viewToSQL = exports.pgMaterializedView = void 0;
-exports.validateTTL = exports.generateRemoveTTL = exports.generateAlterTableTTL = exports.generateTTLStorageParams = exports.validateZoneConfig = exports.generateDatabaseZoneSQL = exports.generateIndexZoneSQL = exports.generateTableZoneSQL = exports.validateDatabaseConfig = exports.validateLocality = exports.generateDatabaseConfigSQL = exports.generateLocalitySQL = exports.SUPPORTED_INDEX_METHODS = exports.BLOCKED_INDEX_METHODS = exports.isCrdbIndexMethodSupported = exports.generateHashShardedSQL = exports.transformIncludeToStoring = exports.validateHashSharded = exports.validateCrdbIndex = exports.BLOCKED_PLPGSQL_CONSTRUCTS = exports.scanFunctionBody = exports.validateCrdbFunctions = exports.validateCrdbFunction = exports.BLOCKED_TRIGGER_FEATURES = void 0;
+exports.getWarningTypes = exports.getBlockedTypes = exports.getCrdbAlternative = exports.checkTypeSupport = exports.validateCrdbColumnTypes = exports.validateCrdbColumnType = exports.getTypesWithDifferences = exports.getUnsupportedTypesByCategory = exports.isCrdbTypeSupported = exports.getCrdbTypeMapping = exports.CRDB_TYPE_MAP = exports.createCrdbValidationResult = exports.formatCrdbValidationResult = exports.formatCrdbMessage = exports.createCrdbMessage = exports.lookupErrorCode = exports.CRDB_INFO = exports.CRDB_WARNINGS = exports.CRDB_ERRORS = exports.UNSUPPORTED_FEATURES = exports.createFunction = exports.formatValidationReport = exports.getSchemaUnsupportedFeatures = exports.isColumnTypeSupported = exports.validateTableForDialect = exports.validateSchemaForDialect = exports.DIALECT_FEATURES = exports.COCKROACHDB_FEATURES = exports.getPortableFeatureSet = exports.compareDialectFeatures = exports.getUnsupportedFeatures = exports.isFeatureSupported = exports.getSupportedIndexMethods = exports.isIndexMethodSupported = exports.validateColumnTypes = exports.validateColumnType = exports.getDialectFeatures = exports.DEFAULT = exports.generateChildPartitionSQL = exports.generatePartitionBySQL = exports.partitionStrategyFactory = exports.isPolicyConfig = exports.forceRlsSQL = exports.enableRlsSQL = exports.dropPolicySQL = exports.generatePolicySQL = exports.pgPolicy = exports.materializedViewToSQL = exports.viewToSQL = exports.pgMaterializedView = void 0;
+exports.validateTTL = exports.generateRemoveTTL = exports.generateAlterTableTTL = exports.generateTTLStorageParams = exports.validateZoneConfig = exports.generateDatabaseZoneSQL = exports.generateIndexZoneSQL = exports.generateTableZoneSQL = exports.validateDatabaseConfig = exports.validateLocality = exports.generateDatabaseConfigSQL = exports.generateLocalitySQL = exports.SUPPORTED_INDEX_METHODS = exports.BLOCKED_INDEX_METHODS = exports.isCrdbIndexMethodSupported = exports.generateHashShardedSQL = exports.transformIncludeToStoring = exports.validateHashSharded = exports.validateCrdbIndex = exports.BLOCKED_PLPGSQL_CONSTRUCTS = exports.scanFunctionBody = exports.validateCrdbFunctions = exports.validateCrdbFunction = exports.BLOCKED_TRIGGER_FEATURES = exports.validateCrdbTriggers = exports.validateCrdbTrigger = exports.BLOCKED_CONSTRAINT_FEATURES = exports.isConstraintTypeSupported = exports.validateCrdbConstraints = exports.validateCrdbConstraint = void 0;
 exports.validateForCockroachDB = validateForCockroachDB;
 exports.isSupportedType = isSupportedType;
 exports.DIALECT = 'cockroachdb';
@@ -132,6 +132,13 @@ Object.defineProperty(exports, "pgView", { enumerable: true, get: function () {
 Object.defineProperty(exports, "pgMaterializedView", { enumerable: true, get: function () { return pg_view_1.pgMaterializedView; } });
 Object.defineProperty(exports, "viewToSQL", { enumerable: true, get: function () { return pg_view_1.viewToSQL; } });
 Object.defineProperty(exports, "materializedViewToSQL", { enumerable: true, get: function () { return pg_view_1.materializedViewToSQL; } });
+var pg_policy_1 = require("./schema-definition/pg-schema/pg-policy.cjs");
+Object.defineProperty(exports, "pgPolicy", { enumerable: true, get: function () { return pg_policy_1.pgPolicy; } });
+Object.defineProperty(exports, "generatePolicySQL", { enumerable: true, get: function () { return pg_policy_1.generatePolicySQL; } });
+Object.defineProperty(exports, "dropPolicySQL", { enumerable: true, get: function () { return pg_policy_1.dropPolicySQL; } });
+Object.defineProperty(exports, "enableRlsSQL", { enumerable: true, get: function () { return pg_policy_1.enableRlsSQL; } });
+Object.defineProperty(exports, "forceRlsSQL", { enumerable: true, get: function () { return pg_policy_1.forceRlsSQL; } });
+Object.defineProperty(exports, "isPolicyConfig", { enumerable: true, get: function () { return pg_policy_1.isPolicyConfig; } });
 var partitions_1 = require("./schema-definition/pg-schema/partitions.cjs");
 Object.defineProperty(exports, "partitionStrategyFactory", { enumerable: true, get: function () { return partitions_1.partitionStrategyFactory; } });
 Object.defineProperty(exports, "generatePartitionBySQL", { enumerable: true, get: function () { return partitions_1.generatePartitionBySQL; } });

package/dist/cjs/insert/conflict-builder.cjs

@@ -32,9 +32,14 @@ function createRowProxy(tableName) {
 function columnRefToSql(ref) {
     return (0, pg_format_1.default)('%I.%I', ref.table, ref.column);
 }
-function valueToSql(value) {
+function resolveColumnRef(ref, columnResolver) {
+    if (!columnResolver)
+        return ref;
+    return { ...ref, column: columnResolver(ref.column) };
+}
+function valueToSql(value, columnResolver) {
     if (isColumnRef(value)) {
-        return columnRefToSql(value);
+        return columnRefToSql(resolveColumnRef(value, columnResolver));
     }
     if (isSqlExpression(value)) {
         return value.sql;
@@ -44,65 +49,67 @@ function valueToSql(value) {
     }
     return (0, pg_format_1.default)('%L', value);
 }
-function createSqlHelpers(currentColumn, tableName) {
+function createSqlHelpers(currentColumn, tableName, columnResolver) {
+    const resolve = (col) => columnResolver ? columnResolver(col) : col;
+    const resolvedColumn = resolve(currentColumn);
     const expr = (sql) => ({ __type: 'sql_expression', sql });
     return {
         increment(amount) {
-            return expr(`${(0, pg_format_1.default)('%I.%I', tableName, currentColumn)} + ${amount}`);
+            return expr(`${(0, pg_format_1.default)('%I.%I', tableName, resolvedColumn)} + ${amount}`);
         },
         add(a, b) {
-            return expr(`${valueToSql(a)} + ${valueToSql(b)}`);
+            return expr(`${valueToSql(a, columnResolver)} + ${valueToSql(b, columnResolver)}`);
         },
         subtract(a, b) {
-            return expr(`${valueToSql(a)} - ${valueToSql(b)}`);
+            return expr(`${valueToSql(a, columnResolver)} - ${valueToSql(b, columnResolver)}`);
         },
         multiply(a, b) {
-            return expr(`${valueToSql(a)} * ${valueToSql(b)}`);
+            return expr(`${valueToSql(a, columnResolver)} * ${valueToSql(b, columnResolver)}`);
         },
         divide(a, b) {
-            return expr(`${valueToSql(a)} / ${valueToSql(b)}`);
+            return expr(`${valueToSql(a, columnResolver)} / ${valueToSql(b, columnResolver)}`);
         },
         modulo(a, b) {
-            return expr(`${valueToSql(a)} % ${valueToSql(b)}`);
+            return expr(`${valueToSql(a, columnResolver)} % ${valueToSql(b, columnResolver)}`);
         },
         coalesce(...values) {
-            return expr(`COALESCE(${values.map(v => valueToSql(v)).join(', ')})`);
+            return expr(`COALESCE(${values.map(v => valueToSql(v, columnResolver)).join(', ')})`);
         },
         greatest(...values) {
-            return expr(`GREATEST(${values.map(v => valueToSql(v)).join(', ')})`);
+            return expr(`GREATEST(${values.map(v => valueToSql(v, columnResolver)).join(', ')})`);
         },
         least(...values) {
-            return expr(`LEAST(${values.map(v => valueToSql(v)).join(', ')})`);
+            return expr(`LEAST(${values.map(v => valueToSql(v, columnResolver)).join(', ')})`);
         },
         nullif(a, b) {
-            return expr(`NULLIF(${valueToSql(a)}, ${valueToSql(b)})`);
+            return expr(`NULLIF(${valueToSql(a, columnResolver)}, ${valueToSql(b, columnResolver)})`);
         },
         abs(value) {
-            return expr(`ABS(${valueToSql(value)})`);
+            return expr(`ABS(${valueToSql(value, columnResolver)})`);
         },
         ceil(value) {
-            return expr(`CEIL(${valueToSql(value)})`);
+            return expr(`CEIL(${valueToSql(value, columnResolver)})`);
         },
         floor(value) {
-            return expr(`FLOOR(${valueToSql(value)})`);
+            return expr(`FLOOR(${valueToSql(value, columnResolver)})`);
         },
         round(value, decimals) {
             if (decimals !== undefined) {
-                return expr(`ROUND(${valueToSql(value)}, ${decimals})`);
+                return expr(`ROUND(${valueToSql(value, columnResolver)}, ${decimals})`);
             }
-            return expr(`ROUND(${valueToSql(value)})`);
+            return expr(`ROUND(${valueToSql(value, columnResolver)})`);
         },
         concat(...values) {
-            return expr(`CONCAT(${values.map(v => valueToSql(v)).join(', ')})`);
+            return expr(`CONCAT(${values.map(v => valueToSql(v, columnResolver)).join(', ')})`);
         },
         lower(value) {
-            return expr(`LOWER(${valueToSql(value)})`);
+            return expr(`LOWER(${valueToSql(value, columnResolver)})`);
         },
         upper(value) {
-            return expr(`UPPER(${valueToSql(value)})`);
+            return expr(`UPPER(${valueToSql(value, columnResolver)})`);
         },
         trim(value) {
-            return expr(`TRIM(${valueToSql(value)})`);
+            return expr(`TRIM(${valueToSql(value, columnResolver)})`);
         },
         now() {
             return expr('NOW()');
@@ -120,9 +127,14 @@ class ConflictBuilder {
     _updateData = {};
     _whereClause;
     _tableName;
+    _columnResolver;
     constructor(tableName) {
         this._tableName = tableName;
     }
+    setColumnResolver(resolver) {
+        this._columnResolver = resolver;
+        return this;
+    }
     doNothing() {
         this._action = 'nothing';
         this._updateData = {};
@@ -135,7 +147,7 @@ class ConflictBuilder {
         for (const [column, value] of Object.entries(values)) {
             if (typeof value === 'function') {
                 const fn = value;
-                const sqlHelpers = createSqlHelpers(column, this._tableName);
+                const sqlHelpers = createSqlHelpers(column, this._tableName, this._columnResolver);
                 let result;
                 if (fn.length === 1) {
                     result = fn(excludedProxy);
@@ -172,26 +184,29 @@ class ConflictBuilder {
     }
 }
 exports.ConflictBuilder = ConflictBuilder;
-function buildConflictUpdateSql(updateData, tableName) {
+function buildConflictUpdateSql(updateData, tableName, columnResolver) {
+    const resolve = (col) => columnResolver ? columnResolver(col) : col;
     const setClauses = [];
     for (const [column, value] of Object.entries(updateData)) {
+        const resolvedCol = resolve(column);
         if (isColumnRef(value)) {
-            setClauses.push(`${(0, pg_format_1.default)('%I', column)} = ${columnRefToSql(value)}`);
+            const resolvedRef = resolveColumnRef(value, columnResolver);
+            setClauses.push(`${(0, pg_format_1.default)('%I', resolvedCol)} = ${columnRefToSql(resolvedRef)}`);
         }
         else if (isSqlExpression(value)) {
-            setClauses.push(`${(0, pg_format_1.default)('%I', column)} = ${value.sql}`);
+            setClauses.push(`${(0, pg_format_1.default)('%I', resolvedCol)} = ${value.sql}`);
         }
         else if (Array.isArray(value)) {
             if (value.length === 0) {
-                setClauses.push(`${(0, pg_format_1.default)('%I', column)} = ARRAY[]::jsonb[]`);
+                setClauses.push(`${(0, pg_format_1.default)('%I', resolvedCol)} = ARRAY[]::jsonb[]`);
             }
             else {
                 const jsonValues = value.map(v => (0, pg_format_1.default)('%L', JSON.stringify(v))).join(',');
-                setClauses.push(`${(0, pg_format_1.default)('%I', column)} = ARRAY[${jsonValues}]::jsonb[]`);
+                setClauses.push(`${(0, pg_format_1.default)('%I', resolvedCol)} = ARRAY[${jsonValues}]::jsonb[]`);
             }
         }
         else {
-            setClauses.push((0, pg_format_1.default)('%I = %L', column, value));
+            setClauses.push((0, pg_format_1.default)('%I = %L', resolvedCol, value));
         }
     }
     return setClauses.join(', ');

package/dist/cjs/insert/insert-builder.cjs

@@ -99,6 +99,9 @@ class InsertBuilder {
     _onConflict(columns, callback) {
         this.conflictColumns = columns === null ? [] : Array.isArray(columns) ? columns : [columns];
         this.conflictBuilder = new conflict_builder_1.ConflictBuilder(this.tableName);
+        if (this.columnResolver) {
+            this.conflictBuilder.setColumnResolver(this.columnResolver);
+        }
         if (callback) {
             callback(this.conflictBuilder);
         }
@@ -218,10 +221,10 @@ class InsertBuilder {
         if (!this.conflictBuilder)
             return '';
         let clause = this.conflictColumns && this.conflictColumns.length > 0
-            ? (0, pg_format_1.default)(' ON CONFLICT (%I)', this.conflictColumns)
+            ? (0, pg_format_1.default)(' ON CONFLICT (%I)', this.conflictColumns.map(c => this.resolveColumnName(c)))
             : ' ON CONFLICT';
         if (this.conflictBuilder.action === 'update') {
-            const updateSql = (0, conflict_builder_1.buildConflictUpdateSql)(this.conflictBuilder.updateData, this.tableName);
+            const updateSql = (0, conflict_builder_1.buildConflictUpdateSql)(this.conflictBuilder.updateData, this.tableName, (col) => this.resolveColumnName(col));
             clause += ` DO UPDATE SET ${updateSql}`;
             if (this.conflictBuilder.whereClause) {
                 clause += ` WHERE ${this.conflictBuilder.whereClause}`;

package/dist/cjs/schema-definition/pg-schema/index.cjs

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateColumnTypes = exports.validateColumnType = exports.getDialectFeatures = exports.DEFAULT = exports.generateChildPartitionSQL = exports.generatePartitionBySQL = exports.partitionStrategyFactory = exports.materializedViewToSQL = exports.viewToSQL = exports.pgMaterializedView = exports.pgView = exports.isSequenceConfig = exports.dropSequenceSQL = exports.generateSequenceSQL = exports.pgSequence = exports.isTriggerConfig = exports.dropTriggerSQL = exports.generateTriggerSQL = exports.pgTrigger = exports.isFunctionConfig = exports.dropFunctionSQL = exports.generateFunctionSQL = exports.pgFunction = exports.addEnumValueSQL = exports.dropEnumSQL = exports.generateEnumSQL = exports.pgEnum = exports.matchCodeToString = exports.stringToActionCode = exports.actionCodeToString = exports.generateReferencesSQL = exports.defineSchema = exports.defineRelations = exports.pgRelations = exports.manyToMany = exports.many = exports.one = exports.introspectMultiple = exports.introspectSQL = exports.generateSchemaCode = exports.parseCreateTable = exports.createExpressionBuilder = exports.expressionBuilder = exports.createTableColumnRefs = exports.createGeneratedExprBuilder = exports.createWhereBuilder = exports.getSql = exports.pgExtensions = exports.sqlFunctions = exports.defineTable = void 0;
-exports.formatValidationReport = exports.getSchemaUnsupportedFeatures = exports.isColumnTypeSupported = exports.validateTableForDialect = exports.validateSchemaForDialect = exports.DIALECT_FEATURES = exports.DSQL_FEATURES = exports.NILE_FEATURES = exports.COCKROACHDB_FEATURES = exports.POSTGRES_FEATURES = exports.getPortableFeatureSet = exports.compareDialectFeatures = exports.getUnsupportedFeatures = exports.isFeatureSupported = exports.getSupportedIndexMethods = exports.isIndexMethodSupported = void 0;
+exports.dropPolicySQL = exports.generatePolicySQL = exports.pgPolicy = exports.isMaterializedViewConfig = exports.isViewConfig = exports.dropMaterializedViewSQL = exports.dropViewSQL = exports.materializedViewToSQL = exports.viewToSQL = exports.pgMaterializedView = exports.pgView = exports.isSequenceConfig = exports.dropSequenceSQL = exports.generateSequenceSQL = exports.pgSequence = exports.isTriggerConfig = exports.dropTriggerSQL = exports.generateTriggerSQL = exports.pgTrigger = exports.isFunctionConfig = exports.dropFunctionSQL = exports.generateFunctionSQL = exports.pgFunction = exports.addEnumValueSQL = exports.dropEnumSQL = exports.generateEnumSQL = exports.pgEnum = exports.matchCodeToString = exports.stringToActionCode = exports.actionCodeToString = exports.generateReferencesSQL = exports.defineSchema = exports.defineRelations = exports.pgRelations = exports.manyToMany = exports.many = exports.one = exports.introspectMultiple = exports.introspectSQL = exports.generateSchemaCode = exports.parseCreateTable = exports.createExpressionBuilder = exports.expressionBuilder = exports.createTableColumnRefs = exports.createGeneratedExprBuilder = exports.createWhereBuilder = exports.getSql = exports.pgExtensions = exports.sqlFunctions = exports.defineTable = void 0;
+exports.formatValidationReport = exports.getSchemaUnsupportedFeatures = exports.isColumnTypeSupported = exports.validateTableForDialect = exports.validateSchemaForDialect = exports.DIALECT_FEATURES = exports.DSQL_FEATURES = exports.NILE_FEATURES = exports.COCKROACHDB_FEATURES = exports.POSTGRES_FEATURES = exports.getPortableFeatureSet = exports.compareDialectFeatures = exports.getUnsupportedFeatures = exports.isFeatureSupported = exports.getSupportedIndexMethods = exports.isIndexMethodSupported = exports.validateColumnTypes = exports.validateColumnType = exports.getDialectFeatures = exports.DEFAULT = exports.generateChildPartitionSQL = exports.generatePartitionBySQL = exports.partitionStrategyFactory = exports.isPolicyConfig = exports.forceRlsSQL = exports.enableRlsSQL = void 0;
 __exportStar(require("./column-types/index.cjs"), exports);
 var table_definition_1 = require("./table-definition/index.cjs");
 Object.defineProperty(exports, "defineTable", { enumerable: true, get: function () { return table_definition_1.defineTable; } });
@@ -70,6 +70,17 @@ Object.defineProperty(exports, "pgView", { enumerable: true, get: function () {
 Object.defineProperty(exports, "pgMaterializedView", { enumerable: true, get: function () { return pg_view_1.pgMaterializedView; } });
 Object.defineProperty(exports, "viewToSQL", { enumerable: true, get: function () { return pg_view_1.viewToSQL; } });
 Object.defineProperty(exports, "materializedViewToSQL", { enumerable: true, get: function () { return pg_view_1.materializedViewToSQL; } });
+Object.defineProperty(exports, "dropViewSQL", { enumerable: true, get: function () { return pg_view_1.dropViewSQL; } });
+Object.defineProperty(exports, "dropMaterializedViewSQL", { enumerable: true, get: function () { return pg_view_1.dropMaterializedViewSQL; } });
+Object.defineProperty(exports, "isViewConfig", { enumerable: true, get: function () { return pg_view_1.isViewConfig; } });
+Object.defineProperty(exports, "isMaterializedViewConfig", { enumerable: true, get: function () { return pg_view_1.isMaterializedViewConfig; } });
+var pg_policy_1 = require("./pg-policy.cjs");
+Object.defineProperty(exports, "pgPolicy", { enumerable: true, get: function () { return pg_policy_1.pgPolicy; } });
+Object.defineProperty(exports, "generatePolicySQL", { enumerable: true, get: function () { return pg_policy_1.generatePolicySQL; } });
+Object.defineProperty(exports, "dropPolicySQL", { enumerable: true, get: function () { return pg_policy_1.dropPolicySQL; } });
+Object.defineProperty(exports, "enableRlsSQL", { enumerable: true, get: function () { return pg_policy_1.enableRlsSQL; } });
+Object.defineProperty(exports, "forceRlsSQL", { enumerable: true, get: function () { return pg_policy_1.forceRlsSQL; } });
+Object.defineProperty(exports, "isPolicyConfig", { enumerable: true, get: function () { return pg_policy_1.isPolicyConfig; } });
 var partitions_1 = require("./partitions.cjs");
 Object.defineProperty(exports, "partitionStrategyFactory", { enumerable: true, get: function () { return partitions_1.partitionStrategyFactory; } });
 Object.defineProperty(exports, "generatePartitionBySQL", { enumerable: true, get: function () { return partitions_1.generatePartitionBySQL; } });