csv-to-pg 3.3.4 → 3.4.1

package/esm/parse.js

@@ -29,6 +29,37 @@ const parseJson = (value) => {
         return value;
     return value ? JSON.stringify(value) : undefined;
 };
+/**
+ * Convert a PostgreSQL interval object to a PostgreSQL interval string.
+ * node-postgres returns intervals as objects like { hours: 12, minutes: 6, seconds: 41 }
+ */
+const formatInterval = (value) => {
+    if (typeof value === 'string') {
+        return value;
+    }
+    if (value && typeof value === 'object') {
+        const interval = value;
+        const parts = [];
+        if (interval.years)
+            parts.push(`${interval.years} year${interval.years !== 1 ? 's' : ''}`);
+        if (interval.months)
+            parts.push(`${interval.months} mon${interval.months !== 1 ? 's' : ''}`);
+        if (interval.days)
+            parts.push(`${interval.days} day${interval.days !== 1 ? 's' : ''}`);
+        // Build time component
+        const hours = interval.hours || 0;
+        const minutes = interval.minutes || 0;
+        const seconds = interval.seconds || 0;
+        const milliseconds = interval.milliseconds || 0;
+        if (hours || minutes || seconds || milliseconds) {
+            const totalSeconds = seconds + milliseconds / 1000;
+            const timeStr = `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${totalSeconds.toFixed(milliseconds ? 6 : 0).padStart(milliseconds ? 9 : 2, '0')}`;
+            parts.push(timeStr);
+        }
+        return parts.length > 0 ? parts.join(' ') : '00:00:00';
+    }
+    return undefined;
+};
 /**
  * Escape a single array element for PostgreSQL array literal format.
  * Handles: NULL, quotes, backslashes, commas, braces, and whitespace.
@@ -255,6 +286,50 @@ const getCoercionFunc = (type, from, opts, fieldName) => {
                 });
                 return wrapValue(val, opts);
             };
+        case 'uuid[]':
+            return (record) => {
+                const rawValue = record[from[0]];
+                if (isNullToken(rawValue)) {
+                    return makeNullOrThrow(fieldName, rawValue, type, required, 'value is empty or null');
+                }
+                // Handle array values - validate each UUID
+                if (Array.isArray(rawValue)) {
+                    if (rawValue.length === 0) {
+                        return makeNullOrThrow(fieldName, rawValue, type, required, 'array is empty');
+                    }
+                    const uuidRegex = /^([0-9a-fA-F]{8})-(([0-9a-fA-F]{4}-){3})([0-9a-fA-F]{12})$/i;
+                    for (const item of rawValue) {
+                        if (!uuidRegex.test(String(item))) {
+                            return makeNullOrThrow(fieldName, rawValue, type, required, `array contains invalid UUID: ${item}`);
+                        }
+                    }
+                    const arrayLiteral = psqlArray(rawValue);
+                    if (isEmpty(arrayLiteral)) {
+                        return makeNullOrThrow(fieldName, rawValue, type, required, 'failed to format array');
+                    }
+                    const val = nodes.aConst({
+                        sval: ast.string({ sval: String(arrayLiteral) })
+                    });
+                    return wrapValue(val, opts);
+                }
+                // If not an array, treat as empty/null
+                return makeNullOrThrow(fieldName, rawValue, type, required, 'value is not an array');
+            };
+        case 'interval':
+            return (record) => {
+                const rawValue = record[from[0]];
+                if (isNullToken(rawValue)) {
+                    return makeNullOrThrow(fieldName, rawValue, type, required, 'value is empty or null');
+                }
+                const value = formatInterval(rawValue);
+                if (isEmpty(value)) {
+                    return makeNullOrThrow(fieldName, rawValue, type, required, 'value is empty or invalid interval');
+                }
+                const val = nodes.aConst({
+                    sval: ast.string({ sval: String(value) })
+                });
+                return wrapValue(val, opts);
+            };
         case 'timestamp':
         case 'timestamptz':
         case 'date':

package/esm/parser.js

@@ -9,7 +9,7 @@ export class Parser {
     }
     async parse(data) {
         const config = this.config;
-        const { schema, table, singleStmts, conflict, headers, delimeter } = config;
+        const { schema, table, singleStmts, conflict, conflictDoNothing, headers, delimeter } = config;
         const opts = {};
         if (headers)
             opts.headers = headers;
@@ -44,7 +44,8 @@ export class Parser {
                 table,
                 types,
                 record,
-                conflict
+                conflict,
+                conflictDoNothing
             }));
             return deparse(stmts);
         }
@@ -54,7 +55,8 @@ export class Parser {
                 table,
                 types,
                 records,
-                conflict
+                conflict,
+                conflictDoNothing
             });
             return deparse([stmt]);
         }

package/esm/utils.js

@@ -106,7 +106,14 @@ const indexElem = (name) => ({
         nulls_ordering: 'SORTBY_NULLS_DEFAULT'
     }
 });
-const makeConflictClause = (conflictElems, fields) => {
+const makeConflictClause = (conflictElems, fields, conflictDoNothing) => {
+    // If conflictDoNothing is true, generate ON CONFLICT DO NOTHING without specifying columns
+    // This catches any unique constraint violation
+    if (conflictDoNothing) {
+        return {
+            action: 'ONCONFLICT_NOTHING'
+        };
+    }
     if (!conflictElems || !conflictElems.length)
         return undefined;
     const setElems = fields.filter((el) => !conflictElems.includes(el));
@@ -128,7 +135,7 @@ const makeConflictClause = (conflictElems, fields) => {
         };
     }
 };
-export const InsertOne = ({ schema = 'public', table, types, record, conflict }) => ({
+export const InsertOne = ({ schema = 'public', table, types, record, conflict, conflictDoNothing }) => ({
     RawStmt: {
         stmt: {
             InsertStmt: {
@@ -152,14 +159,14 @@ export const InsertOne = ({ schema = 'public', table, types, record, conflict })
                         limitOption: 'LIMIT_OPTION_DEFAULT'
                     }
                 },
-                onConflictClause: makeConflictClause(conflict, Object.keys(types)),
+                onConflictClause: makeConflictClause(conflict, Object.keys(types), conflictDoNothing),
                 override: 'OVERRIDING_NOT_SET'
             }
         },
         stmt_len: 1
     }
 });
-export const InsertMany = ({ schema = 'public', table, types, records, conflict }) => ({
+export const InsertMany = ({ schema = 'public', table, types, records, conflict, conflictDoNothing }) => ({
     RawStmt: {
         stmt: {
             InsertStmt: {
@@ -181,7 +188,7 @@ export const InsertMany = ({ schema = 'public', table, types, records, conflict
                         limitOption: 'LIMIT_OPTION_DEFAULT'
                     }
                 },
-                onConflictClause: makeConflictClause(conflict, Object.keys(types)),
+                onConflictClause: makeConflictClause(conflict, Object.keys(types), conflictDoNothing),
                 override: 'OVERRIDING_NOT_SET'
             }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "csv-to-pg",
-  "version": "3.3.4",
+  "version": "3.4.1",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "description": "csv to pg statements",
   "main": "index.js",
@@ -50,5 +50,5 @@
     "js-yaml": "^3.14.0",
     "pgsql-deparser": "^17.17.2"
   },
-  "gitHead": "22c89cfc6f67879e77ca47f652c31c80828665f5"
+  "gitHead": "cf0d7de6f89b52e1e3dcd2cda068e7be27296615"
 }

package/parse.js

@@ -35,6 +35,37 @@ const parseJson = (value) => {
         return value;
     return value ? JSON.stringify(value) : undefined;
 };
+/**
+ * Convert a PostgreSQL interval object to a PostgreSQL interval string.
+ * node-postgres returns intervals as objects like { hours: 12, minutes: 6, seconds: 41 }
+ */
+const formatInterval = (value) => {
+    if (typeof value === 'string') {
+        return value;
+    }
+    if (value && typeof value === 'object') {
+        const interval = value;
+        const parts = [];
+        if (interval.years)
+            parts.push(`${interval.years} year${interval.years !== 1 ? 's' : ''}`);
+        if (interval.months)
+            parts.push(`${interval.months} mon${interval.months !== 1 ? 's' : ''}`);
+        if (interval.days)
+            parts.push(`${interval.days} day${interval.days !== 1 ? 's' : ''}`);
+        // Build time component
+        const hours = interval.hours || 0;
+        const minutes = interval.minutes || 0;
+        const seconds = interval.seconds || 0;
+        const milliseconds = interval.milliseconds || 0;
+        if (hours || minutes || seconds || milliseconds) {
+            const totalSeconds = seconds + milliseconds / 1000;
+            const timeStr = `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${totalSeconds.toFixed(milliseconds ? 6 : 0).padStart(milliseconds ? 9 : 2, '0')}`;
+            parts.push(timeStr);
+        }
+        return parts.length > 0 ? parts.join(' ') : '00:00:00';
+    }
+    return undefined;
+};
 /**
  * Escape a single array element for PostgreSQL array literal format.
  * Handles: NULL, quotes, backslashes, commas, braces, and whitespace.
@@ -264,6 +295,50 @@ const getCoercionFunc = (type, from, opts, fieldName) => {
                 });
                 return (0, utils_2.wrapValue)(val, opts);
             };
+        case 'uuid[]':
+            return (record) => {
+                const rawValue = record[from[0]];
+                if (isNullToken(rawValue)) {
+                    return makeNullOrThrow(fieldName, rawValue, type, required, 'value is empty or null');
+                }
+                // Handle array values - validate each UUID
+                if (Array.isArray(rawValue)) {
+                    if (rawValue.length === 0) {
+                        return makeNullOrThrow(fieldName, rawValue, type, required, 'array is empty');
+                    }
+                    const uuidRegex = /^([0-9a-fA-F]{8})-(([0-9a-fA-F]{4}-){3})([0-9a-fA-F]{12})$/i;
+                    for (const item of rawValue) {
+                        if (!uuidRegex.test(String(item))) {
+                            return makeNullOrThrow(fieldName, rawValue, type, required, `array contains invalid UUID: ${item}`);
+                        }
+                    }
+                    const arrayLiteral = psqlArray(rawValue);
+                    if (isEmpty(arrayLiteral)) {
+                        return makeNullOrThrow(fieldName, rawValue, type, required, 'failed to format array');
+                    }
+                    const val = utils_1.nodes.aConst({
+                        sval: utils_1.ast.string({ sval: String(arrayLiteral) })
+                    });
+                    return (0, utils_2.wrapValue)(val, opts);
+                }
+                // If not an array, treat as empty/null
+                return makeNullOrThrow(fieldName, rawValue, type, required, 'value is not an array');
+            };
+        case 'interval':
+            return (record) => {
+                const rawValue = record[from[0]];
+                if (isNullToken(rawValue)) {
+                    return makeNullOrThrow(fieldName, rawValue, type, required, 'value is empty or null');
+                }
+                const value = formatInterval(rawValue);
+                if (isEmpty(value)) {
+                    return makeNullOrThrow(fieldName, rawValue, type, required, 'value is empty or invalid interval');
+                }
+                const val = utils_1.nodes.aConst({
+                    sval: utils_1.ast.string({ sval: String(value) })
+                });
+                return (0, utils_2.wrapValue)(val, opts);
+            };
         case 'timestamp':
         case 'timestamptz':
         case 'date':

package/parser.d.ts

@@ -3,6 +3,7 @@ interface ParserConfig {
     table: string;
     singleStmts?: boolean;
     conflict?: string[];
+    conflictDoNothing?: boolean;
     headers?: string[];
     delimeter?: string;
     json?: boolean;

package/parser.js

@@ -12,7 +12,7 @@ class Parser {
     }
     async parse(data) {
         const config = this.config;
-        const { schema, table, singleStmts, conflict, headers, delimeter } = config;
+        const { schema, table, singleStmts, conflict, conflictDoNothing, headers, delimeter } = config;
         const opts = {};
         if (headers)
             opts.headers = headers;
@@ -47,7 +47,8 @@ class Parser {
                 table,
                 types,
                 record,
-                conflict
+                conflict,
+                conflictDoNothing
             }));
             return (0, pgsql_deparser_1.deparse)(stmts);
         }
@@ -57,7 +58,8 @@ class Parser {
                 table,
                 types,
                 records,
-                conflict
+                conflict,
+                conflictDoNothing
             });
             return (0, pgsql_deparser_1.deparse)([stmt]);
         }

package/utils.d.ts

@@ -11,16 +11,18 @@ interface InsertOneParams {
     types: TypesMap;
     record: Record<string, unknown>;
     conflict?: string[];
+    conflictDoNothing?: boolean;
 }
-export declare const InsertOne: ({ schema, table, types, record, conflict }: InsertOneParams) => Node;
+export declare const InsertOne: ({ schema, table, types, record, conflict, conflictDoNothing }: InsertOneParams) => Node;
 interface InsertManyParams {
     schema?: string;
     table: string;
     types: TypesMap;
     records: Record<string, unknown>[];
     conflict?: string[];
+    conflictDoNothing?: boolean;
 }
-export declare const InsertMany: ({ schema, table, types, records, conflict }: InsertManyParams) => Node;
+export declare const InsertMany: ({ schema, table, types, records, conflict, conflictDoNothing }: InsertManyParams) => Node;
 interface WrapOptions {
     wrap?: string[];
     wrapAst?: (val: Node) => Node;

package/utils.js

@@ -112,7 +112,14 @@ const indexElem = (name) => ({
         nulls_ordering: 'SORTBY_NULLS_DEFAULT'
     }
 });
-const makeConflictClause = (conflictElems, fields) => {
+const makeConflictClause = (conflictElems, fields, conflictDoNothing) => {
+    // If conflictDoNothing is true, generate ON CONFLICT DO NOTHING without specifying columns
+    // This catches any unique constraint violation
+    if (conflictDoNothing) {
+        return {
+            action: 'ONCONFLICT_NOTHING'
+        };
+    }
     if (!conflictElems || !conflictElems.length)
         return undefined;
     const setElems = fields.filter((el) => !conflictElems.includes(el));
@@ -134,7 +141,7 @@ const makeConflictClause = (conflictElems, fields) => {
         };
     }
 };
-const InsertOne = ({ schema = 'public', table, types, record, conflict }) => ({
+const InsertOne = ({ schema = 'public', table, types, record, conflict, conflictDoNothing }) => ({
     RawStmt: {
         stmt: {
             InsertStmt: {
@@ -158,7 +165,7 @@ const InsertOne = ({ schema = 'public', table, types, record, conflict }) => ({
                         limitOption: 'LIMIT_OPTION_DEFAULT'
                     }
                 },
-                onConflictClause: makeConflictClause(conflict, Object.keys(types)),
+                onConflictClause: makeConflictClause(conflict, Object.keys(types), conflictDoNothing),
                 override: 'OVERRIDING_NOT_SET'
             }
         },
@@ -166,7 +173,7 @@ const InsertOne = ({ schema = 'public', table, types, record, conflict }) => ({
     }
 });
 exports.InsertOne = InsertOne;
-const InsertMany = ({ schema = 'public', table, types, records, conflict }) => ({
+const InsertMany = ({ schema = 'public', table, types, records, conflict, conflictDoNothing }) => ({
     RawStmt: {
         stmt: {
             InsertStmt: {
@@ -188,7 +195,7 @@ const InsertMany = ({ schema = 'public', table, types, records, conflict }) => (
                         limitOption: 'LIMIT_OPTION_DEFAULT'
                     }
                 },
-                onConflictClause: makeConflictClause(conflict, Object.keys(types)),
+                onConflictClause: makeConflictClause(conflict, Object.keys(types), conflictDoNothing),
                 override: 'OVERRIDING_NOT_SET'
             }
         },