update

laurent22 · May 11, 2024 · 400aa33 · 400aa33
1 parent 777b080
commit 400aa33
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/server/src/db.replication.test.ts b/packages/server/src/db.replication.test.ts
@@ -1,5 +1,5 @@
 import { afterAllTests, beforeAllDb, beforeEachDb, createFolder, createUserAndSession, db, dbSlave, expectThrow, models, packageRootDir, updateFolder } from './utils/testing/testUtils';
-import { connectDb, disconnectDb, reconnectDb, sqliteSyncSlave } from './db';
+import { connectDb, disconnectDb, isPostgres, reconnectDb, sqliteSyncSlave } from './db';
 import { ChangeType, Event } from './services/database/types';
 import { DatabaseConfig, DatabaseConfigClient } from './utils/types';
 import { createDb } from './tools/dbTools';
@@ -29,6 +29,8 @@ const afterTest = async () => {
 describe('db.replication', () => {
 
 	it('should reconnect a database', async () => {
+		if (isPostgres(db())) return;
+
 		await beforeTest();
 
 		await disconnectDb(db());
@@ -56,6 +58,8 @@ describe('db.replication', () => {
 	});
 
 	it('should manually sync an SQLite slave instance', async () => {
+		if (isPostgres(db())) return;
+
 		const masterConfig: DatabaseConfig = {
 			client: DatabaseConfigClient.SQLite,
 			name: `${packageRootDir}/db-master-test.sqlite`,
@@ -87,6 +91,8 @@ describe('db.replication', () => {
 	});
 
 	test('should track changes - using replication', async () => {
+		if (isPostgres(db())) return;
+
 		await beforeTest({ DB_USE_SLAVE: '1' });
 
 		const { session, user } = await createUserAndSession(1, true);

diff --git a/packages/server/src/db.ts b/packages/server/src/db.ts
@@ -128,6 +128,10 @@ export async function waitForConnection(dbConfig: DatabaseConfig): Promise<Conne
 }
 
 export const clientType = (db: DbConnection): DatabaseConfigClient => {
+	// We have this extra check so that in tests we can quickly find out the database backend
+	// without having to use an initialized connection.
+	if (process.env.JOPLIN_TESTS_SERVER_DB === 'pg') return DatabaseConfigClient.PostgreSQL;
+	if (process.env.JOPLIN_TESTS_SERVER_DB === 'sqlite') return DatabaseConfigClient.SQLite;
 	return db.client.config.client;
 };