Merge branch 'dev' into jajaja

# Conflicts:
#	src/lib/detect.ts
#	src/queries/sql/reports/getRevenue.ts

db/clickhouse/schema.sql

@@ -246,3 +246,38 @@ SELECT * ORDER BY toStartOfDay(created_at), website_id, referrer_domain, created
 );
 
 ALTER TABLE umami.website_event MATERIALIZE PROJECTION website_event_referrer_domain_projection;
+
+-- revenue
+CREATE TABLE umami.website_revenue
+(
+    website_id UUID,
+    session_id UUID,
+    event_id UUID,
+    event_name String,
+    currency String,
+    revenue DECIMAL(18,4),
+    created_at DateTime('UTC')
+)
+ENGINE = MergeTree
+    PARTITION BY toYYYYMM(created_at)
+    ORDER BY (website_id, session_id, created_at)
+    SETTINGS index_granularity = 8192;
+
+
+CREATE MATERIALIZED VIEW umami.website_revenue_mv
+TO umami.website_revenue
+AS
+SELECT DISTINCT
+    ed.website_id,
+    ed.session_id,
+    ed.event_id,
+    ed.event_name,
+    c.currency,
+    coalesce(toDecimal64(ed.number_value, 2), toDecimal64(ed.string_value, 2)) revenue,
+    ed.created_at
+FROM umami.event_data ed
+JOIN (SELECT event_id, string_value as currency
+        FROM umami.event_data
+        WHERE positionCaseInsensitive(data_key, 'currency') > 0) c
+      ON c.event_id = ed.event_id
+WHERE positionCaseInsensitive(data_key, 'revenue') > 0;

db/postgresql/migrations/12_update_report_parameter/migration.sql

@@ -1,7 +1,3 @@
--- ConvertData
-UPDATE "report"
-SET "parameters" = CONCAT('"', REPLACE(parameters, '"', '\"'), '"');
-
 -- AlterTable
 ALTER TABLE "report"
 ALTER COLUMN "parameters" SET DATA TYPE JSONB USING parameters::JSONB;