@gscdump/engine 0.25.3 → 0.25.4

package/dist/_chunks/resolver.mjs

@@ -449,10 +449,10 @@ function createIcebergResolverAdapter() {
 	});
 }
 const COMPARISON_FILTER_SQL = {
-	new: sql`AND (p.impressions IS NULL OR p.impressions = 0)`,
-	lost: sql`AND p.impressions > 0 AND c.impressions = 0`,
-	improving: sql`AND c.clicks > COALESCE(p.clicks, 0)`,
-	declining: sql`AND c.clicks < p.clicks AND p.clicks > 0`
+	new: sql`AND COALESCE(p.impressions, 0) = 0 AND COALESCE(c.impressions, 0) > 0`,
+	lost: sql`AND COALESCE(p.impressions, 0) > 0 AND COALESCE(c.impressions, 0) = 0`,
+	improving: sql`AND COALESCE(c.clicks, 0) > COALESCE(p.clicks, 0)`,
+	declining: sql`AND COALESCE(c.clicks, 0) < COALESCE(p.clicks, 0) AND COALESCE(p.clicks, 0) > 0`
 };
 function collapseWs(s) {
 	return s.replace(/\s+/g, " ").trim();
@@ -686,21 +686,21 @@ function resolveComparisonSQL(current, previous, options, comparisonFilter) {
 	if (groupByExprs.length > 0) previousCte = sql`${previousCte} GROUP BY ${joinComma(groupByExprs)}`;
 	const joinOn = groupByDims.length > 0 ? sql.raw(groupByDims.map((d) => `c.${d.replace(/\W/g, "")} = p.${d.replace(/\W/g, "")}`).join(" AND ")) : sql.raw("1=1");
 	const filterClause = comparisonFilter ? COMPARISON_FILTER_SQL[comparisonFilter] : sql.raw("");
-	const orderSql = orderByClause(current, "c.");
+	const orderSql = orderByClause(current, "");
 	const limitSql = limitOffsetClause(current);
 	const outerCurrentCols = [];
 	for (const d of groupByDims) {
 		const colName = d.replace(/\W/g, "");
-		outerCurrentCols.push(sql.raw(`c.${colName} as "${colName}"`));
+		outerCurrentCols.push(sql.raw(`COALESCE(c.${colName}, p.${colName}) as "${colName}"`));
 	}
-	outerCurrentCols.push(sql.raw("CAST(c.clicks AS DOUBLE) as \"clicks\""));
-	outerCurrentCols.push(sql.raw("CAST(c.impressions AS DOUBLE) as \"impressions\""));
-	outerCurrentCols.push(sql.raw("c.ctr as \"ctr\""));
-	outerCurrentCols.push(sql.raw("c.position as \"position\""));
-	const mainQuery = sql`WITH current AS (${currentCte}), previous AS (${previousCte}) SELECT ${joinComma(outerCurrentCols)}, COALESCE(CAST(p.clicks AS DOUBLE), 0) as "prevClicks", COALESCE(CAST(p.impressions AS DOUBLE), 0) as "prevImpressions", COALESCE(p.ctr, 0) as "prevCtr", COALESCE(p.position, 0) as "prevPosition" FROM current c LEFT JOIN previous p ON ${joinOn} WHERE 1=1 ${filterClause} ${orderSql} ${limitSql}`;
+	outerCurrentCols.push(sql.raw("CAST(COALESCE(c.clicks, 0) AS DOUBLE) as \"clicks\""));
+	outerCurrentCols.push(sql.raw("CAST(COALESCE(c.impressions, 0) AS DOUBLE) as \"impressions\""));
+	outerCurrentCols.push(sql.raw("COALESCE(c.ctr, 0) as \"ctr\""));
+	outerCurrentCols.push(sql.raw("COALESCE(c.position, 0) as \"position\""));
+	const mainQuery = sql`WITH current AS (${currentCte}), previous AS (${previousCte}) SELECT ${joinComma(outerCurrentCols)}, COALESCE(CAST(p.clicks AS DOUBLE), 0) as "prevClicks", COALESCE(CAST(p.impressions AS DOUBLE), 0) as "prevImpressions", COALESCE(p.ctr, 0) as "prevCtr", COALESCE(p.position, 0) as "prevPosition" FROM current c FULL OUTER JOIN previous p ON ${joinOn} WHERE 1=1 ${filterClause} ${orderSql} ${limitSql}`;
 	const firstGroupBy = groupByDims[0] ? groupByDims[0].replace(/\W/g, "") : "clicks";
-	const countInnerSelect = sql.raw(`c.${firstGroupBy}`);
-	const countQuery = sql`WITH current AS (${currentCte}), previous AS (${previousCte}) SELECT COUNT(*) as total FROM (SELECT ${countInnerSelect} FROM current c LEFT JOIN previous p ON ${joinOn} WHERE 1=1 ${filterClause})`;
+	const countInnerSelect = groupByDims[0] ? sql.raw(`COALESCE(c.${firstGroupBy}, p.${firstGroupBy})`) : sql.raw(`c.${firstGroupBy}`);
+	const countQuery = sql`WITH current AS (${currentCte}), previous AS (${previousCte}) SELECT COUNT(*) as total FROM (SELECT ${countInnerSelect} FROM current c FULL OUTER JOIN previous p ON ${joinOn} WHERE 1=1 ${filterClause})`;
 	const main = compileCollapsed(adapter, mainQuery);
 	const count = compileCollapsed(adapter, countQuery);
 	return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine",
   "type": "module",
-  "version": "0.25.3",
+  "version": "0.25.4",
   "description": "Append-only Parquet/DuckDB storage engine + planner + adapters for the gscdump pipeline. Node + edge runtimes; opt-in heavy peers.",
   "author": {
     "name": "Harlan Wilton",
@@ -185,8 +185,8 @@
     "drizzle-orm": "1.0.0-rc.3",
     "icebird": "^0.8.6",
     "proper-lockfile": "^4.1.2",
-    "@gscdump/contracts": "0.25.3",
-    "gscdump": "0.25.3"
+    "gscdump": "0.25.4",
+    "@gscdump/contracts": "0.25.4"
   },
   "devDependencies": {
     "@duckdb/duckdb-wasm": "^1.32.0",