diff --git a/db/postgresql/migration_v2.sql b/db/postgresql/migration_v2.sql index 92240bb8..ab95836d 100644 --- a/db/postgresql/migration_v2.sql +++ b/db/postgresql/migration_v2.sql @@ -56,7 +56,7 @@ SELECT gen_random_uuid() event_id, 1 event_type FROM v1_pageview p JOIN v1_session s -ON s.session_id = s.session_id +ON s.session_id = p.session_id JOIN v1_website w ON w.website_id = s.website_id; @@ -68,12 +68,12 @@ SELECT e.event_uuid, s.session_uuid, e.created_at, e.url, - 1 event_type, + 2 event_type, e.event_name, ed.event_data FROM v1_event e JOIN v1_session s -ON s.session_id = s.session_id +ON s.session_id = e.session_id JOIN v1_website w ON w.website_id = s.website_id LEFT JOIN v1_event_data ed diff --git a/scripts/migrate-db.js b/scripts/migrate-db.js index 5fd06cb4..db89ecc1 100644 --- a/scripts/migrate-db.js +++ b/scripts/migrate-db.js @@ -63,6 +63,9 @@ async function checkV2Tables() { await runSqlFile('../prisma/migrations/01_init/migration.sql'); console.log(execSync('prisma migrate resolve --applied 01_init').toString()); console.log(execSync('prisma migrate deploy').toString()); + console.log( + 'Starting v2 data migration. Please do no cancel this process, it may take a while.', + ); await runSqlFile('../db/postgresql/migration_v2.sql'); } }