watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'dev' into analytics

Browse source
This commit is contained in:
Mike Cao 2025-05-01 00:14:18 -07:00
commit 64d4418d94
6 changed files with 29 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -18,7 +18,6 @@ node_modules
/public/script.js /public/script.js
/geo /geo
/dist /dist
src/generated/prisma/
# misc # misc
.DS_Store .DS_Store

28
db/mysql/schema.prisma
View file

@ -1,7 +1,5 @@
generator client { generator client {
provider = "prisma-client-js" provider = "prisma-client-js"
output = "../src/generated/prisma"
binaryTargets = ["native"]
} }
datasource db { datasource db {
@ -30,18 +28,18 @@ model User {
} }
model Session { model Session {
id String @id @unique @map("session_id") @db.VarChar(36) id String @id @unique @map("session_id") @db.VarChar(36)
websiteId String @map("website_id") @db.VarChar(36) websiteId String @map("website_id") @db.VarChar(36)
browser String? @db.VarChar(20) browser String? @db.VarChar(20)
os String? @db.VarChar(20) os String? @db.VarChar(20)
device String? @db.VarChar(20) device String? @db.VarChar(20)
screen String? @db.VarChar(11) screen String? @db.VarChar(11)
language String? @db.VarChar(35) language String? @db.VarChar(35)
country String? @db.Char(2) country String? @db.Char(2)
region String? @db.Char(20) region String? @db.Char(20)
city String? @db.VarChar(50) city String? @db.VarChar(50)
distinctId String? @map("distinct_id") @db.VarChar(50) distinctId String? @map("distinct_id") @db.VarChar(50)
createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
websiteEvent WebsiteEvent[] websiteEvent WebsiteEvent[]
sessionData SessionData[] sessionData SessionData[]

28
db/postgresql/schema.prisma
View file

@ -1,7 +1,5 @@
generator client { generator client {
provider = "prisma-client-js" provider = "prisma-client-js"
output = "../src/generated/prisma"
binaryTargets = ["native"]
} }
datasource db { datasource db {
@ -30,18 +28,18 @@ model User {
} }
model Session { model Session {
id String @id @unique @map("session_id") @db.Uuid id String @id @unique @map("session_id") @db.Uuid
websiteId String @map("website_id") @db.Uuid websiteId String @map("website_id") @db.Uuid
browser String? @db.VarChar(20) browser String? @db.VarChar(20)
os String? @db.VarChar(20) os String? @db.VarChar(20)
device String? @db.VarChar(20) device String? @db.VarChar(20)
screen String? @db.VarChar(11) screen String? @db.VarChar(11)
language String? @db.VarChar(35) language String? @db.VarChar(35)
country String? @db.Char(2) country String? @db.Char(2)
region String? @db.VarChar(20) region String? @db.VarChar(20)
city String? @db.VarChar(50) city String? @db.VarChar(50)
distinctId String? @map("distinct_id") @db.VarChar(50) distinctId String? @map("distinct_id") @db.VarChar(50)
createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
websiteEvent WebsiteEvent[] websiteEvent WebsiteEvent[]
sessionData SessionData[] sessionData SessionData[]

2
pnpm-lock.yaml generated
View file

@ -391,7 +391,7 @@ importers:
specifier: ^4.3.8 specifier: ^4.3.8
version: 4.5.6(@types/react@19.1.2)(immer@9.0.21)(react@18.3.1) version: 4.5.6(@types/react@19.1.2)(immer@9.0.21)(react@18.3.1)
src/generated/prisma: {}
packages: packages:

2
scripts/check-db.js
View file

@ -1,6 +1,6 @@
/* eslint-disable no-console */ /* eslint-disable no-console */
require('dotenv').config(); require('dotenv').config();
const { PrismaClient } = require('../src/generated/prisma/index.js'); const { PrismaClient } = require('@prisma/client');
const chalk = require('chalk'); const chalk = require('chalk');
const { execSync } = require('child_process'); const { execSync } = require('child_process');
const semver = require('semver'); const semver = require('semver');

2
src/lib/prisma.ts
View file

@ -1,5 +1,5 @@
import debug from 'debug'; import debug from 'debug';
import { PrismaClient } from '@/generated/prisma/index.js'; import { PrismaClient } from '@prisma/client';
import { readReplicas } from '@prisma/extension-read-replicas'; import { readReplicas } from '@prisma/extension-read-replicas';
import { formatInTimeZone } from 'date-fns-tz'; import { formatInTimeZone } from 'date-fns-tz';
import { MYSQL, POSTGRESQL, getDatabaseType } from '@/lib/db'; import { MYSQL, POSTGRESQL, getDatabaseType } from '@/lib/db';