self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Server: Resolves #9695: Check Postgres required version before starting the server

Browse Source
This commit is contained in:
Laurent Cozic 2024-01-13 19:33:20 +00:00
parent 33fff4c8f0
commit 720b6f0190
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/server/src/app.ts
View File

@ -5,7 +5,7 @@ import * as Koa from 'koa';
import * as fs from 'fs-extra';
import Logger, { LogLevel, LoggerWrapper, TargetType } from '@joplin/utils/Logger';
import config, { fullVersionString, initConfig, runningInDocker } from './config';
import { migrateLatest, waitForConnection, sqliteDefaultDir, latestMigration, needsMigration, migrateList } from './db';
import { migrateLatest, waitForConnection, sqliteDefaultDir, latestMigration, needsMigration, migrateList, versionCheck } from './db';
import { AppContext, Env, KoaNext } from './utils/types';
import FsDriverNode from '@joplin/lib/fs-driver-node';
import { getDeviceTimeDrift } from '@joplin/lib/ntp';
@ -302,6 +302,8 @@ async function main() {
appLogger().info('Connection check:', connectionCheckLogInfo);
const ctx = app.context as AppContext;
await versionCheck(connectionCheck.connection);
if (config().database.autoMigration) {
appLogger().info('Auto-migrating database...');
await migrateLatest(connectionCheck.connection);

26
packages/server/src/db.ts
View File

@ -4,6 +4,7 @@ import * as pathUtils from 'path';
import time from '@joplin/lib/time';
import Logger from '@joplin/utils/Logger';
import { databaseSchema } from './services/database/types';
import { compareVersions } from 'compare-versions';
// Make sure bigInteger values are numbers and not strings
//
@ -411,6 +412,31 @@ export function isUniqueConstraintError(error: any): boolean {
return false;
}
const parsePostgresVersionString = (versionString: string) => {
// PostgreSQL 16.1 (Debian 16.1-1.pgdg120+1) on x86_64-pc-linux-gnu, compiled by gcc (Debian 12.2.0-14) 12.2.0, 64-bit
const matches = versionString.match('PostgreSQL (.*?) ');
if (!matches || matches.length !== 2) throw new Error(`Cannot parse Postgres version string: ${versionString}`);
return matches[1];
};
export const versionCheck = async (db: DbConnection) => {
if (isPostgres(db)) {
// We only support Postgres v12+
// https://github.com/laurent22/joplin/issues/9695
// https://www.postgresql.org/docs/current/rules-materializedviews.html
const minPostgresVersion = '12.0';
const result = await db.select(db.raw('version()')).first();
if (result && result.version) {
const version = parsePostgresVersionString(result.version);
if (compareVersions(version, minPostgresVersion) < 0) throw new Error(`Postgres version not supported: ${result.version}. Min required version is: ${minPostgresVersion}`);
} else {
throw new Error(`Could not fetch Postgres version info. Got: ${JSON.stringify(result)}`);
}
} else {
// Not implemented
}
};
export async function latestMigration(db: DbConnection): Promise<Migration | null> {
try {
const context: QueryContext = { noSuchTableErrorLoggingDisabled: true };