@socialgouv/matomo-postgres 2.4.2 → 2.4.4

package/dist/migrate-latest.js

@@ -12,6 +12,7 @@ import { FileMigrationProvider, Migrator } from 'kysely';
 import * as path from 'path';
 import { MATOMO_TABLE_NAME } from './config.js';
 import { db } from './db.js';
+import { syncDestinationTableSchema } from './syncDestinationTableSchema.js';
 function migrateToLatest() {
     return __awaiter(this, void 0, void 0, function* () {
         console.log(`Starting migrate to latest`);
@@ -44,6 +45,7 @@ function migrateToLatest() {
             else if (!(results === null || results === void 0 ? void 0 : results.length)) {
                 console.log('No migration to run');
             }
+            yield syncDestinationTableSchema(db);
         }
         catch (uncaughtError) {
             console.error('UNCAUGHT ERROR during migration:');

package/dist/migrations/20260526-01-fix-partition-race-condition.js

@@ -0,0 +1,57 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { sql } from 'kysely';
+export function up(db) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // The EXCEPTION handler was added to 20250715-01-weekly-partitioning.ts in
+        // commit 7d703de, but that file had already been applied on existing
+        // databases, so kysely never re-ran it. This migration re-applies the
+        // CREATE OR REPLACE on already-deployed databases so they stop crashing
+        // with `relation "matomo_partitioned_YYYYwWW" already exists` under the
+        // p-all concurrent import.
+        yield sql `
+    CREATE OR REPLACE FUNCTION create_weekly_partition_if_not_exists(table_name text, partition_date timestamptz)
+    RETURNS void AS $$
+    DECLARE
+        partition_name text;
+        start_date timestamptz;
+        end_date timestamptz;
+        year_week text;
+    BEGIN
+        start_date := date_trunc('week', partition_date);
+        end_date := start_date + interval '1 week';
+
+        year_week := to_char(start_date, 'IYYY') || 'w' || to_char(start_date, 'IW');
+        partition_name := table_name || '_' || year_week;
+
+        IF NOT EXISTS (
+            SELECT 1 FROM pg_class c
+            JOIN pg_namespace n ON n.oid = c.relnamespace
+            WHERE c.relname = partition_name
+            AND n.nspname = current_schema()
+        ) THEN
+            EXECUTE format('CREATE TABLE %I PARTITION OF %I FOR VALUES FROM (%L) TO (%L)',
+                partition_name, table_name, start_date, end_date);
+
+            RAISE NOTICE 'Created partition % for range % to %', partition_name, start_date, end_date;
+        END IF;
+    EXCEPTION
+        WHEN duplicate_table THEN
+            RAISE NOTICE 'Partition % already exists (created concurrently)', partition_name;
+    END;
+    $$ LANGUAGE plpgsql;
+  `.execute(db);
+    });
+}
+export function down(_db) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // No-op: rolling back would re-introduce the race condition crash.
+    });
+}

package/dist/syncDestinationTableSchema.js

@@ -0,0 +1,47 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { sql } from 'kysely';
+import { DESTINATION_TABLE, MATOMO_TABLE_NAME, PARTITIONED_MATOMO_TABLE_NAME } from './config.js';
+// Kysely migrations operate on MATOMO_TABLE_NAME (default `matomo`), but
+// several deployments run multiple cronjobs against a single database with
+// distinct DESTINATION_TABLEs (matomo_back, matomo_app, matomo_landing, ...).
+// Schema changes applied to `matomo` never reach those custom destinations,
+// and INSERTs fail with `column "..." does not exist`. After running the
+// regular migrations, mirror any missing columns from MATOMO_TABLE_NAME onto
+// DESTINATION_TABLE so writes stay schema-compatible.
+export function syncDestinationTableSchema(db) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (DESTINATION_TABLE === MATOMO_TABLE_NAME ||
+            DESTINATION_TABLE === PARTITIONED_MATOMO_TABLE_NAME) {
+            return;
+        }
+        const { rows } = yield sql `
+    SELECT a.attname, format_type(a.atttypid, a.atttypmod) AS coltype
+    FROM pg_attribute a
+    WHERE a.attrelid = ${MATOMO_TABLE_NAME}::regclass
+      AND a.attnum > 0
+      AND NOT a.attisdropped
+      AND NOT EXISTS (
+        SELECT 1 FROM pg_attribute b
+        WHERE b.attrelid = ${DESTINATION_TABLE}::regclass
+          AND b.attname = a.attname
+          AND b.attnum > 0
+          AND NOT b.attisdropped
+      )
+  `.execute(db);
+        for (const { attname, coltype } of rows) {
+            console.log(`Syncing schema: adding column "${attname}" ${coltype} to ${DESTINATION_TABLE}`);
+            yield sql `
+      ALTER TABLE ${sql.id(DESTINATION_TABLE)}
+      ADD COLUMN ${sql.id(attname)} ${sql.raw(coltype)}
+    `.execute(db);
+        }
+    });
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@socialgouv/matomo-postgres",
   "description": "Extract visitor events from Matomo API and push to Postgres",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "packageManager": "pnpm@10.28.1",
   "types": "types/index.d.ts",
   "license": "Apache-2.0",