dzql 0.5.7 → 0.5.9

package/bin/cli.js

@@ -404,13 +404,12 @@ async function runMigrateNew(args) {
   }
 
   // Generate migration template
+  // Note: No BEGIN/COMMIT - postgres.js handles transactions automatically
   const template = `-- ============================================================================
 -- Migration ${paddedNumber}: ${migrationName.replace(/_/g, ' ')}
 -- Generated: ${new Date().toISOString().split('T')[0]}
 -- ============================================================================
 
-BEGIN;
-
 -- Part 1: Schema Changes
 -- ALTER TABLE example ADD COLUMN IF NOT EXISTS new_field TEXT;
 
@@ -440,8 +439,6 @@ BEGIN;
 --   ('my_custom_function'::regproc, 'Description of function')
 -- ON CONFLICT DO NOTHING;
 
-COMMIT;
-
 -- ============================================================================
 -- Rollback (for migrate:down support)
 -- ============================================================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dzql",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "PostgreSQL-powered framework with zero boilerplate CRUD operations and real-time WebSocket synchronization",
   "type": "module",
   "main": "src/server/index.js",

package/src/compiler/codegen/subscribable-codegen.js

@@ -167,12 +167,9 @@ $$ LANGUAGE plpgsql STABLE SECURITY DEFINER;`;
         return 'FALSE';
       }
 
-      const startField = fieldRef.field;
       const targetTable = tableRef.table;
       const targetField = tableRef.targetField;
 
-      const startValue = `(${recordVar}->>'${startField}')::int`;
-
       // Build WHERE clause
       const whereClauses = [];
 
@@ -181,8 +178,10 @@ $$ LANGUAGE plpgsql STABLE SECURITY DEFINER;`;
         for (const filterCondition of tableRef.filter) {
           const field = filterCondition.field;
           if (filterCondition.value.type === 'param') {
-            // Parameter reference: org_id=$
-            whereClauses.push(`${targetTable}.${field} = ${startValue}`);
+            // Parameter reference: org_id=$ means use the filter field name as the param key
+            // e.g., acts_for[organisation_id=$] -> (p_params->>'organisation_id')::int
+            const paramValue = `(${recordVar}->>'${field}')::int`;
+            whereClauses.push(`${targetTable}.${field} = ${paramValue}`);
           } else {
             // Literal value
             whereClauses.push(`${targetTable}.${field} = '${filterCondition.value}'`);
@@ -239,13 +238,20 @@ $$ LANGUAGE plpgsql STABLE SECURITY DEFINER;`;
     // Build relation subqueries
     const relationSelects = this._generateRelationSelects();
 
+    // Build schema with path mapping (baked in at compile time)
+    const pathMapping = this.buildPathMapping();
+    const schemaJson = JSON.stringify({
+      root: this.rootEntity,
+      paths: pathMapping
+    });
+
     return `CREATE OR REPLACE FUNCTION get_${this.name}(
   p_params JSONB,
   p_user_id INT
 ) RETURNS JSONB AS $$
 DECLARE
 ${paramDeclarations}
-  v_result JSONB;
+  v_data JSONB;
 BEGIN
   -- Extract parameters
 ${paramExtractions}
@@ -259,11 +265,15 @@ ${paramExtractions}
   SELECT jsonb_build_object(
     '${this.rootEntity}', row_to_json(root.*)${relationSelects}
   )
-  INTO v_result
+  INTO v_data
   FROM ${this.rootEntity} root
   WHERE ${rootFilter};
 
-  RETURN v_result;
+  -- Return data with embedded schema for atomic updates
+  RETURN jsonb_build_object(
+    'data', v_data,
+    'schema', '${schemaJson}'::jsonb
+  );
 END;
 $$ LANGUAGE plpgsql SECURITY DEFINER;`;
   }
@@ -301,7 +311,7 @@ $$ LANGUAGE plpgsql SECURITY DEFINER;`;
       const relIncludes = typeof relConfig === 'object' ? relConfig.include : null;
 
       // Build filter condition
-      let filterSQL = this._generateRelationFilter(relFilter, relEntity);
+      let filterSQL = this._generateRelationFilter(relFilter, relEntity, relConfig);
 
       // Build nested includes if any
       let nestedSelect = 'row_to_json(rel.*)';
@@ -334,11 +344,17 @@ $$ LANGUAGE plpgsql SECURITY DEFINER;`;
   /**
    * Generate filter for relation subquery
    * @private
+   * @param {string|null} filter - Optional filter expression
+   * @param {string} relEntity - Related entity table name
+   * @param {Object} relConfig - Full relation config (may contain foreignKey)
    */
-  _generateRelationFilter(filter, relEntity) {
+  _generateRelationFilter(filter, relEntity, relConfig) {
     if (!filter) {
-      // Default: foreign key to root
-      return `rel.${this.rootEntity}_id = root.id`;
+      // Use explicit foreignKey from config, or default to root_id
+      const fk = (typeof relConfig === 'object' && relConfig.foreignKey)
+        ? relConfig.foreignKey
+        : `${this.rootEntity}_id`;
+      return `rel.${fk} = root.id`;
     }
 
     // Parse filter expression like "venue_id=$venue_id"

package/src/server/ws.js

@@ -322,14 +322,28 @@ export function createRPCHandler(customHandlers = {}) {
         try {
           // Execute initial query (this also checks permissions)
           const queryResult = await sql.unsafe(
-            `SELECT get_${subscribableName}($1, $2) as data`,
+            `SELECT get_${subscribableName}($1, $2) as result`,
             [params, ws.data.user_id]
           );
 
-          const data = queryResult[0]?.data;
-
-          // Get subscribable metadata for schema (path mapping for atomic updates)
-          const metadata = await getSubscribableMetadata(subscribableName, sql);
+          const queryData = queryResult[0]?.result;
+
+          // Check if compiled function returned embedded schema
+          // Compiled: { data, schema } | Interpreted: just the data object
+          let data, schema;
+          if (queryData && queryData.schema && queryData.data !== undefined) {
+            // Compiled mode - schema is embedded
+            data = queryData.data;
+            schema = queryData.schema;
+          } else {
+            // Interpreted mode - fetch schema from metadata table
+            data = queryData;
+            const metadata = await getSubscribableMetadata(subscribableName, sql);
+            schema = {
+              root: metadata.rootEntity,
+              paths: metadata.pathMapping
+            };
+          }
 
           // Register subscription in memory
           const subscriptionId = registerSubscription(
@@ -343,11 +357,7 @@ export function createRPCHandler(customHandlers = {}) {
           const result = {
             subscription_id: subscriptionId,
             data,
-            // Include schema for atomic update support
-            schema: {
-              root: metadata.rootEntity,
-              paths: metadata.pathMapping
-            }
+            schema
           };
 
           wsLogger.response(method, result, Date.now() - startTime);