gtfs 4.15.3 → 4.15.5

package/dist/bin/gtfs-import.js

@@ -3793,6 +3793,9 @@ var importGtfsFiles = (db, task) => mapSeries2(
     task.log(`Importing - ${filename}\r`);
     const columns = model.schema.filter((column) => column.name !== "id");
     const placeholder = columns.map(({ name }) => `@${name}`).join(", ");
+    const prefixedColumns = new Set(
+      columns.filter((col) => col.prefix).map((col) => col.name)
+    );
     const prepareStatement = `INSERT ${task.ignoreDuplicates ? "OR IGNORE" : ""} INTO ${model.filenameBase} (${columns.map((column) => column.name).join(", ")}) VALUES (${placeholder})`;
     const insert = db.prepare(prepareStatement);
     const insertLines = db.transaction((lines) => {
@@ -3806,7 +3809,7 @@ var importGtfsFiles = (db, task) => mapSeries2(
                 line
               ).map(([columnName, value]) => [
                 columnName,
-                columns.find((col) => col.name === columnName)?.prefix ? `${task.prefix}${value}` : value
+                prefixedColumns.has(columnName) && value !== null ? `${task.prefix}${value}` : value
               ])
             );
             insert.run(prefixedLine);
@@ -3905,13 +3908,10 @@ async function importGtfs(initialConfig) {
   timer.start();
   const config = setDefaultConfig(initialConfig);
   validateConfigForImport(config);
-  const log2 = log(config);
-  const logError2 = logError(config);
-  const logWarning2 = logWarning(config);
   try {
     const db = openDb(config);
     const agencyCount = config.agencies.length;
-    log2(
+    log(config)(
       `Starting GTFS import for ${pluralize2("file", agencyCount, true)} using SQLite database at ${config.sqlitePath}`
     );
     createGtfsTables(db);
@@ -3935,9 +3935,9 @@ async function importGtfs(initialConfig) {
           sqlitePath: config.sqlitePath,
           prefix: agency2.prefix,
           currentTimestamp: Math.floor(Date.now() / 1e3),
-          log: log2,
-          logWarning: logWarning2,
-          logError: logError2
+          log: log(config),
+          logWarning: logWarning(config),
+          logError: logError(config)
         };
         if (task.url) {
           await downloadGtfsFiles(task);
@@ -3947,36 +3947,30 @@ async function importGtfs(initialConfig) {
         await updateGtfsRealtimeData(task);
         await rm2(tempPath, { recursive: true });
       } catch (error) {
-        handleImportError(error, config, logError2);
+        if (config.ignoreErrors) {
+          logError(config)(error.message);
+        } else {
+          throw error;
+        }
       }
     });
-    log2(`Creating DB indexes`);
+    log(config)(`Creating DB indexes`);
     createGtfsIndexes(db);
     const seconds = Math.round(timer.time() / 1e3);
     timer.stop();
-    log2(
+    log(config)(
       `Completed GTFS import for ${pluralize2("agency", agencyCount, true)} in ${seconds} seconds
 `
     );
   } catch (error) {
-    handleDatabaseError(error, config, logError2);
-  }
-}
-function handleImportError(error, config, logError2) {
-  if (config.ignoreErrors) {
-    logError2(error.message);
-  } else {
+    if (error?.code === "SQLITE_CANTOPEN") {
+      logError(config)(
+        `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
+      );
+    }
     throw error;
   }
 }
-function handleDatabaseError(error, config, logError2) {
-  if (error?.code === "SQLITE_CANTOPEN") {
-    logError2(
-      `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
-    );
-  }
-  throw error;
-}
 
 // src/lib/export.ts
 import { without, compact as compact2 } from "lodash-es";