m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-12-25 02:36:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix numeric to number.

Browse Source
This commit is contained in:
Brian Cao 2023-07-06 21:02:56 -07:00
parent 8e6620db53
commit 0a3ee2277a
8 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/clickhouse/schema.sql
View File

@ -119,7 +119,7 @@ CREATE TABLE umami.event_data
event_name String, event_name String,
event_key String, event_key String,
string_value Nullable(String), string_value Nullable(String),
numeric_value Nullable(Decimal64(4)), --922337203685477.5625 number_value Nullable(Decimal64(4)), --922337203685477.5625
date_value Nullable(DateTime('UTC')), date_value Nullable(DateTime('UTC')),
data_type UInt32, data_type UInt32,
created_at DateTime('UTC'), created_at DateTime('UTC'),
@ -137,7 +137,7 @@ CREATE TABLE umami.event_data_queue (
event_name String, event_name String,
event_key String, event_key String,
string_value Nullable(String), string_value Nullable(String),
numeric_value Nullable(Decimal64(4)), --922337203685477.5625 number_value Nullable(Decimal64(4)), --922337203685477.5625
date_value Nullable(DateTime('UTC')), date_value Nullable(DateTime('UTC')),
data_type UInt32, data_type UInt32,
created_at DateTime('UTC'), created_at DateTime('UTC'),
@ -161,7 +161,7 @@ SELECT website_id,
event_name, event_name,
event_key, event_key,
string_value, string_value,
numeric_value, number_value,
date_value, date_value,
data_type, data_type,
created_at created_at

10
db/mysql/migrations/03_session_data/migration.sql
View File

@ -15,7 +15,7 @@
ALTER TABLE `event_data` RENAME COLUMN `event_data_type` TO `data_type`; ALTER TABLE `event_data` RENAME COLUMN `event_data_type` TO `data_type`;
ALTER TABLE `event_data` RENAME COLUMN `event_date_value` TO `date_value`; ALTER TABLE `event_data` RENAME COLUMN `event_date_value` TO `date_value`;
ALTER TABLE `event_data` RENAME COLUMN `event_id` TO `event_data_id`; ALTER TABLE `event_data` RENAME COLUMN `event_id` TO `event_data_id`;
ALTER TABLE `event_data` RENAME COLUMN `event_numeric_value` TO `numeric_value`; ALTER TABLE `event_data` RENAME COLUMN `event_numeric_value` TO `number_value`;
ALTER TABLE `event_data` RENAME COLUMN `event_string_value` TO `string_value`; ALTER TABLE `event_data` RENAME COLUMN `event_string_value` TO `string_value`;
-- CreateTable -- CreateTable
@ -24,10 +24,10 @@ CREATE TABLE `session_data` (
`website_id` VARCHAR(36) NOT NULL, `website_id` VARCHAR(36) NOT NULL,
`session_id` VARCHAR(36) NOT NULL, `session_id` VARCHAR(36) NOT NULL,
`event_key` VARCHAR(500) NOT NULL, `event_key` VARCHAR(500) NOT NULL,
`event_string_value` VARCHAR(500) NULL, `string_value` VARCHAR(500) NULL,
`event_numeric_value` DECIMAL(19, 4) NULL, `number_value` DECIMAL(19, 4) NULL,
`event_date_value` TIMESTAMP(0) NULL, `date_value` TIMESTAMP(0) NULL,
`event_data_type` INTEGER UNSIGNED NOT NULL, `data_type` INTEGER UNSIGNED NOT NULL,
`created_at` TIMESTAMP(0) NULL DEFAULT CURRENT_TIMESTAMP(0), `created_at` TIMESTAMP(0) NULL DEFAULT CURRENT_TIMESTAMP(0),
INDEX `session_data_created_at_idx`(`created_at`), INDEX `session_data_created_at_idx`(`created_at`),

20
db/mysql/schema.prisma
View File

@ -101,7 +101,7 @@ model EventData {
websiteId String @map("website_id") @db.VarChar(36) websiteId String @map("website_id") @db.VarChar(36)
eventKey String @map("event_key") @db.VarChar(500) eventKey String @map("event_key") @db.VarChar(500)
stringValue String? @map("string_value") @db.VarChar(500) stringValue String? @map("string_value") @db.VarChar(500)
numericValue Decimal? @map("numeric_value") @db.Decimal(19, 4) numberValue Decimal? @map("number_value") @db.Decimal(19, 4)
dateValue DateTime? @map("date_value") @db.Timestamp(0) dateValue DateTime? @map("date_value") @db.Timestamp(0)
dataType Int @map("data_type") @db.UnsignedInt dataType Int @map("data_type") @db.UnsignedInt
createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
@ -117,15 +117,15 @@ model EventData {
} }
model SessionData { model SessionData {
id String @id() @map("session_data_id") @db.VarChar(36) id String @id() @map("session_data_id") @db.VarChar(36)
websiteId String @map("website_id") @db.VarChar(36) websiteId String @map("website_id") @db.VarChar(36)
sessionId String @map("session_id") @db.VarChar(36) sessionId String @map("session_id") @db.VarChar(36)
eventKey String @map("event_key") @db.VarChar(500) eventKey String @map("event_key") @db.VarChar(500)
eventStringValue String? @map("event_string_value") @db.VarChar(500) stringValue String? @map("string_value") @db.VarChar(500)
eventNumericValue Decimal? @map("event_numeric_value") @db.Decimal(19, 4) numberValue Decimal? @map("number_value") @db.Decimal(19, 4)
eventDateValue DateTime? @map("event_date_value") @db.Timestamp(0) dateValue DateTime? @map("date_value") @db.Timestamp(0)
eventDataType Int @map("event_data_type") @db.UnsignedInt dataType Int @map("data_type") @db.UnsignedInt
createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
website Website @relation(fields: [websiteId], references: [id]) website Website @relation(fields: [websiteId], references: [id])
session Session @relation(fields: [sessionId], references: [id]) session Session @relation(fields: [sessionId], references: [id])

4
db/postgresql/migrations/03_session_data/migration.sql
View File

@ -2,7 +2,7 @@
ALTER TABLE "event_data" RENAME COLUMN "event_data_type" TO "data_type"; ALTER TABLE "event_data" RENAME COLUMN "event_data_type" TO "data_type";
ALTER TABLE "event_data" RENAME COLUMN "event_date_value" TO "date_value"; ALTER TABLE "event_data" RENAME COLUMN "event_date_value" TO "date_value";
ALTER TABLE "event_data" RENAME COLUMN "event_id" TO "event_data_id"; ALTER TABLE "event_data" RENAME COLUMN "event_id" TO "event_data_id";
ALTER TABLE "event_data" RENAME COLUMN "event_numeric_value" TO "numeric_value"; ALTER TABLE "event_data" RENAME COLUMN "event_numeric_value" TO "number_value";
ALTER TABLE "event_data" RENAME COLUMN "event_string_value" TO "string_value"; ALTER TABLE "event_data" RENAME COLUMN "event_string_value" TO "string_value";
-- CreateTable -- CreateTable
@ -12,7 +12,7 @@ CREATE TABLE "session_data" (
"session_id" UUID NOT NULL, "session_id" UUID NOT NULL,
"session_key" VARCHAR(500) NOT NULL, "session_key" VARCHAR(500) NOT NULL,
"string_value" VARCHAR(500), "string_value" VARCHAR(500),
"numeric_value" DECIMAL(19,4), "number_value" DECIMAL(19,4),
"date_value" TIMESTAMPTZ(6), "date_value" TIMESTAMPTZ(6),
"data_type" INTEGER NOT NULL, "data_type" INTEGER NOT NULL,
"created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP, "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,

22
db/postgresql/schema.prisma
View File

@ -101,7 +101,7 @@ model EventData {
websiteEventId String @map("website_event_id") @db.Uuid websiteEventId String @map("website_event_id") @db.Uuid
eventKey String @map("event_key") @db.VarChar(500) eventKey String @map("event_key") @db.VarChar(500)
stringValue String? @map("string_value") @db.VarChar(500) stringValue String? @map("string_value") @db.VarChar(500)
numericValue Decimal? @map("numeric_value") @db.Decimal(19, 4) numberValue Decimal? @map("number_value") @db.Decimal(19, 4)
dateValue DateTime? @map("date_value") @db.Timestamptz(6) dateValue DateTime? @map("date_value") @db.Timestamptz(6)
dataType Int @map("data_type") @db.Integer dataType Int @map("data_type") @db.Integer
createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
@ -116,16 +116,16 @@ model EventData {
} }
model SessionData { model SessionData {
id String @id() @map("session_data_id") @db.Uuid id String @id() @map("session_data_id") @db.Uuid
websiteId String @map("website_id") @db.Uuid websiteId String @map("website_id") @db.Uuid
sessionId String @map("session_id") @db.Uuid sessionId String @map("session_id") @db.Uuid
sessionKey String @map("session_key") @db.VarChar(500) sessionKey String @map("session_key") @db.VarChar(500)
stringValue String? @map("string_value") @db.VarChar(500) stringValue String? @map("string_value") @db.VarChar(500)
numericValue Decimal? @map("numeric_value") @db.Decimal(19, 4) numberValue Decimal? @map("number_value") @db.Decimal(19, 4)
dateValue DateTime? @map("date_value") @db.Timestamptz(6) dateValue DateTime? @map("date_value") @db.Timestamptz(6)
dataType Int @map("data_type") @db.Integer dataType Int @map("data_type") @db.Integer
createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
deletedAt DateTime? @default(now()) @map("deleted_at") @db.Timestamptz(6) deletedAt DateTime? @default(now()) @map("deleted_at") @db.Timestamptz(6)
website Website @relation(fields: [websiteId], references: [id]) website Website @relation(fields: [websiteId], references: [id])
session Session @relation(fields: [sessionId], references: [id]) session Session @relation(fields: [sessionId], references: [id])

8
lib/clickhouse.ts
View File

@ -82,17 +82,17 @@ function getEventDataFilterQuery(
switch (type) { switch (type) {
case 'number': case 'number':
ac.push(`and event_numeric_value = {eventValue${i}:UInt64})`); ac.push(`and number_value = {eventValue${i}:UInt64})`);
break; break;
case 'string': case 'string':
ac.push(`and event_string_value = {eventValue${i}:String})`); ac.push(`and string_value = {eventValue${i}:String})`);
break; break;
case 'boolean': case 'boolean':
ac.push(`and event_string_value = {eventValue${i}:String})`); ac.push(`and string_value = {eventValue${i}:String})`);
value = cv ? 'true' : 'false'; value = cv ? 'true' : 'false';
break; break;
case 'date': case 'date':
ac.push(`and event_date_value = {eventValue${i}:DateTime('UTC')})`); ac.push(`and date_value = {eventValue${i}:DateTime('UTC')})`);
break; break;
} }

8
lib/prisma.ts
View File

@ -94,20 +94,20 @@ function getEventDataFilterQuery(
switch (type) { switch (type) {
case 'number': case 'number':
ac.push(`and event_numeric_value = $${params.length + 1})`); ac.push(`and number_value = $${params.length + 1})`);
params.push(value); params.push(value);
break; break;
case 'string': case 'string':
ac.push(`and event_string_value = $${params.length + 1})`); ac.push(`and string_value = $${params.length + 1})`);
params.push(decodeURIComponent(cv.eventValue as string)); params.push(decodeURIComponent(cv.eventValue as string));
break; break;
case 'boolean': case 'boolean':
ac.push(`and event_string_value = $${params.length + 1})`); ac.push(`and string_value = $${params.length + 1})`);
params.push(decodeURIComponent(cv.eventValue as string)); params.push(decodeURIComponent(cv.eventValue as string));
value = cv ? 'true' : 'false'; value = cv ? 'true' : 'false';
break; break;
case 'date': case 'date':
ac.push(`and event_date_value = $${params.length + 1})`); ac.push(`and date_value = $${params.length + 1})`);
params.push(cv.eventValue); params.push(cv.eventValue);
break; break;
} }

2
queries/analytics/eventData/saveEventData.ts
View File

@ -81,7 +81,7 @@ async function clickhouseQuery(data: {
a.dynamicDataType === DATA_TYPE.array a.dynamicDataType === DATA_TYPE.array
? a.value ? a.value
: null, : null,
numeric_value: a.dynamicDataType === DATA_TYPE.number ? a.value : null, number_value: a.dynamicDataType === DATA_TYPE.number ? a.value : null,
date_value: a.dynamicDataType === DATA_TYPE.date ? getDateFormat(a.value) : null, date_value: a.dynamicDataType === DATA_TYPE.date ? getDateFormat(a.value) : null,
data_type: a.dynamicDataType, data_type: a.dynamicDataType,
created_at: createdAt, created_at: createdAt,