@hypequery/clickhouse 2.11.1 → 2.11.2

package/dist/core/formatters/sql-formatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-formatter.d.ts","sourceRoot":"","sources":["../../../src/core/formatters/sql-formatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,eAAe,EAAE,KAAK,UAAU,EAAkB,MAAM,sBAAsB,CAAC;AAIhJ,qBAAa,YAAY;IACvB,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAMtD,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAMvD,gBAAgB,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAO1D,cAAc,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAIxD,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAIrD,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM;IAYvC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,UAAQ,GAAG,aAAa;IA0D3D,OAAO,CAAC,gBAAgB;IAuFxB,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,aAAa;IAkB9D,OAAO,CAAC,cAAc;IActB,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,aAAa;IAkB7D,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAIrD,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,aAAa;IAW5D,UAAU,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAIpD,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAOvD,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAKvD,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,4BAA4B;CAMrC"}
+{"version":3,"file":"sql-formatter.d.ts","sourceRoot":"","sources":["../../../src/core/formatters/sql-formatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,eAAe,EAAE,KAAK,UAAU,EAAkB,MAAM,sBAAsB,CAAC;AAIhJ,qBAAa,YAAY;IACvB,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAMtD,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAMvD,gBAAgB,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAO1D,cAAc,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAIxD,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAIrD,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,MAAM;IAYvC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,UAAQ,GAAG,aAAa;IA0D3D,OAAO,CAAC,gBAAgB;IA4FxB,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,aAAa;IAkB9D,OAAO,CAAC,cAAc;IActB,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,aAAa;IAkB7D,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAIrD,WAAW,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,aAAa;IAW5D,UAAU,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAIpD,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAOvD,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM;IAKvD,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,4BAA4B;CAMrC"}

package/dist/core/formatters/sql-formatter.js

@@ -1,5 +1,5 @@
 import { cteFragment } from '../utils/cte-fragments.js';
-import { hasTopLevelLogicalOperator, terminateTrailingLineComment } from '../utils/sql-parens.js';
+import { groupConditionColumn, hasTopLevelLogicalOperator, terminateTrailingLineComment } from '../utils/sql-parens.js';
 export class SQLFormatter {
     formatSelect(query) {
         const distinctClause = query.distinct ? 'DISTINCT ' : '';
@@ -94,7 +94,10 @@ export class SQLFormatter {
                 throw new Error(`Unsupported expression kind: ${String(expr.kind)}`);
         }
     }
-    compileCondition({ column, operator, value }) {
+    compileCondition({ column: rawColumn, operator, value }) {
+        // The column may be a dataset's trusted SQL expression rather than an
+        // identifier, so it is grouped before it meets the conditions beside it.
+        const column = groupConditionColumn(rawColumn);
         if (operator === 'isNull' || operator === 'isNotNull') {
             return {
                 query: `${column} IS ${operator === 'isNull' ? '' : 'NOT '}NULL`.trim(),

package/dist/core/utils/sql-parens.d.ts

@@ -23,6 +23,21 @@ export declare function terminateTrailingLineComment(sql: string): string;
  * WHERE parses.
  */
 export declare function hasTopLevelLogicalOperator(sql: string): boolean;
+/**
+ * Groups a condition's column so it cannot reach past its own operand.
+ *
+ * A condition's column slot does not always hold an identifier. A dataset
+ * dimension may be backed by a trusted SQL expression, and that expression is
+ * passed here verbatim. Rendered bare next to other conditions it rebinds
+ * against them: with a dimension of `active OR is_public`, the WHERE becomes
+ * `tenant_id = ? AND active OR is_public = ?`, and because AND binds tighter
+ * than OR the second branch returns rows for every tenant. Grouping the
+ * expression keeps the tenant predicate independent of it.
+ *
+ * A trailing line comment is terminated for the same reason it is on raw
+ * fragments: unterminated, it swallows the rest of the statement.
+ */
+export declare function groupConditionColumn(column: string): string;
 /**
  * True when the fragment is a single parenthesized group, so wrapping it again
  * would only add redundant parentheses.

package/dist/core/utils/sql-parens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-parens.d.ts","sourceRoot":"","sources":["../../../src/core/utils/sql-parens.ts"],"names":[],"mappings":"AAuEA;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAqB1E;AASD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAqB1D;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAchE;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CA8B/D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAuBzD"}
+{"version":3,"file":"sql-parens.d.ts","sourceRoot":"","sources":["../../../src/core/utils/sql-parens.ts"],"names":[],"mappings":"AAuEA;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAqB1E;AASD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAqB1D;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAchE;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CA8B/D;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAM3D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAuBzD"}

package/dist/core/utils/sql-parens.js

@@ -184,6 +184,27 @@ export function hasTopLevelLogicalOperator(sql) {
     }
     return false;
 }
+/**
+ * Groups a condition's column so it cannot reach past its own operand.
+ *
+ * A condition's column slot does not always hold an identifier. A dataset
+ * dimension may be backed by a trusted SQL expression, and that expression is
+ * passed here verbatim. Rendered bare next to other conditions it rebinds
+ * against them: with a dimension of `active OR is_public`, the WHERE becomes
+ * `tenant_id = ? AND active OR is_public = ?`, and because AND binds tighter
+ * than OR the second branch returns rows for every tenant. Grouping the
+ * expression keeps the tenant predicate independent of it.
+ *
+ * A trailing line comment is terminated for the same reason it is on raw
+ * fragments: unterminated, it swallows the rest of the statement.
+ */
+export function groupConditionColumn(column) {
+    const terminated = terminateTrailingLineComment(column);
+    if (!hasTopLevelLogicalOperator(terminated) || isFullyParenthesized(terminated)) {
+        return terminated;
+    }
+    return `(${terminated})`;
+}
 /**
  * True when the fragment is a single parenthesized group, so wrapping it again
  * would only add redundant parentheses.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/clickhouse",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "description": "Type-safe ClickHouse query builder and schema generator for TypeScript analytics",
   "keywords": [
     "clickhouse",
@@ -73,7 +73,7 @@
     "typescript": "^5.7.3",
     "@vitest/coverage-v8": "^3.2.6",
     "vitest": "^3.2.6",
-    "@hypequery/datasets": "0.17.0"
+    "@hypequery/datasets": "0.18.0"
   },
   "ts-node": {
     "esm": true,