@electric-sql/client 1.2.1 → 1.2.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@electric-sql/client",
   "description": "Postgres everywhere - your data, in sync, wherever you need it.",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": "ElectricSQL team and contributors.",
   "bugs": {
     "url": "https://github.com/electric-sql/electric/issues"

package/src/client.ts

@@ -9,7 +9,11 @@ import {
   SnapshotMetadata,
 } from './types'
 import { MessageParser, Parser, TransformFunction } from './parser'
-import { ColumnMapper, encodeWhereClause } from './column-mapper'
+import {
+  ColumnMapper,
+  encodeWhereClause,
+  quoteIdentifier,
+} from './column-mapper'
 import { getOffset, isUpToDateMessage, isChangeMessage } from './helpers'
 import {
   FetchError,
@@ -855,8 +859,27 @@ export class ShapeStream<T extends Row<unknown> = Row>
         )
         setQueryParam(fetchUrl, WHERE_QUERY_PARAM, encodedWhere)
       }
-      if (params.columns)
-        setQueryParam(fetchUrl, COLUMNS_QUERY_PARAM, params.columns)
+      if (params.columns) {
+        // Get original columns array from options (before toInternalParams converted to string)
+        const originalColumns = await resolveValue(this.options.params?.columns)
+        if (Array.isArray(originalColumns)) {
+          // Apply columnMapper encoding if present
+          let encodedColumns = originalColumns.map(String)
+          if (this.options.columnMapper) {
+            encodedColumns = encodedColumns.map(
+              this.options.columnMapper.encode
+            )
+          }
+          // Quote each column name to handle special characters (commas, etc.)
+          const serializedColumns = encodedColumns
+            .map(quoteIdentifier)
+            .join(`,`)
+          setQueryParam(fetchUrl, COLUMNS_QUERY_PARAM, serializedColumns)
+        } else {
+          // Fallback: columns was already a string
+          setQueryParam(fetchUrl, COLUMNS_QUERY_PARAM, params.columns)
+        }
+      }
       if (params.replica) setQueryParam(fetchUrl, REPLICA_PARAM, params.replica)
       if (params.params)
         setQueryParam(fetchUrl, WHERE_PARAMS_PARAM, params.params)

package/src/column-mapper.ts

@@ -3,6 +3,31 @@ import { Schema } from './types'
 type DbColumnName = string
 type AppColumnName = string
 
+/**
+ * Quote a PostgreSQL identifier for safe use in query parameters.
+ *
+ * Wraps the identifier in double quotes and escapes any internal
+ * double quotes by doubling them. This ensures identifiers with
+ * special characters (commas, spaces, etc.) are handled correctly.
+ *
+ * @param identifier - The identifier to quote
+ * @returns The quoted identifier
+ *
+ * @example
+ * ```typescript
+ * quoteIdentifier('user_id')        // '"user_id"'
+ * quoteIdentifier('foo,bar')        // '"foo,bar"'
+ * quoteIdentifier('has"quote')      // '"has""quote"'
+ * ```
+ *
+ * @internal
+ */
+export function quoteIdentifier(identifier: string): string {
+  // Escape internal double quotes by doubling them
+  const escaped = identifier.replace(/"/g, `""`)
+  return `"${escaped}"`
+}
+
 /**
  * A bidirectional column mapper that handles transforming column **names**
  * between database format (e.g., snake_case) and application format (e.g., camelCase).