9033426058

Committed 10 May 2024 08:29AM UTC coverage: 31.924% (+0.03%) from 31.899%

Build # 9033426058

Build Type

Pull #9209

github

Committed by

Will-Howard

Commit Message

remove unneeded migration

Pull Request Pull Request #9209: Make clientId field in ClientIds non-nullable and unique

Run Details

4770 of 38942 branches covered (12.25%)

Branch coverage included in aggregate %.

26 of 31 new or added lines in 7 files covered. (83.87%)

382 existing lines in 19 files now uncovered.

27736 of 62881 relevant lines covered (44.11%)

178.63 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

75.81

/packages/lesswrong/lib/sql/sqlClient.ts

import type { DbTarget } from "./PgCollection";

export const logAllQueries = false;

/** Main sql client which is safe to use for all queries */
let sql: SqlClient | null = null;
/** Client to use for read operations only.
 *  Currently used in the EA Forum bot environment to decrease load on the main database
 */
let sqlRead: SqlClient | null = null;
/**
 * A sql client which can be assumed to be outside a transaction, to allow running queries that require
 * this (such as CREATE INDEX CONCURRENTLY ...)
 */
let sqlOutsideTransaction: SqlClient | null = null;

export const setSqlClient = (sql_: SqlClient, target: DbTarget = "write") => {
  if (target === "noTransaction") {
    sqlOutsideTransaction = sql_
  } else if (target === "read") {
    sqlRead = sql_
  } else {
    sql = sql_
  }
}

export const getSqlClient = (target: DbTarget = "write") => {
  return target === "write" || !sqlRead ? sql : sqlRead;
}

export const getSqlClientOrThrow = (target: DbTarget = "write") => {
  let client: SqlClient | null = null;

  if (target === "noTransaction") {
    client = sqlOutsideTransaction ?? sql;
  } else if (target === "read") {
    client = sqlRead ?? sql;
  } else {
    client = sql;
  }

  if (!client) {
    throw new Error("SQL Client is not initialized");
  }
  return client;
}


// Note: this is only used in tests so doesn't need to handle the read/write distinction
export const closeSqlClient = async (client: SqlClient) => {
  if (client === sql) {
    sql = null;
  }
  await client.$pool.end();
}

export const runSqlQuery = async (query: string, args?: any, target: DbTarget = "write") => {
  const client = getSqlClientOrThrow(target);
  return client.any(query, args, () => `${query}: ${JSON.stringify(args)}`);
}

export const replaceDbNameInPgConnectionString = (connectionString: string, dbName: string): string => {
  if (!/^postgres:\/\/.*\/[^/]+$/.test(connectionString)) {
    throw `Incorrectly formatted connection string or unrecognized connection string format: ${connectionString}`;
  }
  const lastSlash = connectionString.lastIndexOf('/');
  const withoutDbName = connectionString.slice(0, lastSlash);
  return `${withoutDbName}/${dbName}`;
}

1	import type { DbTarget } from "./PgCollection";	75,990✔
2
3	export const logAllQueries = false;	46✔
4
5	/** Main sql client which is safe to use for all queries */
6	let sql: SqlClient \| null = null;	46✔
7	/** Client to use for read operations only.
8	* Currently used in the EA Forum bot environment to decrease load on the main database
9	*/
10	let sqlRead: SqlClient \| null = null;	46✔
11	/**
12	* A sql client which can be assumed to be outside a transaction, to allow running queries that require
13	* this (such as CREATE INDEX CONCURRENTLY ...)
14	*/
15	let sqlOutsideTransaction: SqlClient \| null = null;	46✔
16
17	export const setSqlClient = (sql_: SqlClient, target: DbTarget = "write") => {	46✔
18	if (target === "noTransaction") {	54!
NEW 19	sqlOutsideTransaction = sql_	×
20	} else if (target === "read") {	54!
NEW 21	sqlRead = sql_	×
22	} else {
23	sql = sql_	54✔
24	}
25	}
26
27	export const getSqlClient = (target: DbTarget = "write") => {	46✔
28	return target === "write" \|\| !sqlRead ? sql : sqlRead;	50,032!
29	}
30
31	export const getSqlClientOrThrow = (target: DbTarget = "write") => {	46✔
32	let client: SqlClient \| null = null;	8,615✔
33
34	if (target === "noTransaction") {	8,615!
NEW 35	client = sqlOutsideTransaction ?? sql;	×
36	} else if (target === "read") {	8,615✔
37	client = sqlRead ?? sql;	6,170!
38	} else {
39	client = sql;	2,445✔
40	}
41
42	if (!client) {	8,615✔
43	throw new Error("SQL Client is not initialized");	2✔
44	}
45	return client;	8,613✔
46	}
47
48
49	// Note: this is only used in tests so doesn't need to handle the read/write distinction
50	export const closeSqlClient = async (client: SqlClient) => {	46✔
51	if (client === sql) {	17!
52	sql = null;	17✔
53	}
54	await client.$pool.end();	17✔
55	}
56
57	export const runSqlQuery = async (query: string, args?: any, target: DbTarget = "write") => {	46!
58	const client = getSqlClientOrThrow(target);	120✔
59	return client.any(query, args, () => `${query}: ${JSON.stringify(args)}`);	120✔
60	}
61
62	export const replaceDbNameInPgConnectionString = (connectionString: string, dbName: string): string => {	46✔
63	if (!/^postgres:\/\/.*\/[^/]+$/.test(connectionString)) {	16!
64	throw `Incorrectly formatted connection string or unrecognized connection string format: ${connectionString}`;	×
65	}
66	const lastSlash = connectionString.lastIndexOf('/');	16✔
67	const withoutDbName = connectionString.slice(0, lastSlash);	16✔
68	return `${withoutDbName}/${dbName}`;	16✔
69	}

ForumMagnum / ForumMagnum / 9033426058

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous