✨ unify transaction creation and close db connection in same call for…

… scripts

adminSiteServer/exportGitData.ts

@@ -13,9 +13,7 @@ const main = async () => {
                     commitOnly: true,
                 })
         }
-    })
-
-    await db.closeTypeOrmAndKnexConnections()
+    }, db.TransactionCloseMode.Close)
 }
 
 void main()

baker/algolia/indexChartsToAlgolia.ts

@@ -131,10 +131,11 @@ const indexChartsToAlgolia = async () => {
 
     const index = client.initIndex(SearchIndexName.Charts)
 
-    const records = await db.knexReadonlyTransaction(getChartsRecords)
+    const records = await db.knexReadonlyTransaction(
+        getChartsRecords,
+        db.TransactionCloseMode.Close
+    )
     await index.replaceAllObjects(records)
-
-    await db.closeTypeOrmAndKnexConnections()
 }
 
 process.on("unhandledRejection", (e) => {

baker/algolia/indexExplorersToAlgolia.ts

@@ -199,10 +199,11 @@ const indexExplorersToAlgolia = async () => {
     try {
         const index = client.initIndex(SearchIndexName.Explorers)
 
-        const records = await db.knexReadonlyTransaction(getExplorerRecords)
+        const records = await db.knexReadonlyTransaction(
+            getExplorerRecords,
+            db.TransactionCloseMode.Close
+        )
         await index.replaceAllObjects(records)
-
-        await db.closeTypeOrmAndKnexConnections()
     } catch (e) {
         console.log("Error indexing explorers to Algolia: ", e)
     }

baker/algolia/indexToAlgolia.tsx

@@ -233,12 +233,14 @@ const indexToAlgolia = async () => {
     }
     const index = client.initIndex(SearchIndexName.Pages)
 
-    const records = await db.knexReadonlyTransaction(getPagesRecords)
+    const records = await db.knexReadonlyTransaction(
+        getPagesRecords,
+        db.TransactionCloseMode.Close
+    )
 
     await index.replaceAllObjects(records)
 
     await wpdb.singleton.end()
-    await db.closeTypeOrmAndKnexConnections()
 }
 
 process.on("unhandledRejection", (e) => {

baker/bakeGdocPost.ts

@@ -19,8 +19,9 @@ void yargs(hideBin(process.argv))
         async ({ slug }) => {
             const baker = new SiteBaker(BAKED_SITE_DIR, BAKED_BASE_URL)
 
-            await db.knexReadonlyTransaction((trx) =>
-                baker.bakeGDocPosts(trx, [slug])
+            await db.knexReadonlyTransaction(
+                (trx) => baker.bakeGDocPosts(trx, [slug]),
+                db.TransactionCloseMode.Close
             )
             process.exit(0)
         }

baker/bakeGdocPosts.ts

@@ -24,8 +24,9 @@ void yargs(hideBin(process.argv))
         async ({ slugs }) => {
             const baker = new SiteBaker(BAKED_SITE_DIR, BAKED_BASE_URL)
 
-            await db.knexReadonlyTransaction((trx) =>
-                baker.bakeGDocPosts(trx, slugs)
+            await db.knexReadonlyTransaction(
+                (trx) => baker.bakeGDocPosts(trx, slugs),
+                db.TransactionCloseMode.Close
             )
             process.exit(0)
         }

baker/batchTagWithGpt.ts

@@ -92,11 +92,11 @@ if (require.main === module) {
             },
             async (argv) => {
                 try {
-                    await db.knexReadonlyTransaction((trx) =>
-                        batchTagChartsWithGpt(trx, argv)
+                    await db.knexReadonlyTransaction(
+                        (trx) => batchTagChartsWithGpt(trx, argv),
+                        db.TransactionCloseMode.Close
                     )
                 } finally {
-                    await db.closeTypeOrmAndKnexConnections()
                 }
             }
         )

baker/buildLocalBake.ts

@@ -16,7 +16,10 @@ const bakeDomainToFolder = async (
     await fs.mkdirp(dir)
     const baker = new SiteBaker(dir, baseUrl, bakeSteps)
     console.log(`Baking site locally with baseUrl '${baseUrl}' to dir '${dir}'`)
-    await db.knexReadonlyTransaction((trx) => baker.bakeAll(trx))
+    await db.knexReadonlyTransaction(
+        (trx) => baker.bakeAll(trx),
+        db.TransactionCloseMode.Close
+    )
 }
 
 void yargs(hideBin(process.argv))

baker/postUpdatedHook.ts

@@ -200,8 +200,9 @@ const main = async (
 ) => {
     console.log(email, name, postId)
     try {
-        const slug = db.knexReadWriteTransaction((trx) =>
-            syncPostToGrapher(trx, postId)
+        const slug = db.knexReadWriteTransaction(
+            (trx) => syncPostToGrapher(trx, postId),
+            db.TransactionCloseMode.Close
         )
 
         if (BAKE_ON_CHANGE)

baker/recalcLatestCountryData.ts

@@ -5,8 +5,10 @@ import * as db from "../db/db.js"
 import { denormalizeLatestCountryData } from "../baker/countryProfiles.js"
 
 const main = async () => {
-    await db.knexReadWriteTransaction(denormalizeLatestCountryData)
-    await db.closeTypeOrmAndKnexConnections()
+    await db.knexReadWriteTransaction(
+        denormalizeLatestCountryData,
+        db.TransactionCloseMode.Close
+    )
 }
 
 if (require.main === module) void main()

baker/runBakeGraphers.ts

@@ -9,11 +9,13 @@ import * as db from "../db/db.js"
  */
 
 const main = async (folder: string) => {
-    return db.knexReadonlyTransaction((trx) =>
-        bakeAllChangedGrapherPagesVariablesPngSvgAndDeleteRemovedGraphers(
-            folder,
-            trx
-        )
+    return db.knexReadonlyTransaction(
+        (trx) =>
+            bakeAllChangedGrapherPagesVariablesPngSvgAndDeleteRemovedGraphers(
+                folder,
+                trx
+            ),
+        db.TransactionCloseMode.Close
     )
 }
 

baker/startDeployQueueServer.ts

@@ -33,7 +33,10 @@ const main = async () => {
         setTimeout(deployIfQueueIsNotEmpty, 10 * 1000)
     })
 
-    await db.knexReadonlyTransaction(deployIfQueueIsNotEmpty)
+    await db.knexReadonlyTransaction(
+        deployIfQueueIsNotEmpty,
+        db.TransactionCloseMode.Close
+    )
 }
 
 void main()

baker/syncRedirectsToGrapher.ts

@@ -67,10 +67,12 @@ export const syncRedirectsToGrapher = async (
 
 const main = async (): Promise<void> => {
     try {
-        await db.knexReadWriteTransaction((trx) => syncRedirectsToGrapher(trx))
+        await db.knexReadWriteTransaction(
+            (trx) => syncRedirectsToGrapher(trx),
+            db.TransactionCloseMode.Close
+        )
     } finally {
         await wpdb.singleton.end()
-        await db.closeTypeOrmAndKnexConnections()
     }
 }
 

db/analyzeWpPosts.ts

@@ -65,9 +65,7 @@ const analyze = async (): Promise<void> => {
         for (const [tag, count] of sortedTagCount) {
             console.log(`${tag}: ${count}`)
         }
-    })
-
-    await db.closeTypeOrmAndKnexConnections()
+    }, db.TransactionCloseMode.Close)
 }
 
 void analyze()

db/db.ts

@@ -76,10 +76,13 @@ export const mysqlFirst = async (
 
 export const closeTypeOrmAndKnexConnections = async (): Promise<void> => {
     if (typeormDataSource) await typeormDataSource.destroy()
-    if (_knexInstance) await _knexInstance.destroy()
+    if (_knexInstance) {
+        await _knexInstance.destroy()
+        _knexInstance = undefined
+    }
 }
 
-let _knexInstance: Knex
+let _knexInstance: Knex | undefined = undefined
 
 export const knexInstance = (): Knex<any, any[]> => {
     if (_knexInstance) return _knexInstance
@@ -119,23 +122,46 @@ export type KnexReadWriteTransaction = Knex.Transaction<any, any[]> & {
     readonly [__write_capability]: "write"
 }
 
+export enum TransactionCloseMode {
+    Close,
+    KeepOpen,
+}
+
+async function knexTransaction<T, KT>(
+    transactionFn: (trx: KT) => Promise<T>,
+    closeConnection: TransactionCloseMode,
+    readonly: boolean,
+    knex: Knex<any, any[]>
+): Promise<T> {
+    try {
+        const options = readonly ? { readOnly: true } : {}
+        const result = await knex.transaction(
+            async (trx) => transactionFn(trx as KT),
+            options
+        )
+        return result
+    } finally {
+        if (closeConnection) {
+            await knex.destroy()
+            if (knex === _knexInstance) _knexInstance = undefined
+        }
+    }
+}
+
 export async function knexReadonlyTransaction<T>(
     transactionFn: (trx: KnexReadonlyTransaction) => Promise<T>,
+    closeConnection: TransactionCloseMode = TransactionCloseMode.KeepOpen,
     knex: Knex<any, any[]> = knexInstance()
 ): Promise<T> {
-    return knex.transaction(
-        async (trx) => transactionFn(trx as KnexReadonlyTransaction),
-        { readOnly: true }
-    )
+    return knexTransaction(transactionFn, closeConnection, true, knex)
 }
 
 export async function knexReadWriteTransaction<T>(
     transactionFn: (trx: KnexReadWriteTransaction) => Promise<T>,
+    closeConnection: TransactionCloseMode = TransactionCloseMode.KeepOpen,
     knex: Knex<any, any[]> = knexInstance()
 ): Promise<T> {
-    return knex.transaction(async (trx) =>
-        transactionFn(trx as KnexReadWriteTransaction)
-    )
+    return knexTransaction(transactionFn, closeConnection, false, knex)
 }
 export const knexRaw = async <TRow = unknown>(
     knex: Knex<any, any[]>,

db/migrateWpPostsToArchieMl.ts

@@ -275,7 +275,7 @@ const migrate = async (trx: db.KnexReadWriteTransaction): Promise<void> => {
             await db.knexRaw(trx, insertQuery, [
                 JSON.stringify(archieMlFieldContent, null, 2),
                 JSON.stringify(archieMlStatsContent, null, 2),
-                markdown,
+                markdown ?? null,
                 post.id,
             ])
             console.log("inserted", post.id)
@@ -314,8 +314,7 @@ const migrate = async (trx: db.KnexReadWriteTransaction): Promise<void> => {
 }
 
 async function runMigrate(): Promise<void> {
-    await db.knexReadWriteTransaction(migrate)
-    await db.closeTypeOrmAndKnexConnections()
+    await db.knexReadWriteTransaction(migrate, db.TransactionCloseMode.Close)
 }
 
 void runMigrate()

db/model/Gdoc/GdocBase.ts

@@ -744,13 +744,9 @@ export class GdocBase implements OwidGdocBaseInterface {
             []
         )
 
-        const { chartIdsBySlug, publishedExplorersBySlug } =
-            await db.knexReadonlyTransaction(async (trx) => {
-                const chartIdsBySlug = await mapSlugsToIds(trx)
-                const publishedExplorersBySlug =
-                    await db.getPublishedExplorersBySlug(trx)
-                return { chartIdsBySlug, publishedExplorersBySlug }
-            })
+        const chartIdsBySlug = await mapSlugsToIds(knex)
+        const publishedExplorersBySlug =
+            await db.getPublishedExplorersBySlug(knex)
 
         const linkErrors: OwidGdocErrorMessage[] = this.links.reduce(
             (errors: OwidGdocErrorMessage[], link): OwidGdocErrorMessage[] => {

db/refreshPageviewsFromDatasette.ts

@@ -70,11 +70,13 @@ async function downloadAndInsertCSV(
 
 const main = async (): Promise<void> => {
     try {
-        await db.knexReadWriteTransaction((trx) => downloadAndInsertCSV(trx))
+        await db.knexReadWriteTransaction(
+            (trx) => downloadAndInsertCSV(trx),
+            db.TransactionCloseMode.Close
+        )
     } catch (e) {
         console.error(e)
     } finally {
-        await db.closeTypeOrmAndKnexConnections()
     }
 }
 

db/syncPostsToGrapher.ts

@@ -435,10 +435,12 @@ const syncPostsToGrapher = async (
 
 const main = async (): Promise<void> => {
     try {
-        await db.knexReadWriteTransaction((trx) => syncPostsToGrapher(trx))
+        await db.knexReadWriteTransaction(
+            (trx) => syncPostsToGrapher(trx),
+            db.TransactionCloseMode.Close
+        )
     } finally {
         await wpdb.singleton.end()
-        await db.closeTypeOrmAndKnexConnections()
     }
 }