text-to-map 1.1.4 → 1.1.5

package/dist/db/db.d.ts

@@ -21,7 +21,7 @@ export declare const nonEmptyOrNull: (value: string) => string | null;
  * Efficiently insert multiple rows. If preventDuplicatesByFirstColumn is true, the first
  * column should be unique (PK or UNIQUE).
  */
-export declare const insertMultipleRows: (rows: string[][], table: string, columnNames: string[], preventDuplicatesByFirstColumn?: boolean) => Promise<number>;
+export declare const insertMultipleRows: (rows: string[][], table: string, columnNames: string[], preventDuplicates?: boolean, keyColumns?: string[]) => Promise<number>;
 /**
  * Insert a single row and return the autoincremented ID.
  */

package/dist/db/db.js

@@ -39,6 +39,12 @@ export const getKnexDb = (config = {}) => {
                 connection: {
                     filename: _knexDbConfig.filePath,
                 },
+                pool: {
+                    afterCreate: (db, done) => {
+                        db.pragma('journal_mode = WAL;');
+                        done(false, done);
+                    },
+                },
                 useNullAsDefault: true,
                 debug: _knexDbConfig.verbose,
             });
@@ -109,7 +115,7 @@ export const nonEmptyOrNull = (value) => {
  * Efficiently insert multiple rows. If preventDuplicatesByFirstColumn is true, the first
  * column should be unique (PK or UNIQUE).
  */
-export const insertMultipleRows = (rows, table, columnNames, preventDuplicatesByFirstColumn = true) => __awaiter(void 0, void 0, void 0, function* () {
+export const insertMultipleRows = (rows, table, columnNames, preventDuplicates = true, keyColumns = []) => __awaiter(void 0, void 0, void 0, function* () {
     if (rows.length === 0) {
         return 0;
     }
@@ -120,8 +126,11 @@ export const insertMultipleRows = (rows, table, columnNames, preventDuplicatesBy
     //   }
     // }
     const insertPlaceholders = generate2DPlaceholders(columnNames.length, rows.length);
-    const onConfict = preventDuplicatesByFirstColumn
-        ? `ON CONFLICT (${columnNames[0]}) DO NOTHING`
+    if (preventDuplicates && keyColumns.length === 0) {
+        keyColumns = [columnNames[0]];
+    }
+    const onConfict = preventDuplicates
+        ? `ON CONFLICT (${keyColumns.join(", ")}) DO NOTHING`
         : "";
     yield getKnexDb().raw(`INSERT INTO ${table} (${columnNames.join(",")}) VALUES ${insertPlaceholders} ${onConfict}`, rows.flat());
     return rows.length;

package/dist/db/founders.js

@@ -85,7 +85,7 @@ export const insertFounders = (founders) => __awaiter(void 0, void 0, void 0, fu
             });
         }
     }
-    const insertedConnections = yield insertMultipleRows(schoolFounderConnectionData, "school_founder", ["school_izo", "founder_id"]);
+    const insertedConnections = yield insertMultipleRows(schoolFounderConnectionData, "school_founder", ["school_izo", "founder_id"], true, ["school_izo", "founder_id"]);
     return insertedFounders + insertedConnections;
 });
 const getCityOfSchool = (izo) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/db/migrations/20230704125715_initial.js

@@ -126,6 +126,7 @@ export function up(knex) {
                 .references("id")
                 .inTable("founder")
                 .notNullable();
+            table_13.unique(["school_izo", "founder_id"]);
         });
         yield knex.schema.createTable("address_point", function (table) {
             table.increments("id");

package/dist/db/schools.js

@@ -38,7 +38,7 @@ export const insertSchools = (schools) => __awaiter(void 0, void 0, void 0, func
     // plus filter out duplicate locations (same address id + izo)
     for (const location of locations) {
         try {
-            insertedLocations += yield insertMultipleRows([location], "school_location", ["school_izo", "address_point_id"], false);
+            insertedLocations += yield insertMultipleRows([location], "school_location", ["school_izo", "address_point_id"], true, ["school_izo", "address_point_id"]);
         }
         catch (error) {
             console.log(`Cannot add location with RUIAN code ${location[1]} (school IZO = ${location[0]}): code does not exist.`);

package/package.json

@@ -53,7 +53,7 @@
   },
   "name": "text-to-map",
   "description": "Text To Map usiluje o lepší, strojově zpracovatelné využití částí vyhlášek s výčtem ulic a dalších lokací. Jde o rozšiřitelnou sadu konceptů a nástrojů, které zajistí hladký převod výčtu ulic a jejich rozsahů v lidsky srozumitelném jazyce do strojově zpracovatelného, uchopitelného formátu.",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [