@smartive/graphql-magic 23.4.0-next.9 → 23.4.1

package/src/resolvers/filters.ts

@@ -3,7 +3,7 @@ import { EntityModel, FullContext, getPermissionStack } from '..';
 import { ForbiddenError, UserInputError } from '../errors';
 import { OrderBy, Where, normalizeArguments } from './arguments';
 import { FieldResolverNode } from './node';
-import { Joins, QueryBuilderOps, addJoin, apply, applyJoins, getColumn, getColumnExpression, ors } from './utils';
+import { Joins, QueryBuilderOps, addJoin, apply, applyJoins, getColumn, ors } from './utils';
 
 export const SPECIAL_FILTERS: Record<string, string> = {
   GT: '?? > ?',
@@ -157,32 +157,19 @@ const applyWhere = (node: FilterNode, where: Where | undefined, ops: QueryBuilde
         // Should not happen
         throw new Error(`Invalid filter ${key}.`);
       }
-      const actualField = node.model.getField(actualKey);
-      const isExpressionField = actualField.generateAs?.type === 'expression';
-      const actualColumn = isExpressionField ? getColumnExpression(node, actualKey) : getColumn(node, actualKey);
-      if (isExpressionField) {
-        const operator = filter === 'GT' ? '>' : filter === 'GTE' ? '>=' : filter === 'LT' ? '<' : '<=';
-        ops.push((query) => query.whereRaw(`${actualColumn} ${operator} ?`, [value as string]));
-      } else {
-        ops.push((query) => query.whereRaw(SPECIAL_FILTERS[filter], [actualColumn, value as string]));
-      }
+      ops.push((query) => query.whereRaw(SPECIAL_FILTERS[filter], [getColumn(node, actualKey), value as string]));
       continue;
     }
 
     const field = node.model.getField(key);
 
-    const isExpressionField = field.generateAs?.type === 'expression';
-    const column = isExpressionField ? getColumnExpression(node, key) : getColumn(node, key);
+    const column = getColumn(node, key);
 
     if (field.kind === 'relation') {
       const relation = node.model.getRelation(field.name);
 
       if (value === null) {
-        if (isExpressionField) {
-          ops.push((query) => query.whereRaw(`${column} IS NULL`));
-        } else {
-          ops.push((query) => query.whereNull(column));
-        }
+        ops.push((query) => query.whereNull(column));
         continue;
       }
 
@@ -202,72 +189,35 @@ const applyWhere = (node: FilterNode, where: Where | undefined, ops: QueryBuilde
 
     if (Array.isArray(value)) {
       if (field && field.list) {
-        if (isExpressionField) {
-          ops.push((query) =>
-            ors(
-              query,
-              value.map((v) => (subQuery) => subQuery.whereRaw(`? = ANY(${column})`, [v])),
-            ),
-          );
-        } else {
-          ops.push((query) =>
-            ors(
-              query,
-              value.map((v) => (subQuery) => subQuery.whereRaw('? = ANY(??)', [v, column] as string[])),
-            ),
-          );
-        }
+        ops.push((query) =>
+          ors(
+            query,
+            value.map((v) => (subQuery) => subQuery.whereRaw('? = ANY(??)', [v, column] as string[])),
+          ),
+        );
         continue;
       }
 
       if (value.some((v) => v === null)) {
         if (value.some((v) => v !== null)) {
-          if (isExpressionField) {
-            ops.push((query) =>
-              ors(query, [
-                (subQuery) =>
-                  subQuery.whereRaw(
-                    `${column} IN (${value
-                      .filter((v) => v !== null)
-                      .map(() => `?`)
-                      .join(',')})`,
-                    value.filter((v) => v !== null) as string[],
-                  ),
-                (subQuery) => subQuery.whereRaw(`${column} IS NULL`),
-              ]),
-            );
-          } else {
-            ops.push((query) =>
-              ors(query, [
-                (subQuery) => subQuery.whereIn(column, value.filter((v) => v !== null) as string[]),
-                (subQuery) => subQuery.whereNull(column),
-              ]),
-            );
-          }
+          ops.push((query) =>
+            ors(query, [
+              (subQuery) => subQuery.whereIn(column, value.filter((v) => v !== null) as string[]),
+              (subQuery) => subQuery.whereNull(column),
+            ]),
+          );
           continue;
         }
 
-        if (isExpressionField) {
-          ops.push((query) => query.whereRaw(`${column} IS NULL`));
-        } else {
-          ops.push((query) => query.whereNull(column));
-        }
+        ops.push((query) => query.whereNull(column));
         continue;
       }
 
-      if (isExpressionField) {
-        ops.push((query) => query.whereRaw(`${column} IN (${value.map(() => `?`).join(',')})`, value as string[]));
-      } else {
-        ops.push((query) => query.whereIn(column, value as string[]));
-      }
+      ops.push((query) => query.whereIn(column, value as string[]));
       continue;
     }
 
-    if (isExpressionField) {
-      ops.push((query) => query.whereRaw(`${column} = ?`, [value]));
-    } else {
-      ops.push((query) => query.where({ [column]: value }));
-    }
+    ops.push((query) => query.where({ [column]: value }));
   }
 };
 
