m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-09-28 04:08:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Detect when postgres is used instead of postgresql.

Browse Source
This commit is contained in:
Mike Cao 2020-09-04 11:06:32 -07:00
parent 0db29719b0
commit 6833a5bdb0
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/queries.js
View File

@ -4,10 +4,15 @@ import { subMinutes } from 'date-fns';
import { MYSQL, POSTGRESQL, MYSQL_DATE_FORMATS, POSTGRESQL_DATE_FORMATS } from 'lib/constants'; import { MYSQL, POSTGRESQL, MYSQL_DATE_FORMATS, POSTGRESQL_DATE_FORMATS } from 'lib/constants';
export function getDatabase() { export function getDatabase() {
return ( const type =
process.env.DATABASE_TYPE || process.env.DATABASE_TYPE ||
(process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0]) (process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0]);
);
if (type === 'postgres') {
return 'postgresql';
}
return type;
} }
export function getDateQuery(db, field, unit, timezone) { export function getDateQuery(db, field, unit, timezone) {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "umami", "name": "umami",
"version": "0.22.0", "version": "0.23.0",
"description": "A simple, fast, website analytics alternative to Google Analytics. ", "description": "A simple, fast, website analytics alternative to Google Analytics. ",
"author": "Mike Cao <mike@mikecao.com>", "author": "Mike Cao <mike@mikecao.com>",
"license": "MIT", "license": "MIT",

17
scripts/copy-db-schema.js
View File

@ -2,14 +2,25 @@ require('dotenv').config();
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const databaseType = function getDatabase() {
process.env.DATABASE_TYPE || (process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0]); const type =
process.env.DATABASE_TYPE ||
(process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0]);
if (type === 'postgres') {
return 'postgresql';
}
return type;
}
const databaseType = getDatabase();
if (!databaseType || !['mysql', 'postgresql'].includes(databaseType)) { if (!databaseType || !['mysql', 'postgresql'].includes(databaseType)) {
throw new Error('Missing or invalid database'); throw new Error('Missing or invalid database');
} }
console.log(`Database schema detected: ${databaseType}`); console.log(`Database type detected: ${databaseType}`);
const src = path.resolve(__dirname, `../prisma/schema.${databaseType}.prisma`); const src = path.resolve(__dirname, `../prisma/schema.${databaseType}.prisma`);
const dest = path.resolve(__dirname, '../prisma/schema.prisma'); const dest = path.resolve(__dirname, '../prisma/schema.prisma');