Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
update checkV1Tables check
Francis Caob05b18e73603
diff --git a/db/postgresql/migration_v2.sql b/db/postgresql/migration_v2.sqlindex ab95836de..3b8c1356c 100644--- a/db/postgresql/migration_v2.sql+++ b/db/postgresql/migration_v2.sql@@ -11,7 +11,8 @@ SELECT account_uuid,created_at,updated_at,NULL-FROM v1_account;+FROM v1_account+WHERE NOT EXISTS (SELECT 1 FROM "user");-- websiteINSERT INTO website@@ -26,7 +27,8 @@ SELECT website_uuid,a.created_atFROM v1_website wJOIN v1_account a-ON a.user_id = w.user_id;+ON a.user_id = w.user_id+WHERE NOT EXISTS (SELECT 1 FROM website);-- sessionINSERT INTO session@@ -42,7 +44,8 @@ SELECT session_uuid,countryFROM v1_session sJOIN v1_website w-ON w.website_id = s.website_id;+ON w.website_id = s.website_id+WHERE NOT EXISTS (SELECT 1 FROM session);-- pageviewINSERT INTO website_event@@ -58,7 +61,8 @@ FROM v1_pageview pJOIN v1_session sON s.session_id = p.session_idJOIN v1_website w-ON w.website_id = s.website_id;+ON w.website_id = s.website_id+WHERE NOT EXISTS (SELECT 1 FROM website_event WHERE event_type = 1);-- event / event_dataINSERT INTO website_event@@ -77,4 +81,5 @@ ON s.session_id = e.session_idJOIN v1_website wON w.website_id = s.website_idLEFT JOIN v1_event_data ed-ON ed.event_id = e.event_id;\ No newline at end of file+ON ed.event_id = e.event_id+WHERE NOT EXISTS (SELECT 1 FROM website_event WHERE event_type = 2);\ No newline at end of filediff --git a/scripts/migrate-db.js b/scripts/migrate-db.jsindex 5101d3c03..cd50d7773 100644--- a/scripts/migrate-db.js+++ b/scripts/migrate-db.js@@ -36,28 +36,25 @@ async function checkConnection() {}async function checkV1Tables() {- try {- await prisma.$transaction([- prisma.$queryRaw`select * from _prisma_migrations where migration_name = '04_add_uuid' and finished_at IS NOT NULL`,- prisma.$queryRaw`select * from account limit 1`,- ]);+ const updateV1 =+ await prisma.$queryRaw`select * from _prisma_migrations where migration_name = '04_add_uuid' and finished_at IS NOT NULL`;++ if (updateV1.length > 0) {console.log('Preparing v1 tables for migration');// alter v1 tablesawait dropV1Keys();await renameV1Tables();await dropV1Indexes();+ }- success('Database v1 tables prepared for migration.');- } catch (e) {- // check for V1 renamed tables- try {- await prisma.$queryRaw`select * from v1_account limit 1`;+ // check for V1 renamed tables+ try {+ await prisma.$queryRaw`select * from v1_account limit 1`;- success('Database v1 tables ready for migration.');- } catch (e) {- throw new Error('Database v1 tables not found.');- }+ success('Database v1 tables ready for migration.');+ } catch (e) {+ throw new Error('Database v1 tables not found.');}}@@ -94,8 +91,8 @@ async function dropV1Keys() {success('Dropped v1 database keys.');} catch (e) {- error('Failed to drop v1 database keys.');- process.exit(1);+ console.log(e);+ throw new Error('Failed to drop v1 database keys.');}}@@ -114,8 +111,8 @@ async function renameV1Tables() {success('Renamed v1 database tables.');} catch (e) {- error('Failed to rename v1 database tables.');- process.exit(1);+ console.log(e);+ throw new Error('Failed to rename v1 database tables.');}}@@ -138,8 +135,8 @@ async function dropV1Indexes() {success('Dropped v1 database indexes.');} catch (e) {- error('Failed to drop v1 database indexes.');- process.exit(1);+ console.log(e);+ throw new Error('Failed to drop v1 database indexes.');}}@@ -148,10 +145,11 @@ async function deleteV1TablesPrompt() {type: 'text',name: 'value',message: 'Do you want to delete V1 database tables? (Y/N)',- validate: value => (value !== 'Y' && value !== 'N' ? `Please enter Y or N.` : true),+ validate: value =>+ value.toUpperCase() !== 'Y' && value.toUpperCase() !== 'N' ? `Please enter Y or N.` : true,});- if (response.value === 'Y') {+ if (response.value.toUpperCase() == 'Y') {await deleteV1Tables();}