pgsql-test 2.11.10 → 2.11.11

package/esm/seed/csv.js

@@ -1,5 +1,6 @@
 import { pipeline } from 'node:stream/promises';
 import { Logger } from '@launchql/logger';
+import { parse } from 'csv-parse';
 import { createReadStream, createWriteStream, existsSync } from 'fs';
 import { from as copyFrom, to as copyTo } from 'pg-copy-streams';
 const log = new Logger('csv');
@@ -16,9 +17,44 @@ export function csv(tables) {
         }
     };
 }
+async function parseCsvHeader(filePath) {
+    const file = createReadStream(filePath);
+    const parser = parse({
+        bom: true,
+        to_line: 1,
+        skip_empty_lines: true,
+    });
+    return new Promise((resolve, reject) => {
+        const cleanup = (err) => {
+            parser.destroy();
+            file.destroy();
+            if (err)
+                reject(err);
+        };
+        parser.on('readable', () => {
+            const row = parser.read();
+            if (!row)
+                return;
+            if (row.length === 0) {
+                cleanup(new Error('CSV header has no columns'));
+                return;
+            }
+            cleanup();
+            resolve(row);
+        });
+        parser.on('error', cleanup);
+        file.on('error', cleanup);
+        file.pipe(parser);
+    });
+}
 export async function copyCsvIntoTable(pg, table, filePath) {
     const client = pg.client;
-    const stream = client.query(copyFrom(`COPY ${table} FROM STDIN WITH CSV HEADER`));
+    const columns = await parseCsvHeader(filePath);
+    const quotedColumns = columns.map(col => `"${col.replace(/"/g, '""')}"`);
+    const columnList = quotedColumns.join(', ');
+    const copyCommand = `COPY ${table} (${columnList}) FROM STDIN WITH CSV HEADER`;
+    log.info(`Using columns: ${columnList}`);
+    const stream = client.query(copyFrom(copyCommand));
     const source = createReadStream(filePath);
     try {
         await pipeline(source, stream);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-test",
-  "version": "2.11.10",
+  "version": "2.11.11",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "description": "pgsql-test offers isolated, role-aware, and rollback-friendly PostgreSQL environments for integration tests — giving developers realistic test coverage without external state pollution",
   "main": "index.js",
@@ -64,10 +64,11 @@
     "@launchql/env": "^2.4.3",
     "@launchql/server-utils": "^2.4.3",
     "@launchql/types": "^2.6.2",
+    "csv-parse": "^6.1.0",
     "pg": "^8.16.0",
     "pg-cache": "^1.3.4",
     "pg-copy-streams": "^6.0.6",
     "pg-env": "^1.1.0"
   },
-  "gitHead": "870ab4d6b6b501ac6bdda660d44a0581e2145ad4"
+  "gitHead": "4f242233161fd1101d4de871ee2f1dbb7c6b9cff"
 }

package/seed/csv.js

@@ -5,6 +5,7 @@ exports.copyCsvIntoTable = copyCsvIntoTable;
 exports.exportTableToCsv = exportTableToCsv;
 const promises_1 = require("node:stream/promises");
 const logger_1 = require("@launchql/logger");
+const csv_parse_1 = require("csv-parse");
 const fs_1 = require("fs");
 const pg_copy_streams_1 = require("pg-copy-streams");
 const log = new logger_1.Logger('csv');
@@ -21,9 +22,44 @@ function csv(tables) {
         }
     };
 }
+async function parseCsvHeader(filePath) {
+    const file = (0, fs_1.createReadStream)(filePath);
+    const parser = (0, csv_parse_1.parse)({
+        bom: true,
+        to_line: 1,
+        skip_empty_lines: true,
+    });
+    return new Promise((resolve, reject) => {
+        const cleanup = (err) => {
+            parser.destroy();
+            file.destroy();
+            if (err)
+                reject(err);
+        };
+        parser.on('readable', () => {
+            const row = parser.read();
+            if (!row)
+                return;
+            if (row.length === 0) {
+                cleanup(new Error('CSV header has no columns'));
+                return;
+            }
+            cleanup();
+            resolve(row);
+        });
+        parser.on('error', cleanup);
+        file.on('error', cleanup);
+        file.pipe(parser);
+    });
+}
 async function copyCsvIntoTable(pg, table, filePath) {
     const client = pg.client;
-    const stream = client.query((0, pg_copy_streams_1.from)(`COPY ${table} FROM STDIN WITH CSV HEADER`));
+    const columns = await parseCsvHeader(filePath);
+    const quotedColumns = columns.map(col => `"${col.replace(/"/g, '""')}"`);
+    const columnList = quotedColumns.join(', ');
+    const copyCommand = `COPY ${table} (${columnList}) FROM STDIN WITH CSV HEADER`;
+    log.info(`Using columns: ${columnList}`);
+    const stream = client.query((0, pg_copy_streams_1.from)(copyCommand));
     const source = (0, fs_1.createReadStream)(filePath);
     try {
         await (0, promises_1.pipeline)(source, stream);