dzql 0.4.1 → 0.4.2

package/package.json

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

package/src/server/db.js

@@ -173,50 +173,14 @@ export async function setupListeners(callback) {
   }
 }
 
-// Cache for mode detection (null = not checked, true = compiled, false = runtime)
-let isCompiledMode = null;
-
-// Auto-detect if we're in compiled or runtime mode
-async function detectMode() {
-  if (isCompiledMode !== null) {
-    return isCompiledMode;
-  }
-
-  try {
-    // Check if dzql.generic_exec exists
-    const result = await sql`
-      SELECT 1 FROM pg_proc
-      WHERE proname = 'generic_exec'
-      AND pronamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'dzql')
-      LIMIT 1
-    `;
-    isCompiledMode = result.length === 0; // If no results, it's compiled mode
-    dbLogger.trace(isCompiledMode ? 'Detected compiled mode' : 'Detected runtime mode');
-  } catch (error) {
-    // If there's an error checking, assume runtime mode
-    isCompiledMode = false;
-    dbLogger.trace('Error detecting mode, assuming runtime mode');
-  }
-
-  return isCompiledMode;
-}
-
-// DZQL Generic Operations
+// DZQL Generic Operations - Try compiled functions first, fall back to generic_exec
 export async function callDZQLOperation(operation, entity, args, userId) {
   dbLogger.trace(`DZQL ${operation}.${entity} for user ${userId}`);
 
-  const compiled = await detectMode();
-
-  if (!compiled) {
-    // Runtime mode - use generic_exec
-    const result = await sql`
-      SELECT dzql.generic_exec(${operation}, ${entity}, ${args}, ${userId}) as result
-    `;
-    return result[0].result;
-  } else {
-    // Compiled mode - call compiled function directly
-    const compiledFunctionName = `${operation}_${entity}`;
+  const compiledFunctionName = `${operation}_${entity}`;
 
+  try {
+    // Try compiled function first
     // Different operations have different signatures:
     // - search: search_entity(p_user_id, p_filters, p_search, p_sort, p_page, p_limit)
     // - get: get_entity(p_user_id, p_id, p_on_date)
@@ -259,6 +223,17 @@ export async function callDZQLOperation(operation, entity, args, userId) {
     } else {
       throw new Error(`Unknown operation: ${operation}`);
     }
+  } catch (error) {
+    // If compiled function doesn't exist, fall back to generic_exec
+    if (error.message?.includes('does not exist') || error.code === '42883') {
+      dbLogger.trace(`Compiled function ${compiledFunctionName} not found, trying generic_exec`);
+      const result = await sql`
+        SELECT dzql.generic_exec(${operation}, ${entity}, ${args}, ${userId}) as result
+      `;
+      return result[0].result;
+    }
+    // Re-throw other errors
+    throw error;
   }
 }
 

package/src/server/namespace.js

@@ -9,9 +9,10 @@ import { sql, db } from "./db.js";
 const DEFAULT_USER_ID = 1;
 
 /**
- * Discover available entities from dzql.entities table
+ * Discover available entities from dzql.entities table or compiled functions
  */
 async function discoverEntities() {
+  // First try dzql.entities table (runtime mode)
   const result = await sql`
     SELECT table_name, label_field, searchable_fields
     FROM dzql.entities
@@ -19,13 +20,36 @@ async function discoverEntities() {
   `;
 
   const entities = {};
-  for (const row of result) {
-    const searchFields = row.searchable_fields?.join(", ") || "none";
-    entities[row.table_name] = {
-      label: row.label_field,
-      searchable: row.searchable_fields || [],
-      description: `Entity: ${row.table_name} (label: ${row.label_field}, searchable: ${searchFields})`,
-    };
+
+  if (result.length > 0) {
+    // Runtime mode - use dzql.entities table
+    for (const row of result) {
+      const searchFields = row.searchable_fields?.join(", ") || "none";
+      entities[row.table_name] = {
+        label: row.label_field,
+        searchable: row.searchable_fields || [],
+        description: `Entity: ${row.table_name} (label: ${row.label_field}, searchable: ${searchFields})`,
+      };
+    }
+  } else {
+    // Compiled mode - discover from function names
+    const functions = await sql`
+      SELECT DISTINCT substring(proname from 'search_(.+)') as entity_name
+      FROM pg_proc
+      WHERE pronamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'public')
+      AND proname LIKE 'search_%'
+      AND substring(proname from 'search_(.+)') IS NOT NULL
+      ORDER BY entity_name
+    `;
+
+    for (const row of functions) {
+      const entityName = row.entity_name;
+      entities[entityName] = {
+        label: 'id',  // Default, since we can't know from functions alone
+        searchable: [],
+        description: `Entity: ${entityName} (compiled mode)`,
+      };
+    }
   }
 
   return entities;