relq 1.0.26 → 1.0.28

package/dist/esm/cli/utils/ast-codegen.js

@@ -1,4 +1,5 @@
 import { toCamelCase, escapeString, isBalanced, } from "./ast/codegen/utils.js";
+import { format as formatSQL } from 'sql-formatter';
 import { astToBuilder } from "./ast/codegen/builder.js";
 import { getColumnBuilder, getColumnBuilderWithInfo } from "./ast/codegen/type-map.js";
 import { formatDefaultValue, resetDefaultImportFlags, getDefaultImportNeeded, getDefaultSqlImportNeeded, } from "./ast/codegen/defaults.js";
@@ -546,16 +547,17 @@ function generateSequenceCode(seq, useCamelCase) {
     const optsStr = opts.length > 0 ? `, { ${opts.join(', ')} }` : '';
     return `export const ${seqName} = pgSequence('${seq.name}'${optsStr})`;
 }
-function generateFunctionCode(func, useCamelCase) {
-    const funcName = useCamelCase ? toCamelCase(func.name) : func.name;
+function generateFunctionCode(func, useCamelCase, varNameOverride) {
+    const funcName = varNameOverride || (useCamelCase ? toCamelCase(func.name) : func.name);
     const parts = [];
     parts.push(`export const ${funcName} = pgFunction('${func.name}', {`);
     if (func.args.length > 0) {
-        const argsStr = func.args.map(arg => {
-            const argParts = [`type: '${arg.type}'`];
-            if (arg.name)
-                argParts.push(`name: '${arg.name}'`);
-            if (arg.mode)
+        const argsStr = func.args.map((arg, index) => {
+            const argParts = [];
+            const argName = arg.name || `$${index + 1}`;
+            argParts.push(`name: '${argName}'`);
+            argParts.push(`type: '${arg.type}'`);
+            if (arg.mode && arg.mode !== 'IN')
                 argParts.push(`mode: '${arg.mode}'`);
             if (arg.default)
                 argParts.push(`default: '${escapeString(arg.default)}'`);
@@ -565,8 +567,26 @@ function generateFunctionCode(func, useCamelCase) {
     }
     parts.push(`    returns: '${func.returnType}',`);
     parts.push(`    language: '${func.language}',`);
-    const escapedBody = func.body.replace(/\\/g, '\\\\').replace(/`/g, '\\`').replace(/\$/g, '\\$');
-    parts.push(`    body: \`${escapedBody}\`,`);
+    let formattedBody = func.body;
+    const lang = func.language?.toLowerCase();
+    if (func.body && (lang === 'plpgsql' || lang === 'sql')) {
+        try {
+            formattedBody = formatSQL(func.body, {
+                language: 'postgresql',
+                tabWidth: 4,
+                keywordCase: 'upper',
+            });
+        }
+        catch {
+            formattedBody = func.body;
+        }
+    }
+    const escapedBody = formattedBody.replace(/\\/g, '\\\\').replace(/`/g, '\\`').replace(/\$/g, '\\$');
+    const indentedBody = escapedBody
+        .split('\n')
+        .map(line => '        ' + line)
+        .join('\n');
+    parts.push(`    body: \`\n${indentedBody}\n    \`,`);
     if (func.volatility)
         parts.push(`    volatility: '${func.volatility}',`);
     if (func.isStrict)
@@ -574,6 +594,9 @@ function generateFunctionCode(func, useCamelCase) {
     if (func.securityDefiner)
         parts.push(`    securityDefiner: true,`);
     parts.push(`})`);
+    if (func.trackingId) {
+        parts[parts.length - 1] = parts[parts.length - 1].replace('})', `}).$id('${func.trackingId}')`);
+    }
     return parts.join('\n');
 }
 function generateViewCode(view, useCamelCase) {
@@ -1033,3 +1056,134 @@ function generateFKSQLComment(fk, camelCase) {
     }
     return parts.join(' | ');
 }
+function resolveFunctionVarName(func, usedNames, useCamelCase) {
+    const baseName = useCamelCase ? toCamelCase(func.name) : func.name;
+    const count = usedNames.get(baseName) || 0;
+    usedNames.set(baseName, count + 1);
+    if (count === 0) {
+        return baseName;
+    }
+    return `${baseName}_${count + 1}`;
+}
+export function generateFunctionsFile(schema, options = {}) {
+    const { camelCase = true, importPath = 'relq/schema-builder', schemaImportPath = './schema', } = options;
+    if (schema.functions.length === 0) {
+        return null;
+    }
+    const parts = [];
+    parts.push('/**');
+    parts.push(' * Auto-generated by Relq CLI');
+    parts.push(` * Generated at: ${new Date().toISOString()}`);
+    parts.push(' * DO NOT EDIT - changes will be overwritten');
+    parts.push(' */');
+    parts.push('');
+    parts.push(`import { pgFunction } from '${importPath}';`);
+    void schemaImportPath;
+    parts.push('');
+    const usedNames = new Map();
+    const functionVarNames = [];
+    parts.push('// =============================================================================');
+    parts.push('// FUNCTIONS');
+    parts.push('// =============================================================================');
+    parts.push('');
+    for (const func of schema.functions) {
+        const varName = resolveFunctionVarName(func, usedNames, camelCase);
+        functionVarNames.push(varName);
+        parts.push(generateFunctionCode(func, camelCase, varName));
+        parts.push('');
+    }
+    parts.push('// =============================================================================');
+    parts.push('// EXPORTS');
+    parts.push('// =============================================================================');
+    parts.push('');
+    parts.push('export const functions = {');
+    for (const name of functionVarNames) {
+        parts.push(`    ${name},`);
+    }
+    parts.push('} as const;');
+    parts.push('');
+    return parts.join('\n');
+}
+export function generateTriggersFile(schema, options = {}) {
+    const { camelCase = true, importPath = 'relq/schema-builder', schemaImportPath = './schema', functionsImportPath = './schema.functions', } = options;
+    if (schema.triggers.length === 0) {
+        return null;
+    }
+    const parts = [];
+    parts.push('/**');
+    parts.push(' * Auto-generated by Relq CLI');
+    parts.push(` * Generated at: ${new Date().toISOString()}`);
+    parts.push(' * DO NOT EDIT - changes will be overwritten');
+    parts.push(' */');
+    parts.push('');
+    parts.push(`import { pgTrigger } from '${importPath}';`);
+    parts.push(`import { schema } from '${schemaImportPath}';`);
+    if (schema.functions.length > 0) {
+        parts.push(`import { functions } from '${functionsImportPath}';`);
+    }
+    parts.push('');
+    const functionNames = new Set();
+    const usedFuncNames = new Map();
+    for (const func of schema.functions) {
+        const varName = resolveFunctionVarName(func, usedFuncNames, camelCase);
+        functionNames.add(varName);
+    }
+    parts.push('// =============================================================================');
+    parts.push('// TRIGGERS');
+    parts.push('// =============================================================================');
+    parts.push('');
+    const triggerVarNames = [];
+    for (const trigger of schema.triggers) {
+        const triggerName = camelCase ? toCamelCase(trigger.name) : trigger.name;
+        const tableName = camelCase ? toCamelCase(trigger.table) : trigger.table;
+        triggerVarNames.push(triggerName);
+        parts.push(`export const ${triggerName} = pgTrigger('${trigger.name}', {`);
+        parts.push(`    on: schema.${tableName},`);
+        const events = trigger.events.length === 1
+            ? `'${trigger.events[0]}'`
+            : `[${trigger.events.map(e => `'${e}'`).join(', ')}]`;
+        if (trigger.timing === 'BEFORE') {
+            parts.push(`    before: ${events},`);
+        }
+        else if (trigger.timing === 'AFTER') {
+            parts.push(`    after: ${events},`);
+        }
+        else if (trigger.timing === 'INSTEAD OF') {
+            parts.push(`    insteadOf: ${events},`);
+        }
+        parts.push(`    forEach: '${trigger.forEach || 'ROW'}',`);
+        const funcVarName = camelCase ? toCamelCase(trigger.functionName) : trigger.functionName;
+        if (functionNames.has(funcVarName)) {
+            parts.push(`    execute: functions.${funcVarName},`);
+        }
+        else {
+            parts.push(`    execute: '${trigger.functionName}',`);
+        }
+        if (trigger.whenClause)
+            parts.push(`    when: '${escapeString(trigger.whenClause)}',`);
+        if (trigger.isConstraint)
+            parts.push(`    constraint: true,`);
+        if (trigger.deferrable)
+            parts.push(`    deferrable: true,`);
+        if (trigger.initiallyDeferred)
+            parts.push(`    initially: 'DEFERRED',`);
+        if (trigger.trackingId) {
+            parts.push(`}).$id('${trigger.trackingId}');`);
+        }
+        else {
+            parts.push(`});`);
+        }
+        parts.push('');
+    }
+    parts.push('// =============================================================================');
+    parts.push('// EXPORTS');
+    parts.push('// =============================================================================');
+    parts.push('');
+    parts.push('export const triggers = {');
+    for (const name of triggerVarNames) {
+        parts.push(`    ${name},`);
+    }
+    parts.push('} as const;');
+    parts.push('');
+    return parts.join('\n');
+}

package/dist/esm/cli/utils/ast-transformer.js

@@ -698,7 +698,8 @@ export async function introspectedToParsedSchema(schema) {
             args: parseArgTypes(f.argTypes),
             returnType: f.returnType,
             language: f.language,
-            body: f.definition || '',
+            body: extractFunctionBody(f.definition || ''),
+            volatility: f.volatility,
             isStrict: false,
             securityDefiner: false,
         });
@@ -709,7 +710,7 @@ export async function introspectedToParsedSchema(schema) {
             table: t.tableName,
             timing: t.timing,
             events: [t.event],
-            forEach: 'STATEMENT',
+            forEach: t.forEach || 'ROW',
             functionName: t.functionName || '',
             isConstraint: false,
         });
@@ -799,6 +800,19 @@ function parseArgTypes(argTypes) {
         type: typeof arg === 'string' ? arg.trim() : String(arg),
     }));
 }
+function extractFunctionBody(definition) {
+    if (!definition)
+        return '';
+    const bodyMatch = definition.match(/AS\s+\$([a-zA-Z_]*)\$\s*([\s\S]*?)\s*\$\1\$/i);
+    if (bodyMatch) {
+        return bodyMatch[2].trim();
+    }
+    const singleQuoteMatch = definition.match(/AS\s+'([\s\S]*?)'\s*$/i);
+    if (singleQuoteMatch) {
+        return singleQuoteMatch[1].replace(/''/g, "'");
+    }
+    return '';
+}
 export { parse, deparse };
 export function normalizedToParsedSchema(schema) {
     return {

package/dist/esm/cli/utils/fast-introspect.js

@@ -417,6 +417,10 @@ export async function fastIntrospectDatabase(connection, onProgress, options) {
                 JOIN pg_language l ON p.prolang = l.oid
                 WHERE n.nspname = 'public'
                     AND p.prokind IN ('f', 'a')
+                    -- Exclude C language functions (typically extension functions like pgcrypto)
+                    AND l.lanname != 'c'
+                    -- Exclude internal language functions
+                    AND l.lanname != 'internal'
                 ORDER BY p.proname;
             `);
             functions = functionsResult.rows.map(f => ({
@@ -450,6 +454,10 @@ export async function fastIntrospectDatabase(connection, onProgress, options) {
                         WHEN t.tgtype & 16 > 0 THEN 'UPDATE'
                         ELSE 'UNKNOWN'
                     END as event,
+                    CASE
+                        WHEN t.tgtype & 1 > 0 THEN 'ROW'
+                        ELSE 'STATEMENT'
+                    END as for_each,
                     p.proname as function_name,
                     pg_get_triggerdef(t.oid) as definition,
                     t.tgenabled != 'D' as is_enabled
@@ -459,6 +467,11 @@ export async function fastIntrospectDatabase(connection, onProgress, options) {
                 JOIN pg_proc p ON t.tgfoid = p.oid
                 WHERE n.nspname = 'public'
                     AND NOT t.tgisinternal
+                    -- Exclude triggers on partition child tables
+                    AND NOT EXISTS (
+                        SELECT 1 FROM pg_inherits i
+                        WHERE i.inhrelid = c.oid
+                    )
                 ORDER BY c.relname, t.tgname;
             `);
             triggers = triggersResult.rows.map(t => ({
@@ -466,6 +479,7 @@ export async function fastIntrospectDatabase(connection, onProgress, options) {
                 tableName: t.table_name,
                 timing: t.timing,
                 event: t.event,
+                forEach: t.for_each,
                 functionName: t.function_name,
                 definition: t.definition || '',
                 isEnabled: t.is_enabled,

package/dist/esm/cli/utils/schema-comparator.js

@@ -84,6 +84,30 @@ function compareDomains(before, after) {
             changes.push(createChange('DROP', 'DOMAIN', name, domain, null));
         }
     }
+    for (const [name, afterDomain] of afterMap) {
+        const beforeDomain = beforeMap.get(name);
+        if (!beforeDomain)
+            continue;
+        const baseTypeChanged = beforeDomain.baseType !== afterDomain.baseType;
+        const notNullChanged = (beforeDomain.isNotNull || false) !== (afterDomain.isNotNull || false);
+        const defaultChanged = (beforeDomain.defaultValue || null) !== (afterDomain.defaultValue || null);
+        const checkChanged = (beforeDomain.checkExpression || null) !== (afterDomain.checkExpression || null);
+        if (baseTypeChanged || notNullChanged || defaultChanged || checkChanged) {
+            changes.push(createChange('ALTER', 'DOMAIN', name, {
+                name: beforeDomain.name,
+                baseType: beforeDomain.baseType,
+                notNull: beforeDomain.isNotNull,
+                default: beforeDomain.defaultValue,
+                check: beforeDomain.checkExpression,
+            }, {
+                name: afterDomain.name,
+                baseType: afterDomain.baseType,
+                notNull: afterDomain.isNotNull,
+                default: afterDomain.defaultValue,
+                check: afterDomain.checkExpression,
+            }));
+        }
+    }
     return changes;
 }
 function compareCompositeTypes(before, after) {

package/dist/esm/cli/utils/schema-introspect.js

@@ -249,7 +249,7 @@ export async function introspectDatabase(connection, onProgress, options) {
         if (includeFunctions) {
             onProgress?.('fetching_functions');
             const functionsResult = await pool.query(`
-                SELECT 
+                SELECT
                     p.proname as name,
                     n.nspname as schema,
                     pg_get_function_result(p.oid) as return_type,
@@ -263,6 +263,17 @@ export async function introspectDatabase(connection, onProgress, options) {
                 JOIN pg_language l ON p.prolang = l.oid
                 WHERE n.nspname = 'public'
                     AND p.prokind IN ('f', 'a')
+                    -- Exclude functions that belong to extensions (e.g., pgcrypto, uuid-ossp)
+                    AND NOT EXISTS (
+                        SELECT 1 FROM pg_depend d
+                        JOIN pg_extension e ON d.refobjid = e.oid
+                        WHERE d.objid = p.oid
+                        AND d.deptype = 'e'
+                    )
+                    -- Exclude C language functions (typically extension functions)
+                    AND l.lanname != 'c'
+                    -- Exclude internal language functions
+                    AND l.lanname != 'internal'
                 ORDER BY p.proname;
             `);
             functions = functionsResult.rows.map(f => ({
@@ -279,20 +290,24 @@ export async function introspectDatabase(connection, onProgress, options) {
         let triggers = [];
         if (includeTriggers) {
             const triggersResult = await pool.query(`
-                SELECT 
+                SELECT
                     t.tgname as name,
                     c.relname as table_name,
-                    CASE 
+                    CASE
                         WHEN t.tgtype & 2 > 0 THEN 'BEFORE'
                         WHEN t.tgtype & 64 > 0 THEN 'INSTEAD OF'
                         ELSE 'AFTER'
                     END as timing,
-                    CASE 
+                    CASE
                         WHEN t.tgtype & 4 > 0 THEN 'INSERT'
                         WHEN t.tgtype & 8 > 0 THEN 'DELETE'
                         WHEN t.tgtype & 16 > 0 THEN 'UPDATE'
                         ELSE 'UNKNOWN'
                     END as event,
+                    CASE
+                        WHEN t.tgtype & 1 > 0 THEN 'ROW'
+                        ELSE 'STATEMENT'
+                    END as for_each,
                     p.proname as function_name,
                     pg_get_triggerdef(t.oid) as definition,
                     t.tgenabled != 'D' as is_enabled
@@ -302,6 +317,11 @@ export async function introspectDatabase(connection, onProgress, options) {
                 JOIN pg_proc p ON t.tgfoid = p.oid
                 WHERE n.nspname = 'public'
                     AND NOT t.tgisinternal
+                    -- Exclude triggers on partition child tables (only show on parent)
+                    AND NOT EXISTS (
+                        SELECT 1 FROM pg_inherits i
+                        WHERE i.inhrelid = c.oid
+                    )
                 ORDER BY c.relname, t.tgname;
             `);
             triggers = triggersResult.rows.map(t => ({
@@ -309,6 +329,7 @@ export async function introspectDatabase(connection, onProgress, options) {
                 tableName: t.table_name,
                 timing: t.timing,
                 event: t.event,
+                forEach: t.for_each,
                 functionName: t.function_name,
                 definition: t.definition || '',
                 isEnabled: t.is_enabled,

package/dist/esm/cli/utils/sql-parser.js

@@ -861,7 +861,9 @@ export function parseTriggers(sql) {
         const tableMatch = body.match(/\bON\s+(\w+)/i);
         const tableName = tableMatch ? tableMatch[1] : '';
         const forEachMatch = body.match(/FOR\s+EACH\s+(ROW|STATEMENT)/i);
-        const forEach = forEachMatch ? forEachMatch[1].toUpperCase() : 'STATEMENT';
+        const forEach = forEachMatch
+            ? forEachMatch[1].toUpperCase()
+            : 'ROW';
         const whenMatch = body.match(/WHEN\s*\((.+?)\)\s*(?:EXECUTE|$)/is);
         const condition = whenMatch ? whenMatch[1].trim() : undefined;
         const refOldMatch = body.match(/REFERENCING\s+.*?OLD\s+TABLE\s+AS\s+(\w+)/i);
@@ -877,6 +879,7 @@ export function parseTriggers(sql) {
                 tableName,
                 timing,
                 event: events[0] || 'INSERT',
+                forEach,
                 functionName,
                 definition: match[0],
                 isEnabled: true,

package/dist/esm/config/config.js

@@ -191,5 +191,8 @@ export function validateConfig(config) {
             errors.push('Pool max must be at least 1');
         }
     }
+    if (config.includeTriggers && !config.includeFunctions) {
+        errors.push('Triggers require functions to be enabled. Set includeFunctions: true in your config.');
+    }
     return { valid: errors.length === 0, errors };
 }

package/dist/esm/schema-definition/pg-function.js

@@ -94,6 +94,10 @@ export function pgFunction(name, options) {
                 trackingId: this.$trackingId,
             };
         },
+        $id(trackingId) {
+            this.$trackingId = trackingId;
+            return this;
+        },
     };
 }
 export function isFunctionConfig(value) {

package/dist/esm/schema-definition/pg-trigger.js

@@ -20,7 +20,7 @@ function getFunctionName(func) {
 }
 export function generateTriggerSQL(config) {
     const { $triggerName, $options } = config;
-    const { on, before, after, insteadOf, updateOf, forEachRow = true, forEachStatement, when, referencing, constraint, deferrable, initially, execute, executeArgs, } = $options;
+    const { on, before, after, insteadOf, updateOf, forEach = 'ROW', when, referencing, constraint, deferrable, initially, execute, executeArgs, } = $options;
     const parts = ['CREATE'];
     if (constraint) {
         parts.push('CONSTRAINT');
@@ -68,10 +68,10 @@ export function generateTriggerSQL(config) {
         }
         parts.push(refParts.join(' '));
     }
-    if (forEachStatement) {
+    if (forEach === 'STATEMENT') {
         parts.push('\n    FOR EACH STATEMENT');
     }
-    else if (forEachRow !== false) {
+    else {
         parts.push('\n    FOR EACH ROW');
     }
     if (when) {
@@ -113,7 +113,7 @@ export function pgTrigger(name, options) {
                 timing = 'BEFORE';
                 events = ['INSERT'];
             }
-            const forEach = opts.forEachStatement ? 'STATEMENT' : 'ROW';
+            const forEachLevel = opts.forEach || 'ROW';
             const functionName = typeof opts.execute === 'string'
                 ? opts.execute
                 : opts.execute.$functionName;
@@ -122,7 +122,7 @@ export function pgTrigger(name, options) {
                 table: getTableName(opts.on),
                 timing,
                 events,
-                forEach,
+                forEach: forEachLevel,
                 functionName,
                 whenClause: opts.when,
                 isConstraint: opts.constraint ?? false,
@@ -131,6 +131,10 @@ export function pgTrigger(name, options) {
                 trackingId: this.$trackingId,
             };
         },
+        $id(trackingId) {
+            this.$trackingId = trackingId;
+            return this;
+        },
     };
 }
 export function isTriggerConfig(value) {

package/dist/schema-builder.d.ts

@@ -3258,6 +3258,10 @@ export declare function addEnumValueSQL(enumName: string, newValue: string, posi
 export type FunctionVolatility = "VOLATILE" | "STABLE" | "IMMUTABLE";
 export type FunctionParallel = "UNSAFE" | "RESTRICTED" | "SAFE";
 export type FunctionSecurity = "INVOKER" | "DEFINER";
+/** Common PostgreSQL function languages */
+export type FunctionLanguage = "plpgsql" | "sql" | "plpython3u" | "plperl" | "pltcl" | (string & {});
+/** Common PostgreSQL return types with autocomplete support */
+export type FunctionReturnType = "trigger" | "void" | "integer" | "bigint" | "smallint" | "numeric" | "real" | "double precision" | "text" | "varchar" | "char" | "name" | "boolean" | "timestamp" | "timestamptz" | "timestamp with time zone" | "timestamp without time zone" | "date" | "time" | "timetz" | "interval" | "bytea" | "uuid" | "json" | "jsonb" | "text[]" | "integer[]" | "uuid[]" | "jsonb[]" | "record" | "SETOF record" | (string & {});
 export interface FunctionArgument {
 	/** Argument name */
 	name: string;
@@ -3271,10 +3275,10 @@ export interface FunctionArgument {
 export interface FunctionOptions {
 	/** Function arguments */
 	args?: FunctionArgument[];
-	/** Return type (e.g., 'INTEGER', 'TRIGGER', 'SETOF UUID', 'TABLE(...)') */
-	returns: string;
+	/** Return type (e.g., 'integer', 'trigger', 'SETOF uuid', 'TABLE(...)') */
+	returns: FunctionReturnType;
 	/** Language (default: 'plpgsql') */
-	language?: string;
+	language?: FunctionLanguage;
 	/** Volatility category */
 	volatility?: FunctionVolatility;
 	/** Parallel safety */
@@ -3313,6 +3317,8 @@ export interface FunctionConfig {
 	$trackingId?: string;
 	/** Returns AST for schema diffing and migration generation */
 	toAST(): ParsedFunction;
+	/** Set tracking ID for rename detection */
+	$id(trackingId: string): FunctionConfig;
 }
 /**
  * Generate SQL for a function definition
@@ -3408,13 +3414,9 @@ export interface TriggerOptions<TTable = unknown> {
 	 */
 	updateOf?: string[];
 	/**
-	 * FOR EACH ROW (default: true for row-level trigger)
-	 */
-	forEachRow?: boolean;
-	/**
-	 * FOR EACH STATEMENT
+	 * FOR EACH ROW or FOR EACH STATEMENT (default: 'ROW')
 	 */
-	forEachStatement?: boolean;
+	forEach?: TriggerLevel;
 	/**
 	 * WHEN condition (SQL expression)
 	 * Can reference OLD and NEW
@@ -3459,6 +3461,8 @@ export interface TriggerConfig<TTable = unknown> {
 	$trackingId?: string;
 	/** Returns AST for schema diffing and migration generation */
 	toAST(): ParsedTrigger;
+	/** Set tracking ID for rename detection */
+	$id(trackingId: string): TriggerConfig<TTable>;
 }
 /**
  * Generate SQL for a trigger definition
@@ -3477,7 +3481,7 @@ export declare function dropTriggerSQL(config: TriggerConfig, ifExists?: boolean
  * export const trgUpdateTimestamp = pgTrigger('trg_update_timestamp', {
  *     on: usersTable,
  *     before: 'UPDATE',
- *     forEachRow: true,
+ *     forEach: 'ROW',
  *     execute: updateTimestampFunc
  * });
  *
@@ -3485,7 +3489,7 @@ export declare function dropTriggerSQL(config: TriggerConfig, ifExists?: boolean
  * export const trgAudit = pgTrigger('trg_audit', {
  *     on: ordersTable,
  *     after: ['INSERT', 'UPDATE', 'DELETE'],
- *     forEachRow: true,
+ *     forEach: 'ROW',
  *     execute: auditChangesFunc
  * });
  *
@@ -3494,7 +3498,7 @@ export declare function dropTriggerSQL(config: TriggerConfig, ifExists?: boolean
  *     on: usersTable,
  *     after: 'UPDATE',
  *     updateOf: ['status'],
- *     forEachRow: true,
+ *     forEach: 'ROW',
  *     when: 'OLD.status IS DISTINCT FROM NEW.status',
  *     execute: notifyStatusChangeFunc
  * });
@@ -3503,7 +3507,7 @@ export declare function dropTriggerSQL(config: TriggerConfig, ifExists?: boolean
  * export const trgBulkUpdate = pgTrigger('trg_bulk_update', {
  *     on: productsTable,
  *     after: 'UPDATE',
- *     forEachStatement: true,
+ *     forEach: 'STATEMENT',
  *     referencing: {
  *         oldTable: 'old_products',
  *         newTable: 'new_products'
@@ -3515,7 +3519,7 @@ export declare function dropTriggerSQL(config: TriggerConfig, ifExists?: boolean
  * export const trgViewInsert = pgTrigger('trg_view_insert', {
  *     on: 'users_view',
  *     insteadOf: 'INSERT',
- *     forEachRow: true,
+ *     forEach: 'ROW',
  *     execute: handleViewInsertFunc
  * });
  *
@@ -3526,7 +3530,7 @@ export declare function dropTriggerSQL(config: TriggerConfig, ifExists?: boolean
  *     constraint: true,
  *     deferrable: true,
  *     initially: 'DEFERRED',
- *     forEachRow: true,
+ *     forEach: 'ROW',
  *     execute: validateOrderFunc
  * });
  * ```
@@ -3696,8 +3700,8 @@ export declare namespace sql {
 		__raw: string;
 	};
 }
-export type FunctionReturnType = "trigger" | "void" | "integer" | "bigint" | "smallint" | "real" | "double precision" | "numeric" | "text" | "varchar" | "char" | "boolean" | "json" | "jsonb" | "uuid" | "timestamp" | "timestamptz" | "date" | "time" | "timetz" | "interval" | "bytea" | "record" | "setof record" | (string & {});
-export type FunctionLanguage = "plpgsql" | "sql" | "plv8" | "plpython3u" | "plperl" | (string & {});
+type FunctionReturnType$1 = "trigger" | "void" | "integer" | "bigint" | "smallint" | "real" | "double precision" | "numeric" | "text" | "varchar" | "char" | "boolean" | "json" | "jsonb" | "uuid" | "timestamp" | "timestamptz" | "date" | "time" | "timetz" | "interval" | "bytea" | "record" | "setof record" | (string & {});
+type FunctionLanguage$1 = "plpgsql" | "sql" | "plv8" | "plpython3u" | "plperl" | (string & {});
 export type FunctionType = "function" | "procedure";
 type FunctionVolatility$1 = "volatile" | "stable" | "immutable";
 type FunctionSecurity$1 = "invoker" | "definer";
@@ -3711,9 +3715,9 @@ interface FunctionOptions$1 {
 	/** Function name */
 	name: string;
 	/** Return type with autocomplete */
-	returns: FunctionReturnType;
+	returns: FunctionReturnType$1;
 	/** Language with autocomplete */
-	language: FunctionLanguage;
+	language: FunctionLanguage$1;
 	/** Function or procedure */
 	as?: FunctionType;
 	/** Function parameters */
@@ -3754,7 +3758,9 @@ export interface FunctionDefinition {
 export declare function createFunction(options: FunctionOptions$1): FunctionDefinition;
 
 export {
+	FunctionLanguage$1 as FunctionLanguage,
 	FunctionOptions$1 as FunctionOptions,
+	FunctionReturnType$1 as FunctionReturnType,
 	FunctionSecurity$1 as FunctionSecurity,
 	FunctionVolatility$1 as FunctionVolatility,
 	ParsedColumn$1 as ParsedColumn,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relq",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "The Fully-Typed PostgreSQL ORM for TypeScript",
   "author": "Olajide Mathew O. <olajide.mathew@yuniq.solutions>",
   "license": "MIT",