@@ -276,18 +226,11 @@ const applySearch = (node: FieldResolverNode, search: string, query: Knex.QueryB
     query,
     node.model.fields
       .filter(({ searchable }) => searchable)
-      .map((field) => {
-        const isExpressionField = field.generateAs?.type === 'expression';
-        const column = isExpressionField ? getColumnExpression(node, field.name) : getColumn(node, field.name);
-
-        return (query: Knex.QueryBuilder) => {
-          if (isExpressionField) {
-            return query.whereRaw(`${column}::text ILIKE ?`, [`%${search}%`]);
-          }
-
-          return query.whereRaw('??::text ILIKE ?', [column, `%${search}%`]);
-        };
-      }),
+      .map(
+        ({ name }) =>
+          (query) =>
+            query.whereRaw('??::text ILIKE ?', [getColumn(node, name), `%${search}%`]),
+      ),
   );
 
 const applyOrderBy = (node: FilterNode, orderBy: OrderBy | OrderBy[], query: Knex.QueryBuilder, joins: Joins) => {
@@ -318,12 +261,6 @@ const applyOrderBy = (node: FilterNode, orderBy: OrderBy | OrderBy[], query: Kne
     }
 
     // Simple field
-    const isExpressionField = field.generateAs?.type === 'expression';
-    const column = isExpressionField ? getColumnExpression(node, key) : getColumn(node, key);
-    if (isExpressionField) {
-      void query.orderByRaw(`${column} ${value}`);
-    } else {
-      void query.orderBy(column, value as 'ASC' | 'DESC');
-    }
+    void query.orderBy(getColumn(node, key), value as 'ASC' | 'DESC');
   }
 };

package/src/resolvers/selects.ts

@@ -13,7 +13,6 @@ import {
   isFieldNode,
 } from '.';
 import { PermissionError, UserInputError, getRole } from '..';
