linkgress-orm 0.0.1 → 0.0.3

package/dist/query/strategies/jsonb-collection-strategy.js

@@ -110,20 +110,20 @@ class JsonbCollectionStrategy {
         const distinctClause = isDistinct ? 'DISTINCT ' : '';
         // Build the jsonb_agg ORDER BY clause
         const jsonbAggOrderBy = orderByClause ? ` ORDER BY ${orderByClause}` : '';
-        const cteSQL = `
-SELECT
-  "__fk_${foreignKey}" as parent_id,
-  jsonb_agg(
-    jsonb_build_object(${jsonbFields})${jsonbAggOrderBy}
-  ) as data
-FROM (
-  SELECT ${distinctClause}${allSelectFields.join(', ')}
-  FROM "${targetTable}"
-  ${whereSQL}
-  ${orderBySQL}
-  ${limitOffsetClause}
-) sub
-GROUP BY "__fk_${foreignKey}"
+        const cteSQL = `
+SELECT
+  "__fk_${foreignKey}" as parent_id,
+  jsonb_agg(
+    jsonb_build_object(${jsonbFields})${jsonbAggOrderBy}
+  ) as data
+FROM (
+  SELECT ${distinctClause}${allSelectFields.join(', ')}
+  FROM "${targetTable}"
+  ${whereSQL}
+  ${orderBySQL}
+  ${limitOffsetClause}
+) sub
+GROUP BY "__fk_${foreignKey}"
     `.trim();
         return cteSQL;
     }
@@ -151,23 +151,23 @@ GROUP BY "__fk_${foreignKey}"
         const distinctClause = isDistinct ? 'DISTINCT ' : '';
         // Build the array_agg ORDER BY clause
         const arrayAggOrderBy = orderByClause ? ` ORDER BY ${orderByClause}` : '';
-        const cteSQL = `
-SELECT
-  "__fk_${foreignKey}" as parent_id,
-  array_agg(
-    "${arrayField}"${arrayAggOrderBy}
-  ) as data
-FROM (
-  SELECT ${distinctClause}"__fk_${foreignKey}", "${arrayField}"
-  FROM (
-    SELECT "${foreignKey}" as "__fk_${foreignKey}", "${arrayField}"
-    FROM "${targetTable}"
-    ${whereSQL}
-    ${orderBySQL}
-    ${limitOffsetClause}
-  ) inner_sub
-) sub
-GROUP BY "__fk_${foreignKey}"
+        const cteSQL = `
+SELECT
+  "__fk_${foreignKey}" as parent_id,
+  array_agg(
+    "${arrayField}"${arrayAggOrderBy}
+  ) as data
+FROM (
+  SELECT ${distinctClause}"__fk_${foreignKey}", "${arrayField}"
+  FROM (
+    SELECT "${foreignKey}" as "__fk_${foreignKey}", "${arrayField}"
+    FROM "${targetTable}"
+    ${whereSQL}
+    ${orderBySQL}
+    ${limitOffsetClause}
+  ) inner_sub
+) sub
+GROUP BY "__fk_${foreignKey}"
     `.trim();
         return cteSQL;
     }
@@ -195,13 +195,13 @@ GROUP BY "__fk_${foreignKey}"
             default:
                 throw new Error(`Unknown aggregation type: ${aggregationType}`);
         }
-        const cteSQL = `
-SELECT
-  "${foreignKey}" as parent_id,
-  ${aggregateExpression} as data
-FROM "${targetTable}"
-${whereSQL}
-GROUP BY "${foreignKey}"
+        const cteSQL = `
+SELECT
+  "${foreignKey}" as parent_id,
+  ${aggregateExpression} as data
+FROM "${targetTable}"
+${whereSQL}
+GROUP BY "${foreignKey}"
     `.trim();
         return cteSQL;
     }

package/dist/query/strategies/temptable-collection-strategy.js

@@ -74,20 +74,20 @@ class TempTableCollectionStrategy {
         // Determine if we're doing client-side grouping (JSONB/array) or server-side (scalar)
         const isClientSideGrouping = config.aggregationType === 'jsonb' || config.aggregationType === 'array';
         // Combine everything into a single multi-statement query
-        const multiStatementSQL = `
--- Create temporary table for parent IDs
-CREATE TEMP TABLE ${tempTableName} (
-  id integer PRIMARY KEY
-) ON COMMIT DROP;
-
--- Insert parent IDs
-INSERT INTO ${tempTableName} VALUES ${valuePlaceholders};
-
--- Query and return the data
-${aggregationSQL};
-
--- Cleanup
-DROP TABLE IF EXISTS ${tempTableName};
+        const multiStatementSQL = `
+-- Create temporary table for parent IDs
+CREATE TEMP TABLE ${tempTableName} (
+  id integer PRIMARY KEY
+) ON COMMIT DROP;
+
+-- Insert parent IDs
+INSERT INTO ${tempTableName} VALUES ${valuePlaceholders};
+
+-- Query and return the data
+${aggregationSQL};
+
+-- Cleanup
+DROP TABLE IF EXISTS ${tempTableName};
     `.trim();
         // Execute multi-statement query using querySimple (no parameters)
         const executor = context.executor || client;
