diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql index 3dcfda9f6..551591cb2 100644 --- a/db/clickhouse/schema.sql +++ b/db/clickhouse/schema.sql @@ -16,6 +16,7 @@ CREATE TABLE umami.website_event subdivision1 LowCardinality(String), subdivision2 LowCardinality(String), city String, + ip String, --pageviews url_path String, url_query String, diff --git a/db/mysql/schema.prisma b/db/mysql/schema.prisma index a7722accd..0c837db28 100644 --- a/db/mysql/schema.prisma +++ b/db/mysql/schema.prisma @@ -19,10 +19,10 @@ model User { updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamp(0) deletedAt DateTime? @map("deleted_at") @db.Timestamp(0) - websiteUser Website[] @relation("user") - websiteCreateUser Website[] @relation("createUser") - teamUser TeamUser[] - report Report[] + websiteUser Website[] @relation("user") + websiteCreateUser Website[] @relation("createUser") + teamUser TeamUser[] + report Report[] @@map("user") } @@ -40,6 +40,7 @@ model Session { subdivision1 String? @db.Char(20) subdivision2 String? @db.VarChar(50) city String? @db.VarChar(50) + ip String? @db.VarChar(100) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0) websiteEvent WebsiteEvent[] @@ -174,8 +175,8 @@ model Team { updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamp(0) deletedAt DateTime? @map("deleted_at") @db.Timestamp(0) - website Website[] - teamUser TeamUser[] + website Website[] + teamUser TeamUser[] @@index([accessCode]) @@map("team") diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma index b9009e0fb..631581d72 100644 --- a/db/postgresql/schema.prisma +++ b/db/postgresql/schema.prisma @@ -19,8 +19,8 @@ model User { updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6) deletedAt DateTime? @map("deleted_at") @db.Timestamptz(6) - websiteUser Website[] @relation("user") - websiteCreateUser Website[] @relation("createUser") + websiteUser Website[] @relation("user") + websiteCreateUser Website[] @relation("createUser") teamUser TeamUser[] report Report[] @@ -40,6 +40,7 @@ model Session { subdivision1 String? @db.VarChar(20) subdivision2 String? @db.VarChar(50) city String? @db.VarChar(50) + ip String? @db.VarChar(100) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) websiteEvent WebsiteEvent[] @@ -147,7 +148,7 @@ model SessionData { id String @id() @map("session_data_id") @db.Uuid websiteId String @map("website_id") @db.Uuid sessionId String @map("session_id") @db.Uuid - dataKey String @map("data_key") @db.VarChar(500) + dataKey String @map("data_key") @db.VarChar(500) stringValue String? @map("string_value") @db.VarChar(500) numberValue Decimal? @map("number_value") @db.Decimal(19, 4) dateValue DateTime? @map("date_value") @db.Timestamptz(6) diff --git a/src/lib/session.ts b/src/lib/session.ts index ca145c04b..2ffb82e93 100644 --- a/src/lib/session.ts +++ b/src/lib/session.ts @@ -58,6 +58,7 @@ export async function getSession(req: NextApiRequestCollect): Promise