-import { getColumnExpression } from './utils';
 
 export const applySelects = (node: ResolverNode, query: Knex.QueryBuilder, joins: Joins) => {
   if (node.isAggregate) {
@@ -33,15 +32,7 @@ export const applySelects = (node: ResolverNode, query: Knex.QueryBuilder, joins
     ...[
       { tableAlias: node.rootTableAlias, resultAlias: node.resultAlias, field: 'id', fieldAlias: ID_ALIAS },
       ...(node.model.root
-        ? [
-            {
-              tableAlias: node.rootTableAlias,
-              resultAlias: node.resultAlias,
-              field: 'type',
-              fieldAlias: TYPE_ALIAS,
-              generateAs: undefined,
-            },
-          ]
+        ? [{ tableAlias: node.rootTableAlias, resultAlias: node.resultAlias, field: 'type', fieldAlias: TYPE_ALIAS }]
         : []),
       ...getSimpleFields(node)
         .filter((fieldNode) => {
@@ -78,20 +69,12 @@ export const applySelects = (node: ResolverNode, query: Knex.QueryBuilder, joins
             tableAlias: field.inherited ? node.rootTableAlias : node.tableAlias,
             resultAlias: node.resultAlias,
             fieldAlias,
-            generateAs: field.generateAs,
           };
         }),
-    ].map(({ tableAlias, resultAlias, field, fieldAlias, generateAs }) => {
-      if (generateAs?.type === 'expression') {
-        const resultShortAlias = node.ctx.aliases.getShort(resultAlias);
-        const columnExpression = getColumnExpression(node, field);
-        const expression = columnExpression.slice(1, -1);
-
-        return node.ctx.knex.raw(`(${expression}) as ??`, [`${resultShortAlias}__${fieldAlias}`]);
-      }
-
-      return `${node.ctx.aliases.getShort(tableAlias)}.${field} as ${node.ctx.aliases.getShort(resultAlias)}__${fieldAlias}`;
-    }),
+    ].map(
+      ({ tableAlias, resultAlias, field, fieldAlias }) =>
+        `${node.ctx.aliases.getShort(tableAlias)}.${field} as ${node.ctx.aliases.getShort(resultAlias)}__${fieldAlias}`,
+    ),
   );
 
   for (const subNode of getInlineFragments(node)) {

package/src/resolvers/utils.ts

@@ -218,50 +218,6 @@ export const getColumn = (
   return `${node.ctx.aliases.getShort(field.inherited ? node.rootTableAlias : node.tableAlias)}.${getColumnName(field)}`;
 };
 
-const replaceColumnReferences = (
-  expression: string,
-  node: Pick<ResolverNode, 'model' | 'ctx' | 'rootTableAlias' | 'tableAlias'>,
-) => {
-  const replaceField = (columnName: string) => {
-    const referencedField = node.model.fields.find((f) => getColumnName(f) === columnName);
-    if (referencedField) {
-      const actualColumnName = getColumnName(referencedField);
-      const referencedTableAlias = referencedField.inherited ? node.rootTableAlias : node.tableAlias;
-
-      return {
-        tableAlias: node.ctx.aliases.getShort(referencedTableAlias),
-        columnName: actualColumnName,
-      };
-    }
-
-    return null;
-  };
-
-  return expression.replace(/"(\w+)"/g, (match, columnName) => {
-    const replacement = replaceField(columnName);
-    if (replacement) {
-      return `"${replacement.tableAlias}"."${replacement.columnName}"`;
-    }
-
-    return match;
-  });
-};
-
-export const getColumnExpression = (
-  node: Pick<ResolverNode, 'model' | 'ctx' | 'rootTableAlias' | 'tableAlias'>,
-  fieldName: string,
-) => {
-  const field = node.model.fields.find((field) => field.name === fieldName)!;
-
-  if (field.generateAs?.type === 'expression') {
-    const expression = replaceColumnReferences(field.generateAs.expression, node);
-
-    return `(${expression})`;
-  }
-
-  return getColumn(node, fieldName);
-};
-
 export const getTechnicalDisplay = (model: EntityModel, entity: Entity) =>
   model.displayField && entity[model.displayField]
     ? `${model.name} "${entity[model.displayField]}" (${entity.id})`

package/dist/esm/migrations/generate-functions.d.ts

@@ -1,2 +0,0 @@
-import { Knex } from 'knex';
-export declare const generateFunctionsFromDatabase: (knex: Knex) => Promise<string>;

package/dist/esm/migrations/generate-functions.js

@@ -1,60 +0,0 @@
-export const generateFunctionsFromDatabase = async (knex) => {
-    const regularFunctions = await knex.raw(`
-    SELECT 
-      pg_get_functiondef(p.oid) as definition
-    FROM pg_proc p
-    JOIN pg_namespace n ON p.pronamespace = n.oid
-    WHERE n.nspname = 'public'
-    AND NOT EXISTS (SELECT 1 FROM pg_aggregate a WHERE a.aggfnoid = p.oid)
-    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
-  `);
-    const aggregateFunctions = await knex.raw(`
-    SELECT 
-      p.proname as name,
-      pg_get_function_identity_arguments(p.oid) as arguments,
-      a.aggtransfn::regproc::text as trans_func,
-      a.aggfinalfn::regproc::text as final_func,
-      a.agginitval as init_val,
-      pg_catalog.format_type(a.aggtranstype, NULL) as state_type
-    FROM pg_proc p
-    JOIN pg_aggregate a ON p.oid = a.aggfnoid
-    JOIN pg_namespace n ON p.pronamespace = n.oid
-    WHERE n.nspname = 'public'
-    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
-  `);
-    const functions = [];
-    for (const row of regularFunctions.rows || []) {
-        if (row.definition) {
-            functions.push(row.definition.trim());
-        }
-    }
-    for (const row of aggregateFunctions.rows || []) {
-        const name = row.name || '';
-        const argumentsStr = row.arguments || '';
-        const transFunc = row.trans_func || '';
-        const finalFunc = row.final_func || '';
-        const initVal = row.init_val;
-        const stateType = row.state_type || '';
-        if (!name || !transFunc || !stateType) {
-            continue;
-        }
-        let aggregateDef = `CREATE AGGREGATE ${name}(${argumentsStr}) (\n`;
-        aggregateDef += `  SFUNC = ${transFunc},\n`;
-        aggregateDef += `  STYPE = ${stateType}`;
-        if (finalFunc) {
-            aggregateDef += `,\n  FINALFUNC = ${finalFunc}`;
-        }
-        if (initVal !== null && initVal !== undefined) {
-            const initValStr = typeof initVal === 'string' ? `'${initVal}'` : String(initVal);
-            aggregateDef += `,\n  INITCOND = ${initValStr}`;
-        }
-        aggregateDef += '\n);';
-        functions.push(aggregateDef);
-    }
-    if (functions.length === 0) {
-        return `export const functions: string[] = [];\n`;
-    }
-    const functionsArrayString = functions.map((func) => `  ${JSON.stringify(func)}`).join(',\n');
-    return `export const functions: string[] = [\n${functionsArrayString},\n];\n`;
-};
-//# sourceMappingURL=generate-functions.js.map

package/dist/esm/migrations/generate-functions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generate-functions.js","sourceRoot":"","sources":["../../../src/migrations/generate-functions.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,EAAE,IAAU,EAAmB,EAAE;IACjF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC;;;;;;;;GAQvC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC;;;;;;;;;;;;;GAazC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,KAAK,MAAM,GAAG,IAAI,gBAAgB,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QAC9C,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACnB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,kBAAkB,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QAC5B,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC7B,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;QAEvC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;YACtC,SAAS;QACX,CAAC;QAED,IAAI,YAAY,GAAG,oBAAoB,IAAI,IAAI,YAAY,OAAO,CAAC;QACnE,YAAY,IAAI,aAAa,SAAS,KAAK,CAAC;QAC5C,YAAY,IAAI,aAAa,SAAS,EAAE,CAAC;QAEzC,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,IAAI,oBAAoB,SAAS,EAAE,CAAC;QAClD,CAAC;QAED,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9C,MAAM,UAAU,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAClF,YAAY,IAAI,mBAAmB,UAAU,EAAE,CAAC;QAClD,CAAC;QAED,YAAY,IAAI,MAAM,CAAC;QAEvB,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,0CAA0C,CAAC;IACpD,CAAC;IAED,MAAM,oBAAoB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAE9F,OAAO,yCAAyC,oBAAoB,SAAS,CAAC;AAChF,CAAC,CAAC"}

package/dist/esm/migrations/types.d.ts

@@ -1,7 +0,0 @@
-export type ParsedFunction = {
-    name: string;
-    signature: string;
-    body: string;
-    fullDefinition: string;
-    isAggregate: boolean;
-};

package/dist/esm/migrations/types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=types.js.map

package/dist/esm/migrations/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/migrations/types.ts"],"names":[],"mappings":""}

package/dist/esm/migrations/update-functions.d.ts

@@ -1,3 +0,0 @@
-import { Knex } from 'knex';
-import { ParsedFunction } from './types';
-export declare const updateFunctions: (knex: Knex, parsedFunctions: ParsedFunction[]) => Promise<void>;

package/dist/esm/migrations/update-functions.js

@@ -1,177 +0,0 @@
-const normalizeWhitespace = (str) => {
-    return str
-        .replace(/\s+/g, ' ')
-        .replace(/\s*\(\s*/g, '(')
-        .replace(/\s*\)\s*/g, ')')
-        .replace(/\s*,\s*/g, ',')
-        .replace(/\s*;\s*/g, ';')
-        .trim();
-};
-const normalizeFunctionBody = (body) => {
-    return normalizeWhitespace(body);
-};
-const extractFunctionBody = (definition) => {
-    const dollarQuoteMatch = definition.match(/AS\s+\$([^$]*)\$([\s\S]*?)\$\1\$/i);
-    if (dollarQuoteMatch) {
-        return dollarQuoteMatch[2].trim();
-    }
-    const bodyMatch = definition.match(/AS\s+\$\$([\s\S]*?)\$\$/i) || definition.match(/AS\s+['"]([\s\S]*?)['"]/i);
-    if (bodyMatch) {
-        return bodyMatch[1].trim();
-    }
-    return definition;
-};
-const getDatabaseFunctions = async (knex) => {
-    const regularFunctions = await knex.raw(`
-    SELECT 
-      p.proname as name,
-      pg_get_function_identity_arguments(p.oid) as arguments,
-      pg_get_functiondef(p.oid) as definition,
-      false as is_aggregate
-    FROM pg_proc p
-    JOIN pg_namespace n ON p.pronamespace = n.oid
-    WHERE n.nspname = 'public'
-    AND NOT EXISTS (SELECT 1 FROM pg_aggregate a WHERE a.aggfnoid = p.oid)
-    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
-  `);
-    const aggregateFunctions = await knex.raw(`
-    SELECT 
-      p.proname as name,
-      pg_get_function_identity_arguments(p.oid) as arguments,
-      a.aggtransfn::regproc::text as trans_func,
-      a.aggfinalfn::regproc::text as final_func,
-      a.agginitval as init_val,
-      pg_catalog.format_type(a.aggtranstype, NULL) as state_type,
-      true as is_aggregate
-    FROM pg_proc p
-    JOIN pg_aggregate a ON p.oid = a.aggfnoid
-    JOIN pg_namespace n ON p.pronamespace = n.oid
-    WHERE n.nspname = 'public'
-    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
-  `);
-    const result = [];
-    for (const row of regularFunctions.rows || []) {
-        const definition = row.definition || '';
-        const name = row.name || '';
-        const argumentsStr = row.arguments || '';
-        if (!definition) {
-            continue;
-        }
-        const signature = `${name}(${argumentsStr})`;
-        const body = normalizeFunctionBody(extractFunctionBody(definition));
-        result.push({
-            name,
-            signature,
-            body,
-            isAggregate: false,
-            definition,
-        });
-    }
-    for (const row of aggregateFunctions.rows || []) {
-        const name = row.name || '';
-        const argumentsStr = row.arguments || '';
-        const transFunc = row.trans_func || '';
-        const finalFunc = row.final_func || '';
-        const initVal = row.init_val;
-        const stateType = row.state_type || '';
-        const signature = `${name}(${argumentsStr})`;
-        let aggregateDef = `CREATE AGGREGATE ${name}(${argumentsStr}) (`;
-        aggregateDef += `SFUNC = ${transFunc}, STYPE = ${stateType}`;
-        if (finalFunc) {
-            aggregateDef += `, FINALFUNC = ${finalFunc}`;
-        }
-        if (initVal !== null && initVal !== undefined) {
-            const initValStr = typeof initVal === 'string' ? `'${initVal}'` : String(initVal);
-            aggregateDef += `, INITCOND = ${initValStr}`;
-        }
-        aggregateDef += ');';
-        result.push({
-            name,
-            signature,
-            body: normalizeFunctionBody(aggregateDef),
-            isAggregate: true,
-            definition: aggregateDef,
-        });
-    }
-    return result;
-};
-const compareFunctions = (defined, db) => {
-    const definedBody = normalizeFunctionBody(defined.body);
-    const dbBody = normalizeFunctionBody(db.body);
-    if (definedBody !== dbBody) {
-        const definedPreview = definedBody.length > 200 ? `${definedBody.substring(0, 200)}...` : definedBody;
-        const dbPreview = dbBody.length > 200 ? `${dbBody.substring(0, 200)}...` : dbBody;
-        return {
-            changed: true,
-            diff: `Definition changed:\n  File: ${definedPreview}\n  DB:   ${dbPreview}`,
-        };
-    }
-    return { changed: false };
-};
-export const updateFunctions = async (knex, parsedFunctions) => {
-    if (parsedFunctions.length === 0) {
-        return;
-    }
-    const definedFunctions = parsedFunctions;
-    const dbFunctions = await getDatabaseFunctions(knex);
-    const dbFunctionsBySignature = new Map();
-    for (const func of dbFunctions) {
-        dbFunctionsBySignature.set(func.signature, func);
-    }
-    console.info(`Found ${definedFunctions.length} function(s) in file, ${dbFunctions.length} function(s) in database.`);
-    let updatedCount = 0;
-    let skippedCount = 0;
-    for (const definedFunc of definedFunctions) {
-        const dbFunc = dbFunctionsBySignature.get(definedFunc.signature);
-        if (!dbFunc) {
-            try {
-                await knex.raw(definedFunc.fullDefinition);
-                console.info(`✓ Created ${definedFunc.isAggregate ? 'aggregate' : 'function'}: ${definedFunc.signature}`);
-                updatedCount++;
-            }
-            catch (error) {
-                console.error(`✗ Failed to create ${definedFunc.isAggregate ? 'aggregate' : 'function'} ${definedFunc.signature}:`, error.message);
-                throw error;
-            }
-        }
-        else {
-            const comparison = compareFunctions(definedFunc, dbFunc);
-            if (comparison.changed) {
-                console.info(`\n⚠ ${definedFunc.isAggregate ? 'Aggregate' : 'Function'} ${definedFunc.signature} has changes:`);
-                if (comparison.diff) {
-                    console.info(comparison.diff);
-                }
-                try {
-                    if (definedFunc.isAggregate) {
-                        const dropMatch = definedFunc.fullDefinition.match(/CREATE\s+(OR\s+REPLACE\s+)?AGGREGATE\s+([^(]+)\(/i);
-                        if (dropMatch) {
-                            const functionName = dropMatch[2].trim();
-                            const argsMatch = definedFunc.fullDefinition.match(/CREATE\s+(OR\s+REPLACE\s+)?AGGREGATE\s+[^(]+\(([^)]*)\)/i);
-                            const args = argsMatch ? argsMatch[2].trim() : '';
-                            await knex.raw(`DROP AGGREGATE IF EXISTS ${functionName}${args ? `(${args})` : ''}`);
-                        }
-                    }
-                    await knex.raw(definedFunc.fullDefinition);
-                    console.info(`✓ Updated ${definedFunc.isAggregate ? 'aggregate' : 'function'}: ${definedFunc.signature}\n`);
-                    updatedCount++;
-                }
-                catch (error) {
-                    console.error(`✗ Failed to update ${definedFunc.isAggregate ? 'aggregate' : 'function'} ${definedFunc.signature}:`, error.message);
-                    throw error;
-                }
-            }
-            else {
-                console.info(`○ Skipped ${definedFunc.isAggregate ? 'aggregate' : 'function'} (unchanged): ${definedFunc.signature}`);
-                skippedCount++;
-            }
-        }
-    }
-    console.info(`\nSummary: ${updatedCount} updated, ${skippedCount} skipped`);
-    if (updatedCount > 0) {
-        console.info('Functions updated successfully.');
-    }
-    else {
-        console.info('All functions are up to date.');
-    }
-};
-//# sourceMappingURL=update-functions.js.map

package/dist/esm/migrations/update-functions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-functions.js","sourceRoot":"","sources":["../../../src/migrations/update-functions.ts"],"names":[],"mappings":"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"}