@@ -158,10 +158,10 @@ DROP TABLE IF EXISTS ${tempTableName};
     async buildAggregationLegacy(config, context, client) {
         const tempTableName = `tmp_parent_ids_${config.counter}`;
         // Create temp table (without ON COMMIT DROP to persist across queries in the same session)
-        const createTableSQL = `
-CREATE TEMP TABLE IF NOT EXISTS ${tempTableName} (
-  id integer PRIMARY KEY
-)
+        const createTableSQL = `
+CREATE TEMP TABLE IF NOT EXISTS ${tempTableName} (
+  id integer PRIMARY KEY
+)
     `.trim();
         // Use executor from context if available for query logging
         if (context.executor) {
@@ -186,9 +186,9 @@ CREATE TEMP TABLE IF NOT EXISTS ${tempTableName} (
         const selectExpression = `"${tempTableName}_agg".data`;
         // Execute aggregation query and store results in another temp table
         const aggTempTableName = `${tempTableName}_agg`;
-        const createAggTableSQL = `
-CREATE TEMP TABLE ${aggTempTableName} AS
-${aggregationSQL}
+        const createAggTableSQL = `
+CREATE TEMP TABLE ${aggTempTableName} AS
+${aggregationSQL}
     `.trim();
         // Use executor from context if available for query logging
         if (context.executor) {
@@ -287,14 +287,14 @@ ${aggregationSQL}
             limitOffsetClause += ` OFFSET ${offsetValue}`;
         }
         // Simple SELECT with foreign key for grouping
-        const sql = `
-SELECT
-  "${foreignKey}" as parent_id,
-  ${selectFields}
-FROM "${targetTable}"
-WHERE "${foreignKey}" IN (SELECT id FROM ${tempTableName})${additionalWhere}
-${orderBySQL}
-${limitOffsetClause}
+        const sql = `
+SELECT
+  "${foreignKey}" as parent_id,
+  ${selectFields}
+FROM "${targetTable}"
+WHERE "${foreignKey}" IN (SELECT id FROM ${tempTableName})${additionalWhere}
+${orderBySQL}
+${limitOffsetClause}
     `.trim();
         return sql;
     }
@@ -361,20 +361,20 @@ ${limitOffsetClause}
         // Build jsonb_agg ORDER BY clause
         const jsonbAggOrderBy = orderByClause ? ` ORDER BY ${orderByClause}` : '';
         // Build the SQL - matching JSONB strategy approach
-        const sql = `
-SELECT
-  t."${foreignKey}" as parent_id,
-  jsonb_agg(
-    jsonb_build_object(${jsonbFields})${jsonbAggOrderBy}
-  ) as data
-FROM (
-  SELECT *
-  FROM "${targetTable}"
-  WHERE "${foreignKey}" IN (SELECT id FROM ${tempTableName})${additionalWhere}
-  ${orderBySQL}
-  ${limitOffsetClause}
-) t
-GROUP BY t."${foreignKey}"
+        const sql = `
+SELECT
+  t."${foreignKey}" as parent_id,
+  jsonb_agg(
+    jsonb_build_object(${jsonbFields})${jsonbAggOrderBy}
+  ) as data
+FROM (
+  SELECT *
+  FROM "${targetTable}"
+  WHERE "${foreignKey}" IN (SELECT id FROM ${tempTableName})${additionalWhere}
+  ${orderBySQL}
+  ${limitOffsetClause}
+) t
+GROUP BY t."${foreignKey}"
     `.trim();
         return sql;
     }
@@ -401,18 +401,18 @@ GROUP BY t."${foreignKey}"
         // Build array_agg ORDER BY clause
         const arrayAggOrderBy = orderByClause ? ` ORDER BY ${orderByClause}` : '';
         // Build the SQL - matching JSONB strategy approach
-        const sql = `
-SELECT
-  t."${foreignKey}" as parent_id,
-  array_agg(t."${arrayField}"${arrayAggOrderBy}) as data
-FROM (
-  SELECT "${foreignKey}", "${arrayField}"
-  FROM "${targetTable}"
-  WHERE "${foreignKey}" IN (SELECT id FROM ${tempTableName})${additionalWhere}
-  ${orderBySQL}
-  ${limitOffsetClause}
-) t
-GROUP BY t."${foreignKey}"
+        const sql = `
+SELECT
+  t."${foreignKey}" as parent_id,
+  array_agg(t."${arrayField}"${arrayAggOrderBy}) as data
+FROM (
+  SELECT "${foreignKey}", "${arrayField}"
+  FROM "${targetTable}"
+  WHERE "${foreignKey}" IN (SELECT id FROM ${tempTableName})${additionalWhere}
+  ${orderBySQL}
+  ${limitOffsetClause}
+) t
+GROUP BY t."${foreignKey}"
     `.trim();
         return sql;
     }
@@ -441,13 +441,13 @@ GROUP BY t."${foreignKey}"
             default:
                 throw new Error(`Unknown aggregation type: ${aggregationType}`);
         }
-        const sql = `
-SELECT
-  tmp.id as parent_id,
-  COALESCE(${aggregateExpression}, ${config.defaultValue}) as data
-FROM ${tempTableName} tmp
-LEFT JOIN "${targetTable}" t ON t."${foreignKey}" = tmp.id${additionalWhere}
-GROUP BY tmp.id
+        const sql = `
+SELECT
+  tmp.id as parent_id,
+  COALESCE(${aggregateExpression}, ${config.defaultValue}) as data
+FROM ${tempTableName} tmp
+LEFT JOIN "${targetTable}" t ON t."${foreignKey}" = tmp.id${additionalWhere}
+GROUP BY tmp.id
     `.trim();
         return sql;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkgress-orm",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "A lightweight, type-safe ORM for PostgreSQL with LINQ-style queries and automatic type inference",
   "main": "dist/index.js",
   "module": "dist/index.js",