diff --git a/adminSiteClient/ChartList.tsx b/adminSiteClient/ChartList.tsx
index b9e6b15a0bb..51677bae5a6 100644
--- a/adminSiteClient/ChartList.tsx
+++ b/adminSiteClient/ChartList.tsx
@@ -4,7 +4,7 @@ import { runInAction, observable } from "mobx"
 import { bind } from "decko"
 import { AdminAppContext, AdminAppContextType } from "./AdminAppContext.js"
 import { ChartTypeName, GrapherInterface } from "@ourworldindata/types"
-import { startCase, ChartTagJoin } from "@ourworldindata/utils"
+import { startCase, DbChartTagJoin } from "@ourworldindata/utils"
 import { References, getFullReferencesCount } from "./ChartEditor.js"
 import { ChartRow } from "./ChartRow.js"
 
@@ -28,7 +28,7 @@ export interface ChartListItem {
     publishedBy: string
     isExplorable: boolean
 
-    tags: ChartTagJoin[]
+    tags: DbChartTagJoin[]
 }
 
 @observer
@@ -40,7 +40,7 @@ export class ChartList extends React.Component<{
     static contextType = AdminAppContext
     context!: AdminAppContextType
 
-    @observable availableTags: ChartTagJoin[] = []
+    @observable availableTags: DbChartTagJoin[] = []
 
     async fetchRefs(grapherId: number | undefined): Promise<References> {
         const { admin } = this.context
diff --git a/adminSiteClient/ChartRow.tsx b/adminSiteClient/ChartRow.tsx
index 4e2e3d49f30..4e290febadc 100644
--- a/adminSiteClient/ChartRow.tsx
+++ b/adminSiteClient/ChartRow.tsx
@@ -11,19 +11,19 @@ import {
     BAKED_GRAPHER_URL,
 } from "../settings/clientSettings.js"
 import { ChartListItem, showChartType } from "./ChartList.js"
-import { TaggableType, ChartTagJoin } from "@ourworldindata/utils"
+import { TaggableType, DbChartTagJoin } from "@ourworldindata/utils"
 
 @observer
 export class ChartRow extends React.Component<{
     chart: ChartListItem
     searchHighlight?: (text: string) => string | JSX.Element
-    availableTags: ChartTagJoin[]
+    availableTags: DbChartTagJoin[]
     onDelete: (chart: ChartListItem) => void
 }> {
     static contextType = AdminAppContext
     context!: AdminAppContextType
 
-    async saveTags(tags: ChartTagJoin[]) {
+    async saveTags(tags: DbChartTagJoin[]) {
         const { chart } = this.props
         const json = await this.context.admin.requestJSON(
             `/api/charts/${chart.id}/setTags`,
@@ -35,7 +35,7 @@ export class ChartRow extends React.Component<{
         }
     }
 
-    @action.bound onSaveTags(tags: ChartTagJoin[]) {
+    @action.bound onSaveTags(tags: DbChartTagJoin[]) {
         this.saveTags(tags)
     }
 
diff --git a/adminSiteClient/DatasetEditPage.tsx b/adminSiteClient/DatasetEditPage.tsx
index 9fda8eee7bc..17e867f74e6 100644
--- a/adminSiteClient/DatasetEditPage.tsx
+++ b/adminSiteClient/DatasetEditPage.tsx
@@ -5,7 +5,7 @@ import * as lodash from "lodash"
 import { Prompt, Redirect } from "react-router-dom"
 import filenamify from "filenamify"
 
-import { OwidSource, ChartTagJoin, OwidOrigin } from "@ourworldindata/utils"
+import { OwidSource, DbChartTagJoin, OwidOrigin } from "@ourworldindata/utils"
 
 import { AdminLayout } from "./AdminLayout.js"
 import { Link } from "./Link.js"
@@ -66,7 +66,7 @@ class DatasetEditable {
         additionalInfo: "",
     }
 
-    @observable tags: ChartTagJoin[] = []
+    @observable tags: DbChartTagJoin[] = []
 
     constructor(json: DatasetPageData) {
         for (const key in this) {
@@ -83,7 +83,7 @@ class DatasetTagEditor extends React.Component<{
     newDataset: DatasetEditable
     availableTags: { id: number; name: string; parentName: string }[]
 }> {
-    @action.bound onSaveTags(tags: ChartTagJoin[]) {
+    @action.bound onSaveTags(tags: DbChartTagJoin[]) {
         this.props.newDataset.tags = tags
     }
 
diff --git a/adminSiteClient/DatasetList.tsx b/adminSiteClient/DatasetList.tsx
index 50f67190ff9..c2190a65894 100644
--- a/adminSiteClient/DatasetList.tsx
+++ b/adminSiteClient/DatasetList.tsx
@@ -5,7 +5,7 @@ import * as lodash from "lodash"
 import { bind } from "decko"
 
 import { Link } from "./Link.js"
-import { ChartTagJoin } from "@ourworldindata/utils"
+import { DbChartTagJoin } from "@ourworldindata/utils"
 import { AdminAppContext, AdminAppContextType } from "./AdminAppContext.js"
 import { Timeago } from "./Forms.js"
 import { EditableTags } from "./EditableTags.js"
@@ -20,7 +20,7 @@ export interface DatasetListItem {
     dataEditedByUserName: string
     metadataEditedAt: Date
     metadataEditedByUserName: string
-    tags: ChartTagJoin[]
+    tags: DbChartTagJoin[]
     isPrivate: boolean
     nonRedistributable: boolean
     version: string
@@ -30,13 +30,13 @@ export interface DatasetListItem {
 @observer
 class DatasetRow extends React.Component<{
     dataset: DatasetListItem
-    availableTags: ChartTagJoin[]
+    availableTags: DbChartTagJoin[]
     searchHighlight?: (text: string) => string | JSX.Element
 }> {
     static contextType = AdminAppContext
     context!: AdminAppContextType
 
-    async saveTags(tags: ChartTagJoin[]) {
+    async saveTags(tags: DbChartTagJoin[]) {
         const { dataset } = this.props
         const json = await this.context.admin.requestJSON(
             `/api/datasets/${dataset.id}/setTags`,
@@ -48,7 +48,7 @@ class DatasetRow extends React.Component<{
         }
     }
 
-    @action.bound onSaveTags(tags: ChartTagJoin[]) {
+    @action.bound onSaveTags(tags: DbChartTagJoin[]) {
         this.saveTags(tags)
     }
 
@@ -105,7 +105,7 @@ export class DatasetList extends React.Component<{
     static contextType = AdminAppContext
     context!: AdminAppContextType
 
-    @observable availableTags: ChartTagJoin[] = []
+    @observable availableTags: DbChartTagJoin[] = []
 
     @bind async getTags() {
         const json = await this.context.admin.getJSON("/api/tags.json")
diff --git a/adminSiteClient/EditTags.tsx b/adminSiteClient/EditTags.tsx
index 3e20846a16e..11ebfd074d0 100644
--- a/adminSiteClient/EditTags.tsx
+++ b/adminSiteClient/EditTags.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import { action } from "mobx"
 import { observer } from "mobx-react"
-import { ChartTagJoin } from "@ourworldindata/utils"
+import { DbChartTagJoin } from "@ourworldindata/utils"
 import {
     ReactTags,
     ReactTagsAPI,
@@ -10,10 +10,10 @@ import {
 
 @observer
 export class EditTags extends React.Component<{
-    tags: ChartTagJoin[]
-    suggestions: ChartTagJoin[]
+    tags: DbChartTagJoin[]
+    suggestions: DbChartTagJoin[]
     onDelete: (index: number) => void
-    onAdd: (tag: ChartTagJoin) => void
+    onAdd: (tag: DbChartTagJoin) => void
     onSave: () => void
 }> {
     dismissable: boolean = true
@@ -66,7 +66,7 @@ export class EditTags extends React.Component<{
     }
 }
 
-const convertTagToAutocomplete = (t: ChartTagJoin) => ({
+const convertTagToAutocomplete = (t: DbChartTagJoin) => ({
     value: t.id,
     label: t.name,
 })
diff --git a/adminSiteClient/EditableTags.tsx b/adminSiteClient/EditableTags.tsx
index bf659031c15..1d3fab38a31 100644
--- a/adminSiteClient/EditableTags.tsx
+++ b/adminSiteClient/EditableTags.tsx
@@ -5,7 +5,7 @@ import { observer } from "mobx-react"
 import {
     KeyChartLevel,
     TaggableType,
-    ChartTagJoin,
+    DbChartTagJoin,
 } from "@ourworldindata/utils"
 import { TagBadge } from "./TagBadge.js"
 import { EditTags } from "./EditTags.js"
@@ -20,9 +20,9 @@ interface TaggableItem {
 
 @observer
 export class EditableTags extends React.Component<{
-    tags: ChartTagJoin[]
-    suggestions: ChartTagJoin[]
-    onSave: (tags: ChartTagJoin[]) => void
+    tags: DbChartTagJoin[]
+    suggestions: DbChartTagJoin[]
+    onSave: (tags: DbChartTagJoin[]) => void
     disabled?: boolean
     hasKeyChartSupport?: boolean
     hasSuggestionsSupport?: boolean
@@ -34,9 +34,9 @@ export class EditableTags extends React.Component<{
     @observable isEditing: boolean = false
     base: React.RefObject<HTMLDivElement> = React.createRef()
 
-    @observable tags: ChartTagJoin[] = lodash.clone(this.props.tags)
+    @observable tags: DbChartTagJoin[] = lodash.clone(this.props.tags)
 
-    @action.bound onAddTag(tag: ChartTagJoin) {
+    @action.bound onAddTag(tag: DbChartTagJoin) {
         this.tags.push(tag)
         this.tags = lodash
             // we only want to keep one occurrence of the same tag, whether
@@ -92,7 +92,7 @@ export class EditableTags extends React.Component<{
         const { taggable } = this.props
         if (!taggable?.id) return
 
-        const json: Record<"topics", ChartTagJoin[]> =
+        const json: Record<"topics", DbChartTagJoin[]> =
             await this.context.admin.getJSON(
                 `/api/gpt/suggest-topics/${taggable.type}/${taggable.id}.json`
             )
@@ -190,21 +190,21 @@ export class EditableTags extends React.Component<{
     }
 }
 
-const filterUncategorizedTag = (t: ChartTagJoin) => t.name !== "Uncategorized"
+const filterUncategorizedTag = (t: DbChartTagJoin) => t.name !== "Uncategorized"
 
-const filterUnlistedTag = (t: ChartTagJoin) => t.name !== "Unlisted"
+const filterUnlistedTag = (t: DbChartTagJoin) => t.name !== "Unlisted"
 
-const setDefaultKeyChartLevel = (t: ChartTagJoin) => {
+const setDefaultKeyChartLevel = (t: DbChartTagJoin) => {
     if (t.keyChartLevel === undefined) t.keyChartLevel = KeyChartLevel.None
     return t
 }
 
-const setTagStatusToPending = (t: ChartTagJoin) => {
+const setTagStatusToPending = (t: DbChartTagJoin) => {
     t.isApproved = false
     return t
 }
 
-const setTagStatusToApprovedIfUnset = (t: ChartTagJoin) => {
+const setTagStatusToApprovedIfUnset = (t: DbChartTagJoin) => {
     if (t.isApproved === undefined) t.isApproved = true
     return t
 }
diff --git a/adminSiteClient/PostsIndexPage.tsx b/adminSiteClient/PostsIndexPage.tsx
index 52a0663ffca..e15ae4f09cb 100644
--- a/adminSiteClient/PostsIndexPage.tsx
+++ b/adminSiteClient/PostsIndexPage.tsx
@@ -3,7 +3,7 @@ import { observer } from "mobx-react"
 import { observable, computed, action, runInAction } from "mobx"
 
 import {
-    ChartTagJoin,
+    DbChartTagJoin,
     Tag,
     buildSearchWordsFromSearchString,
     filterFunctionForSearchWords,
@@ -37,7 +37,7 @@ interface PostIndexMeta {
     authors: string[] | null
     slug: string
     updatedAtInWordpress: string | null
-    tags: ChartTagJoin[] | null
+    tags: DbChartTagJoin[] | null
     gdocSuccessorId: string | undefined
     gdocSuccessorPublished: boolean
     gdocSlugSuccessors: GDocSlugSuccessor[] | null
@@ -73,7 +73,7 @@ class PostRow extends React.Component<PostRowProps> {
             : GdocStatus.MISSING_NO_SLUG_SUCCESSOR
     }
 
-    async saveTags(tags: ChartTagJoin[]) {
+    async saveTags(tags: DbChartTagJoin[]) {
         const { post } = this.props
         const json = await this.context.admin.requestJSON(
             `/api/posts/${post.id}/setTags`,
@@ -85,7 +85,7 @@ class PostRow extends React.Component<PostRowProps> {
         }
     }
 
-    @action.bound onSaveTags(tags: ChartTagJoin[]) {
+    @action.bound onSaveTags(tags: DbChartTagJoin[]) {
         this.saveTags(tags)
     }
 
diff --git a/adminSiteClient/TagBadge.tsx b/adminSiteClient/TagBadge.tsx
index 0e146976cb7..6e7e0c680da 100644
--- a/adminSiteClient/TagBadge.tsx
+++ b/adminSiteClient/TagBadge.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { observer } from "mobx-react"
-import { KeyChartLevel, ChartTagJoin } from "@ourworldindata/utils"
+import { KeyChartLevel, DbChartTagJoin } from "@ourworldindata/utils"
 
 import { Link } from "./Link.js"
 import Tippy from "@tippyjs/react"
@@ -11,7 +11,7 @@ import { faClock } from "@fortawesome/free-solid-svg-icons"
 
 @observer
 export class TagBadge extends React.Component<{
-    tag: ChartTagJoin
+    tag: DbChartTagJoin
     onToggleKey?: () => void
     onApprove?: () => void
     searchHighlight?: (text: string) => string | JSX.Element
diff --git a/adminSiteClient/TagEditPage.tsx b/adminSiteClient/TagEditPage.tsx
index b86e0c18e3f..7019e211598 100644
--- a/adminSiteClient/TagEditPage.tsx
+++ b/adminSiteClient/TagEditPage.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import { observer } from "mobx-react"
 import { observable, computed, action, runInAction } from "mobx"
 import { Prompt, Redirect } from "react-router-dom"
-import { ChartTagJoin } from "@ourworldindata/utils"
+import { DbChartTagJoin } from "@ourworldindata/utils"
 import { AdminLayout } from "./AdminLayout.js"
 import { BindString, NumericSelectField, FieldsRow, Timeago } from "./Forms.js"
 import { DatasetList, DatasetListItem } from "./DatasetList.js"
@@ -18,8 +18,8 @@ interface TagPageData {
     updatedAt: string
     datasets: DatasetListItem[]
     charts: ChartListItem[]
-    children: ChartTagJoin[]
-    possibleParents: ChartTagJoin[]
+    children: DbChartTagJoin[]
+    possibleParents: DbChartTagJoin[]
     isBulkImport: boolean
     slug: string | null
 }
@@ -174,7 +174,7 @@ class TagEditor extends React.Component<{ tag: TagPageData }> {
                                             <TagBadge
                                                 tag={
                                                     this
-                                                        .parentTag as ChartTagJoin
+                                                        .parentTag as DbChartTagJoin
                                                 }
                                             />
                                         )}
@@ -207,7 +207,7 @@ class TagEditor extends React.Component<{ tag: TagPageData }> {
                     <section>
                         <h3>Subcategories</h3>
                         {tag.children.map((c) => (
-                            <TagBadge tag={c as ChartTagJoin} key={c.id} />
+                            <TagBadge tag={c as DbChartTagJoin} key={c.id} />
                         ))}
                     </section>
                 )}
diff --git a/adminSiteClient/TagsIndexPage.tsx b/adminSiteClient/TagsIndexPage.tsx
index d1cb66491de..e24a9dc3729 100644
--- a/adminSiteClient/TagsIndexPage.tsx
+++ b/adminSiteClient/TagsIndexPage.tsx
@@ -5,7 +5,7 @@ import * as lodash from "lodash"
 import { Redirect } from "react-router-dom"
 import { AdminLayout } from "./AdminLayout.js"
 import { FieldsRow, Modal, TextField } from "./Forms.js"
-import { Tag, ChartTagJoin } from "@ourworldindata/utils"
+import { Tag, DbChartTagJoin } from "@ourworldindata/utils"
 import { TagBadge } from "./TagBadge.js"
 import { AdminAppContext, AdminAppContextType } from "./AdminAppContext.js"
 
@@ -146,7 +146,7 @@ export class TagsIndexPage extends React.Component {
                             {parentCategories.map((parent) => (
                                 <TagBadge
                                     key={parent.id}
-                                    tag={parent as ChartTagJoin}
+                                    tag={parent as DbChartTagJoin}
                                 />
                             ))}
                             <button
diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
index e6168a72faf..64789f6c2cb 100644
--- a/adminSiteServer/apiRouter.ts
+++ b/adminSiteServer/apiRouter.ts
@@ -37,8 +37,8 @@ import {
     OwidGdocPostInterface,
     parseIntOrUndefined,
     parseToOperation,
-    PostRowEnriched,
-    PostRowWithGdocPublishStatus,
+    DbEnrichedPost,
+    DbRawPostWithGdocPublishStatus,
     SuggestedChartRevisionStatus,
     variableAnnotationAllowedColumnNamesAndTypes,
     VariableAnnotationsResponseRow,
@@ -47,10 +47,14 @@ import {
     OwidChartDimensionInterface,
     DimensionProperty,
     TaggableType,
-    ChartTagJoin,
+    DbChartTagJoin,
     OwidGdoc,
 } from "@ourworldindata/utils"
-import { GrapherInterface, grapherKeysToSerialize } from "@ourworldindata/types"
+import {
+    GrapherInterface,
+    OwidGdocLinkType,
+    grapherKeysToSerialize,
+} from "@ourworldindata/types"
 import {
     getVariableDataRoute,
     getVariableMetadataRoute,
@@ -221,7 +225,7 @@ const getReferencesByChartId = async (chartId: number): Promise<References> => {
     const permalinksPromise = wpdb.getPermalinks()
     const publishedLinksToChartPromise = Link.getPublishedLinksTo(
         slugs,
-        "grapher"
+        OwidGdocLinkType.Grapher
     )
     const explorerSlugsPromise = db.queryMysql(
         `select distinct explorerSlug from explorer_charts where chartId = ?`,
@@ -2346,7 +2350,7 @@ apiRouter.get("/posts/:postId.json", async (req: Request, res: Response) => {
         .knexTable(postsTable)
         .where({ id: postId })
         .select("*")
-        .first()) as PostRowEnriched | undefined
+        .first()) as DbEnrichedPost | undefined
     return camelCaseProperties({ ...post })
 })
 
@@ -2357,7 +2361,7 @@ apiRouter.post("/posts/:postId/createGdoc", async (req: Request) => {
         .knexTable("posts_with_gdoc_publish_status")
         .where({ id: postId })
         .select("*")
-        .first()) as PostRowWithGdocPublishStatus | undefined
+        .first()) as DbRawPostWithGdocPublishStatus | undefined
 
     if (!post) throw new JsonError(`No post found for id ${postId}`, 404)
     const existingGdocId = post.gdocSuccessorId
@@ -2419,7 +2423,7 @@ apiRouter.post("/posts/:postId/unlinkGdoc", async (req: Request) => {
         .knexTable("posts_with_gdoc_publish_status")
         .where({ id: postId })
         .select("*")
-        .first()) as PostRowWithGdocPublishStatus | undefined
+        .first()) as DbRawPostWithGdocPublishStatus | undefined
 
     if (!post) throw new JsonError(`No post found for id ${postId}`, 404)
     const existingGdocId = post.gdocSuccessorId
@@ -2657,7 +2661,7 @@ apiRouter.post(
 
 apiRouter.get(
     `/gpt/suggest-topics/${TaggableType.Charts}/:chartId.json`,
-    async (req: Request): Promise<Record<"topics", ChartTagJoin[]>> => {
+    async (req: Request): Promise<Record<"topics", DbChartTagJoin[]>> => {
         const chartId = parseIntOrUndefined(req.params.chartId)
         if (!chartId) throw new JsonError(`Invalid chart ID`, 400)
 
diff --git a/baker/SiteBaker.tsx b/baker/SiteBaker.tsx
index 3f80efb48d3..60c6a3f5086 100644
--- a/baker/SiteBaker.tsx
+++ b/baker/SiteBaker.tsx
@@ -411,8 +411,9 @@ export class SiteBaker {
 
     private async bakePosts() {
         if (!this.bakeSteps.has("wordpressPosts")) return
+        // TODO: the knex instance should be handed down as a parameter
         const alreadyPublishedViaGdocsSlugsSet =
-            await db.getSlugsWithPublishedGdocsSuccessors()
+            await db.getSlugsWithPublishedGdocsSuccessors(db.knexInstance())
 
         const postsApi = await wpdb.getPosts(
             undefined,
@@ -719,6 +720,8 @@ export class SiteBaker {
             await entriesByYearPage()
         )
 
+        const knex = db.knexInstance()
+
         const rows = (await db
             .knexTable(postsTable)
             .where({ status: "publish" })
@@ -726,7 +729,7 @@ export class SiteBaker {
             .join("post_tags", { "post_tags.post_id": "posts.id" })
             .join("tags", { "tags.id": "post_tags.tag_id" })
             .where({ "tags.name": "Entries" })
-            .select(db.knexRaw("distinct year(published_at) as year"))
+            .select(knex.raw("distinct year(published_at) as year"))
             .orderBy("year", "DESC")) as { year: number }[]
 
         const years = rows.map((r) => r.year)
diff --git a/baker/algolia/indexChartsToAlgolia.ts b/baker/algolia/indexChartsToAlgolia.ts
index 390a6ed89fc..22c3aefd4a8 100644
--- a/baker/algolia/indexChartsToAlgolia.ts
+++ b/baker/algolia/indexChartsToAlgolia.ts
@@ -4,7 +4,7 @@ import { ALGOLIA_INDEXING } from "../../settings/serverSettings.js"
 import { getAlgoliaClient } from "./configureAlgolia.js"
 import { isPathRedirectedToExplorer } from "../../explorerAdminServer/ExplorerRedirects.js"
 import { ChartRecord, SearchIndexName } from "../../site/search/searchTypes.js"
-import { KeyChartLevel, isNil } from "@ourworldindata/utils"
+import { KeyChartLevel, OwidGdocLinkType, isNil } from "@ourworldindata/utils"
 import { MarkdownTextWrap } from "@ourworldindata/components"
 import { Pageview } from "../../db/model/Pageview.js"
 import { Link } from "../../db/model/Link.js"
@@ -65,7 +65,10 @@ const getChartsRecords = async (): Promise<ChartRecord[]> => {
         if (isPathRedirectedToExplorer(`/grapher/${c.slug}`)) continue
 
         const relatedArticles = (await getRelatedArticles(c.id)) ?? []
-        const linksFromGdocs = await Link.getPublishedLinksTo(c.slug, "grapher")
+        const linksFromGdocs = await Link.getPublishedLinksTo(
+            c.slug,
+            OwidGdocLinkType.Grapher
+        )
 
         const plaintextSubtitle = isNil(c.subtitle)
             ? undefined
diff --git a/baker/algolia/indexToAlgolia.tsx b/baker/algolia/indexToAlgolia.tsx
index f6d911a53f7..402490c36e0 100644
--- a/baker/algolia/indexToAlgolia.tsx
+++ b/baker/algolia/indexToAlgolia.tsx
@@ -190,8 +190,9 @@ const getPagesRecords = async () => {
     const pageviews = await Pageview.getViewsByUrlObj()
     const gdocs = await GdocPost.getPublishedGdocs()
     const publishedGdocsBySlug = keyBy(gdocs, "slug")
+    // TODO: the knex instance should be handed down as a parameter
     const slugsWithPublishedGdocsSuccessors =
-        await db.getSlugsWithPublishedGdocsSuccessors()
+        await db.getSlugsWithPublishedGdocsSuccessors(db.knexInstance())
     const postsApi = await wpdb.getPosts(undefined, (post) => {
         // Two things can happen here:
         // 1. There's a published Gdoc with the same slug
diff --git a/baker/postUpdatedHook.ts b/baker/postUpdatedHook.ts
index 19c590e24df..4f7feb043f7 100644
--- a/baker/postUpdatedHook.ts
+++ b/baker/postUpdatedHook.ts
@@ -5,7 +5,7 @@ import { BAKE_ON_CHANGE } from "../settings/serverSettings.js"
 import { DeployQueueServer } from "./DeployQueueServer.js"
 import { exit } from "../db/cleanup.js"
 import {
-    PostRowEnriched,
+    DbEnrichedPost,
     extractFormattingOptions,
     sortBy,
     serializePostRow,
@@ -129,7 +129,7 @@ const syncPostToGrapher = async (
                       ? "1970-01-01 00:00:00"
                       : wpPost.created_at,
               formattingOptions: formattingOptions,
-          } as PostRowEnriched)
+          } as DbEnrichedPost)
         : undefined
 
     await db.knexInstance().transaction(async (transaction) => {
diff --git a/baker/siteRenderers.tsx b/baker/siteRenderers.tsx
index 9e1b2a1610d..e805c32d833 100644
--- a/baker/siteRenderers.tsx
+++ b/baker/siteRenderers.tsx
@@ -55,7 +55,7 @@ import {
     OwidGdoc,
     OwidGdocDataInsightInterface,
     extractFormattingOptions,
-    PostRowRaw,
+    DbRawPost,
 } from "@ourworldindata/utils"
 import { FormattingOptions, GrapherInterface } from "@ourworldindata/types"
 import { CountryProfileSpec } from "../site/countryProfileProjects.js"
@@ -458,7 +458,7 @@ export const entriesByYearPage = async (year?: number) => {
         .join("tags", { "tags.id": "post_tags.tag_id" })
         .where({ "tags.name": "Entries" })
         .select("title", "posts.slug", "published_at")) as Pick<
-        PostRowRaw,
+        DbRawPost,
         "title" | "slug" | "published_at"
     >[]
 
diff --git a/baker/sitemap.ts b/baker/sitemap.ts
index ce04d3ccd48..5a563c3d792 100644
--- a/baker/sitemap.ts
+++ b/baker/sitemap.ts
@@ -58,8 +58,10 @@ const explorerToSitemapUrl = (program: ExplorerProgram): SitemapUrl[] => {
 }
 
 export const makeSitemap = async (explorerAdminServer: ExplorerAdminServer) => {
+    // TODO: the knex instance should be handed down as a parameter
+    const knex = db.knexInstance()
     const alreadyPublishedViaGdocsSlugsSet =
-        await db.getSlugsWithPublishedGdocsSuccessors()
+        await db.getSlugsWithPublishedGdocsSuccessors(knex)
     const postsApi = await wpdb.getPosts(
         undefined,
         (postrow) => !alreadyPublishedViaGdocsSlugsSet.has(postrow.slug)
@@ -67,7 +69,7 @@ export const makeSitemap = async (explorerAdminServer: ExplorerAdminServer) => {
     const gdocPosts = await GdocPost.getPublishedGdocs()
     const charts = (await db
         .knexTable(Chart.table)
-        .select(db.knexRaw(`updatedAt, config->>"$.slug" AS slug`))
+        .select(knex.raw(`updatedAt, config->>"$.slug" AS slug`))
         .whereRaw('config->"$.isPublished" = true')) as {
         updatedAt: Date
         slug: string
diff --git a/db/db.ts b/db/db.ts
index fb04c286fdd..34090537fb8 100644
--- a/db/db.ts
+++ b/db/db.ts
@@ -108,7 +108,21 @@ export const knexInstance = (): Knex<any, any[]> => {
 export const knexTable = (table: string): Knex.QueryBuilder =>
     knexInstance().table(table)
 
-export const knexRaw = (str: string): Knex.Raw => knexInstance().raw(str)
+export const knexRaw = async <TRow = unknown>(
+    str: string,
+    knex: Knex<any, any[]>,
+    params?: any[]
+): Promise<TRow[]> => (await knex.raw(str, params ?? []))[0]
+
+export const knexRawFirst = async <TRow = unknown>(
+    str: string,
+    knex: Knex<any, any[]>,
+    params?: any[]
+): Promise<TRow | undefined> => {
+    const results = await knexRaw<TRow>(str, knex, params)
+    if (results.length === 0) return undefined
+    return results[0]
+}
 
 /**
  *  In the backporting workflow, the users create gdoc posts for posts. As long as these are not yet published,
@@ -116,14 +130,13 @@ export const knexRaw = (str: string): Knex.Raw => knexInstance().raw(str)
  *  baking them from the wordpress post. This funciton fetches all the slugs of posts that have been published via gdocs,
  *  to help us exclude them from the baking process.
  */
-export const getSlugsWithPublishedGdocsSuccessors = async (): Promise<
-    Set<string>
-> => {
+export const getSlugsWithPublishedGdocsSuccessors = async (
+    knex: Knex<any, any[]>
+): Promise<Set<string>> => {
     return knexRaw(
         `-- sql
             select slug from posts_with_gdoc_publish_status
-            where isGdocPublished = TRUE`
-    )
-        .then((res) => res[0])
-        .then((rows) => new Set(rows.map((row: any) => row.slug)))
+            where isGdocPublished = TRUE`,
+        knex
+    ).then((rows) => new Set(rows.map((row: any) => row.slug)))
 }
diff --git a/db/model/Chart.ts b/db/model/Chart.ts
index 8729232a1c4..100fa396887 100644
--- a/db/model/Chart.ts
+++ b/db/model/Chart.ts
@@ -17,7 +17,7 @@ import {
     KeyChartLevel,
     MultipleOwidVariableDataDimensionsMap,
     Tag,
-    ChartTagJoin,
+    DbChartTagJoin,
 } from "@ourworldindata/utils"
 import { GrapherInterface, ChartTypeName } from "@ourworldindata/types"
 import { OpenAI } from "openai"
@@ -116,7 +116,10 @@ WHERE c.config -> "$.isPublished" = true
         return await Chart.findOneBy({ id })
     }
 
-    static async setTags(chartId: number, tags: ChartTagJoin[]): Promise<void> {
+    static async setTags(
+        chartId: number,
+        tags: DbChartTagJoin[]
+    ): Promise<void> {
         await db.transaction(async (t) => {
             const tagRows = tags.map((tag) => [
                 tag.id,
diff --git a/db/model/Link.ts b/db/model/Link.ts
index 72edddb598a..da5085a20d9 100644
--- a/db/model/Link.ts
+++ b/db/model/Link.ts
@@ -11,12 +11,13 @@ import { getLinkType, getUrlTarget } from "@ourworldindata/components"
 import { OwidGdocLinkJSON, Url } from "@ourworldindata/utils"
 import { GdocBase } from "./Gdoc/GdocBase.js"
 import { formatUrls } from "../../site/formatting.js"
+import { OwidGdocLinkType } from "@ourworldindata/types"
 
 @Entity("posts_gdocs_links")
 export class Link extends BaseEntity implements OwidGdocLinkJSON {
     @PrimaryGeneratedColumn() id!: number
     @ManyToOne(() => GdocBase, (gdoc) => gdoc.id) source!: Relation<GdocBase>
-    @Column() linkType!: "gdoc" | "url" | "grapher" | "explorer"
+    @Column() linkType!: OwidGdocLinkType
     @Column() target!: string
     @Column() queryString!: string
     @Column() hash!: string
diff --git a/db/model/Post.ts b/db/model/Post.ts
index 98ec20601ab..f9a4247f844 100644
--- a/db/model/Post.ts
+++ b/db/model/Post.ts
@@ -1,17 +1,13 @@
 import * as db from "../db.js"
 import { Knex } from "knex"
-import {
-    PostRowEnriched,
-    PostRowRaw,
-    parsePostRow,
-} from "@ourworldindata/utils"
+import { DbEnrichedPost, DbRawPost, parsePostRow } from "@ourworldindata/utils"
 
 export const postsTable = "posts"
 
-export const select = <K extends keyof PostRowRaw>(
+export const select = <K extends keyof DbRawPost>(
     ...args: K[]
 ): {
-    from: (query: Knex.QueryBuilder) => Promise<Pick<PostRowRaw, K>[]>
+    from: (query: Knex.QueryBuilder) => Promise<Pick<DbRawPost, K>[]>
 } => ({
     from: (query) => query.select(...args) as any,
 })
@@ -66,12 +62,12 @@ export const setTagsForPost = async (
 
 export const getPostRawBySlug = async (
     slug: string
-): Promise<PostRowRaw | undefined> =>
+): Promise<DbRawPost | undefined> =>
     (await db.knexTable("posts").where({ slug: slug }))[0]
 
 export const getPostEnrichedBySlug = async (
     slug: string
-): Promise<PostRowEnriched | undefined> => {
+): Promise<DbEnrichedPost | undefined> => {
     const post = await getPostRawBySlug(slug)
     if (!post) return undefined
     return parsePostRow(post)
diff --git a/db/refreshPageviewsFromDatasette.ts b/db/refreshPageviewsFromDatasette.ts
index 4e485d89a8b..745a436a5af 100644
--- a/db/refreshPageviewsFromDatasette.ts
+++ b/db/refreshPageviewsFromDatasette.ts
@@ -34,9 +34,14 @@ async function downloadAndInsertCSV(): Promise<void> {
     console.log("Parsed CSV data:", onlyValidRows.length, "rows")
     console.log("Columns:", parsedData.meta.fields)
 
-    await db.knexRaw("TRUNCATE TABLE analytics_pageviews")
+    // TODO: this instance should be handed down as a parameter
+    const knex = db.knexInstance()
 
-    await db.knexInstance().batchInsert("analytics_pageviews", onlyValidRows)
+    await knex.transaction(async (trx) => {
+        await db.knexRaw("TRUNCATE TABLE analytics_pageviews", trx)
+
+        await trx.batchInsert("analytics_pageviews", onlyValidRows)
+    })
     console.log("CSV data inserted successfully!")
 }
 
diff --git a/db/sql-ts/README.md b/db/sql-ts/README.md
new file mode 100644
index 00000000000..97219dd9882
--- /dev/null
+++ b/db/sql-ts/README.md
@@ -0,0 +1,9 @@
+## Generating types from the MySQL schema
+
+This folder contains the two helper files to use SQL-TS with our database. SQL-TS is a project that generates typescript types from a mysql database. This was useful in late 2023 to create parity between the tables we have currently in MySQL and the type definitions we have in our codebase.
+
+The outcome of running this tool is the file `db/sql-ts/Database.ts` that contains one typescript interface for each table in the schema. The configuration lives in `db/sql-ts/sql-ts-config.json`, the handlebars template file that is filled with the type info lives in `db/sql-ts/template.handlebars`.
+
+## Running the tool
+
+To run the tool, check the config in `db/sql-ts/sql-ts-config.json` and then run `yarn generateDbTypes` in the root folder.
diff --git a/db/sql-ts/sql-ts-config.json b/db/sql-ts/sql-ts-config.json
new file mode 100644
index 00000000000..5114f758d96
--- /dev/null
+++ b/db/sql-ts/sql-ts-config.json
@@ -0,0 +1,18 @@
+{
+    "client": "mysql",
+    "connection": {
+        "host": "localhost",
+        "user": "grapher",
+        "password": "grapher",
+        "database": "grapher",
+        "port": 3307
+    },
+    "schemas": ["grapher"],
+    "typeMap": {
+        "JsonString": "json"
+    },
+    "filename": "db/sql-ts/Database",
+    "template": "db/sql-ts/template.handlebars",
+    "interfaceNameFormat": "${table}Row",
+    "tableNameCasing": "pascal"
+}
diff --git a/db/sql-ts/template.handlebars b/db/sql-ts/template.handlebars
new file mode 100644
index 00000000000..564b8b202dc
--- /dev/null
+++ b/db/sql-ts/template.handlebars
@@ -0,0 +1,47 @@
+{{#*inline "dataPartial"}}
+{{#each tables as |table|}}
+{{#if comment}}
+
+/** {{comment}} */
+{{/if}}
+export const {{interfaceName}}TableName = "{{name}}"
+export interface {{interfaceName}}ForInsert {{#if extends}}extends {{extends}} {{/if}}{
+  {{#each additionalProperties as |prop|}}
+  {{prop}}
+  {{/each}}
+  {{#each columns}}
+  {{#if comment}}
+
+  /** {{comment}} */
+  {{/if}}
+  '{{propertyName}}'{{#if optional}}?{{/if}}: {{propertyType}}{{#if nullable}} | null{{/if}};
+  {{/each}}
+}
+export type {{interfaceName}} = Required<{{interfaceName}}ForInsert>
+
+
+{{/each}}
+{{#each enums as |enum|}}
+export enum {{convertedName}} {
+{{#each values as |value|}}
+  '{{value.convertedKey}}' = {{handleNumeric value.value}},
+{{/each}}
+}
+{{/each}}
+{{/inline}}
+/*
+* This file was generated by a tool.
+* Rerun sql-ts to regenerate this file.
+*/
+type JsonString = string
+{{#if config.schemaAsNamespace}}
+{{#each grouped as |group key|}}
+export namespace {{key}} {
+  {{> dataPartial group}}
+}
+{{/each}}
+{{else}}
+{{#each grouped as |group key|}}
+{{> dataPartial group }}
+{{/each}}
+{{/if}}
diff --git a/db/syncPostsToGrapher.ts b/db/syncPostsToGrapher.ts
index 560edba5e2a..98b82cea265 100644
--- a/db/syncPostsToGrapher.ts
+++ b/db/syncPostsToGrapher.ts
@@ -8,7 +8,7 @@ import {
     extractFormattingOptions,
     groupBy,
     keyBy,
-    PostRowEnriched,
+    DbEnrichedPost,
     sortBy,
     serializePostRow,
 } from "@ourworldindata/utils"
@@ -118,7 +118,7 @@ export const postLinkCompareStringGenerator = (item: PostLink): string =>
     `${item.linkType} - ${item.target} - ${item.hash} - ${item.queryString}`
 
 export function getLinksToAddAndRemoveForPost(
-    post: PostRowEnriched,
+    post: DbEnrichedPost,
     existingLinksForPost: PostLink[],
     content: string,
     postId: number
@@ -314,7 +314,7 @@ const syncPostsToGrapher = async (): Promise<void> => {
                 post.created_at === zeroDateString ? null : post.created_at,
             formattingOptions: formattingOptions,
         }
-    }) as PostRowEnriched[]
+    }) as DbEnrichedPost[]
     const postLinks = await PostLink.find()
     const postLinksById = groupBy(postLinks, (link: PostLink) => link.sourceId)
 
diff --git a/db/tests/basic.test.ts b/db/tests/basic.test.ts
index 7b669dc0076..a048075e89a 100644
--- a/db/tests/basic.test.ts
+++ b/db/tests/basic.test.ts
@@ -88,3 +88,9 @@ test("timestamps are automatically created and updated", async () => {
         }
     }
 })
+
+test("knex interface", async () => {
+    if (!knexInstance) throw new Error("Knex connection not initialized")
+    // const result = await knexInstance<
+    // expect(result.rows[0].solution).toBe(2)
+})
diff --git a/db/wpdb.ts b/db/wpdb.ts
index 64e7682e421..cf3ad9e1629 100644
--- a/db/wpdb.ts
+++ b/db/wpdb.ts
@@ -39,7 +39,7 @@ import {
     Tag,
     OwidGdocPostInterface,
 } from "@ourworldindata/utils"
-import { Topic } from "@ourworldindata/types"
+import { OwidGdocLinkType, Topic } from "@ourworldindata/types"
 import {
     getContentGraph,
     WPPostTypeToGraphDocumentType,
@@ -707,7 +707,7 @@ export const getRelatedArticles = async (
     const chart = chartRecord.payload.records[0]
     const publishedLinksToChart = await Link.getPublishedLinksTo(
         [chart.slug],
-        "grapher"
+        OwidGdocLinkType.Grapher
     )
     const publishedGdocPostsThatReferenceChart: PostReference[] =
         publishedLinksToChart
diff --git a/package.json b/package.json
index dddf4d8e8f7..4a152d1ae5f 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,8 @@
         "testCypress": "yarn cypress open --project devTools --config-file cypress/cypress.json",
         "testLint": "eslint .",
         "testPrettierAll": "yarn prettier --check \"**/*.{tsx,ts,jsx,js,json,md,html,css,scss,yml}\"",
-        "testJest": "lerna run buildTests && jest"
+        "testJest": "lerna run buildTests && jest",
+        "generateDbTypes": "npx @rmp135/sql-ts -c db/sql-ts/sql-ts-config.json"
     },
     "dependencies": {
         "@algolia/autocomplete-js": "^1.10.0",
@@ -156,7 +157,7 @@
         "js-yaml": "^4.1.0",
         "json8-pointer": "^1.0.6",
         "jsonwebtoken": "^9.0.0",
-        "knex": "^2.4.2",
+        "knex": "^3.1.0",
         "lerna": "^7.4.2",
         "lodash": "^4.17.20",
         "mathjax-full": "^3.1.0",
@@ -230,6 +231,7 @@
     },
     "devDependencies": {
         "@cloudflare/workers-types": "^4.20230821.0",
+        "@rmp135/sql-ts": "^1.18.1",
         "@stripe/stripe-js": "^1.54.0",
         "@testing-library/jest-dom": "^6.1.3",
         "@testing-library/react": "^12.1.5",
diff --git a/packages/@ourworldindata/components/src/GdocsUtils.ts b/packages/@ourworldindata/components/src/GdocsUtils.ts
index ac040b0a8f2..65bb5724479 100644
--- a/packages/@ourworldindata/components/src/GdocsUtils.ts
+++ b/packages/@ourworldindata/components/src/GdocsUtils.ts
@@ -1,24 +1,24 @@
+import { OwidGdocLinkType } from "@ourworldindata/types"
 import {
     spansToUnformattedPlainText,
     gdocUrlRegex,
-    OwidGdocLinkJSON,
     Span,
     Url,
 } from "@ourworldindata/utils"
 import urlSlug from "url-slug"
 
-export function getLinkType(urlString: string): OwidGdocLinkJSON["linkType"] {
+export function getLinkType(urlString: string): OwidGdocLinkType {
     const url = Url.fromURL(urlString)
     if (url.isGoogleDoc) {
-        return "gdoc"
+        return OwidGdocLinkType.Gdoc
     }
     if (url.isGrapher) {
-        return "grapher"
+        return OwidGdocLinkType.Grapher
     }
     if (url.isExplorer) {
-        return "explorer"
+        return OwidGdocLinkType.Explorer
     }
-    return "url"
+    return OwidGdocLinkType.Url
 }
 
 export function checkIsInternalLink(url: string): boolean {
diff --git a/packages/@ourworldindata/types/src/dbTypes/AnalyticsPageviews.ts b/packages/@ourworldindata/types/src/dbTypes/AnalyticsPageviews.ts
new file mode 100644
index 00000000000..b7bc8b5d8fb
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/AnalyticsPageviews.ts
@@ -0,0 +1,8 @@
+export const AnalyticsPageviewsTableName = "analytics_pageviews"
+export interface DbPlainAnalyticsPageview {
+    day: Date
+    url: string
+    views_14d: number
+    views_365d: number
+    views_7d: number
+}
diff --git a/packages/@ourworldindata/types/src/dbTypes/ChartDimensions.ts b/packages/@ourworldindata/types/src/dbTypes/ChartDimensions.ts
new file mode 100644
index 00000000000..c4708feb6a0
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/ChartDimensions.ts
@@ -0,0 +1,11 @@
+export const ChartDimensionsTableName = "chart_dimensions"
+export interface DbInsertChartDimension {
+    chartId: number
+    createdAt?: Date
+    id?: number
+    order: number
+    property: string
+    updatedAt?: Date | null
+    variableId: number
+}
+export type DbPlainChartDimension = Required<DbInsertChartDimension>
diff --git a/packages/@ourworldindata/types/src/dbTypes/ChartRevisions.ts b/packages/@ourworldindata/types/src/dbTypes/ChartRevisions.ts
new file mode 100644
index 00000000000..57db30588d3
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/ChartRevisions.ts
@@ -0,0 +1,32 @@
+import { JsonString } from "../domainTypes/Various.js"
+import { GrapherInterface } from "../grapherTypes/GrapherTypes.js"
+import { parseChartConfig, serializeChartConfig } from "./Charts.js"
+
+export const ChartRevisionsTableName = "chart_revisions"
+export interface DbInsertChartRevision {
+    chartId?: number | null
+    config?: JsonString | null
+    createdAt?: Date
+    id?: string
+    updatedAt?: Date | null
+    userId?: number | null
+}
+export type DbRawChartRevision = Required<DbInsertChartRevision>
+export type DbEnrichedChartRevision = Omit<DbRawChartRevision, "config"> & {
+    config: GrapherInterface | null
+}
+
+export function parseChartRevisionsRow(
+    row: DbRawChartRevision
+): DbEnrichedChartRevision {
+    return { ...row, config: row.config ? parseChartConfig(row.config) : null }
+}
+
+export function serializeChartRevisionsRow(
+    row: DbEnrichedChartRevision
+): DbRawChartRevision {
+    return {
+        ...row,
+        config: row.config ? serializeChartConfig(row.config) : null,
+    }
+}
diff --git a/packages/@ourworldindata/types/src/dbTypes/ChartSlugRedirects.ts b/packages/@ourworldindata/types/src/dbTypes/ChartSlugRedirects.ts
new file mode 100644
index 00000000000..eb6f43690c8
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/ChartSlugRedirects.ts
@@ -0,0 +1,9 @@
+export const ChartSlugRedirectsTableName = "chart_slug_redirects"
+export interface DbInsertChartSlugRedirect {
+    chart_id: number
+    createdAt?: Date
+    id?: number
+    slug: string
+    updatedAt?: Date | null
+}
+export type DbPlainChartSlugRedirect = Required<DbInsertChartSlugRedirect>
diff --git a/packages/@ourworldindata/types/src/dbTypes/ChartTags.ts b/packages/@ourworldindata/types/src/dbTypes/ChartTags.ts
index 5634d0ed383..c0705b302e7 100644
--- a/packages/@ourworldindata/types/src/dbTypes/ChartTags.ts
+++ b/packages/@ourworldindata/types/src/dbTypes/ChartTags.ts
@@ -1,19 +1,20 @@
 import { KeyChartLevel } from "../grapherTypes/GrapherTypes.js"
-import { Tag } from "./Tags.js"
+import { DbPlainTag } from "./Tags.js"
 
-/** the entity in the `chart_tags` table */
-export interface ChartTag {
-    id: number
-    tagId: string
-    keyChartLevel?: KeyChartLevel
-    createdAt: Date
-    updatedAt: Date | null
+export const ChartTagsTableName = "chart_tags"
+export interface DbInsertChartTag {
+    chartId: number
+    createdAt?: Date
     isApproved?: boolean
+    keyChartLevel?: KeyChartLevel
+    tagId: number
+    updatedAt?: Date | null
 }
+export type DbPlainChartTag = Required<DbInsertChartTag>
 
 /**
  * A common minimal union of the tags and chart_tags entities.
  * Used anywhere we're using the TagBadge component.
  */
-export type ChartTagJoin = Pick<Tag, "id" | "name"> &
-    Pick<ChartTag, "isApproved" | "keyChartLevel">
+export type DbChartTagJoin = Pick<DbPlainTag, "id" | "name"> &
+    Partial<Pick<DbPlainChartTag, "isApproved" | "keyChartLevel">>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Charts.ts b/packages/@ourworldindata/types/src/dbTypes/Charts.ts
new file mode 100644
index 00000000000..cecb8ba6b02
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Charts.ts
@@ -0,0 +1,42 @@
+import { JsonString } from "../domainTypes/Various.js"
+import { GrapherInterface } from "../grapherTypes/GrapherTypes.js"
+
+export const ChartsTableName = "charts"
+export interface DbInsertChart {
+    config: JsonString
+    createdAt?: Date
+    id?: number
+    is_indexable?: number
+    isExplorable?: number
+    lastEditedAt: Date
+    lastEditedByUserId: number
+    publishedAt?: Date | null
+    publishedByUserId?: number | null
+    slug?: string | null
+    type?: string | null
+    updatedAt?: Date | null
+}
+export type DbRawChart = Required<DbInsertChart>
+
+export type DbEnrichedChart = Omit<DbRawChart, "config"> & {
+    config: GrapherInterface
+}
+
+export function parseChartConfig(config: JsonString): GrapherInterface {
+    return JSON.parse(config)
+}
+
+export function serializeChartConfig(config: GrapherInterface): JsonString {
+    return JSON.stringify(config)
+}
+
+export function parseChartsRow(row: DbRawChart): DbEnrichedChart {
+    return { ...row, config: parseChartConfig(row.config) }
+}
+
+export function serializeChartsRow(row: DbEnrichedChart): DbRawChart {
+    return {
+        ...row,
+        config: serializeChartConfig(row.config),
+    }
+}
diff --git a/packages/@ourworldindata/types/src/dbTypes/CountryLatestData.ts b/packages/@ourworldindata/types/src/dbTypes/CountryLatestData.ts
new file mode 100644
index 00000000000..7932b2a1b5c
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/CountryLatestData.ts
@@ -0,0 +1,8 @@
+export const CountryLatestDataTableName = "country_latest_data"
+export interface DbInsertCountryLatestData {
+    country_code?: string | null
+    value?: string | null
+    variable_id?: number | null
+    year?: number | null
+}
+export type DbPlainCountryLatestData = Required<DbInsertCountryLatestData>
diff --git a/packages/@ourworldindata/types/src/dbTypes/DatasetFiles.ts b/packages/@ourworldindata/types/src/dbTypes/DatasetFiles.ts
new file mode 100644
index 00000000000..87b5529c983
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/DatasetFiles.ts
@@ -0,0 +1,9 @@
+export const DatasetFilesTableName = "dataset_files"
+export interface DbInsertDatasetFile {
+    createdAt?: Date
+    datasetId: number
+    file: any
+    filename: string
+    updatedAt?: Date | null
+}
+export type DbPlainDatasetFile = Required<DbInsertDatasetFile>
diff --git a/packages/@ourworldindata/types/src/dbTypes/DatasetTags.ts b/packages/@ourworldindata/types/src/dbTypes/DatasetTags.ts
new file mode 100644
index 00000000000..fe4337d43da
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/DatasetTags.ts
@@ -0,0 +1,8 @@
+export const DatasetTagsTableName = "dataset_tags"
+export interface DbInsertDatasetTag {
+    createdAt?: Date
+    datasetId: number
+    tagId: number
+    updatedAt?: Date | null
+}
+export type DbPlainDatasetTag = Required<DbInsertDatasetTag>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Datasets.ts b/packages/@ourworldindata/types/src/dbTypes/Datasets.ts
new file mode 100644
index 00000000000..4bb4c01579d
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Datasets.ts
@@ -0,0 +1,22 @@
+export const DatasetsTableName = "datasets"
+export interface DbInsertDataset {
+    createdAt?: Date
+    createdByUserId: number
+    dataEditedAt: Date
+    dataEditedByUserId: number
+    description: string
+    id?: number
+    isArchived?: number
+    isPrivate?: number
+    metadataEditedAt: Date
+    metadataEditedByUserId: number
+    name?: string | null
+    namespace: string
+    nonRedistributable?: number
+    shortName?: string | null
+    sourceChecksum?: string | null
+    updatedAt?: Date | null
+    updatePeriodDays?: number | null
+    version?: string | null
+}
+export type DbPlainDataset = Required<DbInsertDataset>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Entities.ts b/packages/@ourworldindata/types/src/dbTypes/Entities.ts
new file mode 100644
index 00000000000..a4f5103ec25
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Entities.ts
@@ -0,0 +1,11 @@
+export const EntitiesTableName = "entities"
+export interface DbInsertEntity {
+    code?: string | null
+    createdAt?: Date
+    displayName: string
+    id?: number
+    name: string
+    updatedAt?: Date | null
+    validated: number
+}
+export type DbPlainEntity = Required<DbInsertEntity>
diff --git a/packages/@ourworldindata/types/src/dbTypes/ExplorerCharts.ts b/packages/@ourworldindata/types/src/dbTypes/ExplorerCharts.ts
new file mode 100644
index 00000000000..91ccb7fedda
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/ExplorerCharts.ts
@@ -0,0 +1,7 @@
+export const ExplorerChartsTableName = "explorer_charts"
+export interface DbInsertExplorerChart {
+    chartId: number
+    explorerSlug: string
+    id?: number
+}
+export type DbPlainExplorerChart = Required<DbInsertExplorerChart>
diff --git a/packages/@ourworldindata/types/src/dbTypes/ExplorerVariables.ts b/packages/@ourworldindata/types/src/dbTypes/ExplorerVariables.ts
new file mode 100644
index 00000000000..b21df8962af
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/ExplorerVariables.ts
@@ -0,0 +1,7 @@
+export const ExplorerVariablesTableName = "explorer_variables"
+export interface DbInsertExplorerVariable {
+    explorerSlug: string
+    id?: number
+    variableId: number
+}
+export type DbPlainExplorerVariable = Required<DbInsertExplorerVariable>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Explorers.ts b/packages/@ourworldindata/types/src/dbTypes/Explorers.ts
new file mode 100644
index 00000000000..cafe0a7809e
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Explorers.ts
@@ -0,0 +1,12 @@
+import { JsonString } from "../domainTypes/Various.js"
+
+export const ExplorersTableName = "explorers"
+export interface DbInsertExplorer {
+    config: JsonString
+    createdAt?: Date | null
+    isPublished: number
+    slug: string
+    updatedAt?: Date | null
+}
+export type DbPlainExplorer = Required<DbInsertExplorer>
+// TODO: add enriched type and type config properly
diff --git a/packages/@ourworldindata/types/src/dbTypes/Images.ts b/packages/@ourworldindata/types/src/dbTypes/Images.ts
new file mode 100644
index 00000000000..8f0c8b26038
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Images.ts
@@ -0,0 +1,10 @@
+export const ImagesTableName = "images"
+export interface DbInsertImage {
+    defaultAlt: string
+    filename: string
+    googleId: string
+    id?: number
+    originalWidth?: number | null
+    updatedAt?: string | null
+}
+export type DbPlainImage = Required<DbInsertImage>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Namespaces.ts b/packages/@ourworldindata/types/src/dbTypes/Namespaces.ts
new file mode 100644
index 00000000000..89bad8fc71a
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Namespaces.ts
@@ -0,0 +1,10 @@
+export const NamespacesTableName = "namespaces"
+export interface DbInsertNamespace {
+    createdAt?: Date
+    description?: string | null
+    id?: number
+    isArchived?: number
+    name: string
+    updatedAt?: Date | null
+}
+export type DbPlainNamespace = Required<DbInsertNamespace>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Origins.ts b/packages/@ourworldindata/types/src/dbTypes/Origins.ts
new file mode 100644
index 00000000000..0e3c146cb8a
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Origins.ts
@@ -0,0 +1,33 @@
+import { JsonString } from "../domainTypes/Various.js"
+import { License, parseLicense, serializeLicense } from "./Variables.js"
+
+export const OriginsTableName = "origins"
+export interface DbInsertOrigin {
+    attribution?: string | null
+    attributionShort?: string | null
+    citationFull?: string | null
+    dateAccessed?: Date | null
+    datePublished?: string | null
+    description?: string | null
+    descriptionSnapshot?: string | null
+    id?: number
+    license?: JsonString | null
+    producer?: string | null
+    title?: string | null
+    titleSnapshot?: string | null
+    urlDownload?: string | null
+    urlMain?: string | null
+    versionProducer?: string | null
+}
+export type DbRawOrigin = Required<DbInsertOrigin>
+export type DbEnrichedOrigin = Omit<DbRawOrigin, "license"> & {
+    license: License | null
+}
+
+export function parseOriginsRow(row: DbRawOrigin): DbEnrichedOrigin {
+    return { ...row, license: parseLicense(row.license) }
+}
+
+export function serializeOriginsRow(row: DbEnrichedOrigin): DbRawOrigin {
+    return { ...row, license: serializeLicense(row.license) }
+}
diff --git a/packages/@ourworldindata/types/src/dbTypes/OriginsVariables.ts b/packages/@ourworldindata/types/src/dbTypes/OriginsVariables.ts
new file mode 100644
index 00000000000..bfbdd676c7a
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/OriginsVariables.ts
@@ -0,0 +1,7 @@
+export const OriginsVariablesTableName = "origins_variables"
+export interface DbInsertOriginsVariable {
+    displayOrder?: number
+    originId: number
+    variableId: number
+}
+export type DbPlainOriginVariable = Required<DbInsertOriginsVariable>
diff --git a/packages/@ourworldindata/types/src/dbTypes/PostTags.ts b/packages/@ourworldindata/types/src/dbTypes/PostTags.ts
index f96a9b8cf07..6ed13e6fbdc 100644
--- a/packages/@ourworldindata/types/src/dbTypes/PostTags.ts
+++ b/packages/@ourworldindata/types/src/dbTypes/PostTags.ts
@@ -1,7 +1,8 @@
-/** the entity in the `post_tags` table */
-export interface PostTag {
+export const PostTagsTableName = "post_tags"
+export interface DbInsertPostTag {
+    createdAt?: Date
     post_id: number
     tag_id: number
-    createdAt: Date
-    updatedAt: Date | null
+    updatedAt?: Date | null
 }
+export type DbPlainPostTag = Required<DbInsertPostTag>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Posts.ts b/packages/@ourworldindata/types/src/dbTypes/Posts.ts
index ded3dc74a4a..5eae3c6c3a4 100644
--- a/packages/@ourworldindata/types/src/dbTypes/Posts.ts
+++ b/packages/@ourworldindata/types/src/dbTypes/Posts.ts
@@ -7,37 +7,79 @@ import {
     OwidGdocPostInterface,
 } from "../gdocTypes/Gdoc.js"
 
-export interface PostRowPlainFields {
+export const PostsTableName = "posts"
+export interface DbInsertPost {
     id: number
     title: string
     slug: string
     type: WP_PostType
     status: string
     content: string
-    published_at: Date | null
-    updated_at: Date | null
-    updated_at_in_wordpress: Date | null
-    gdocSuccessorId: string | null
-    excerpt: string | null
-    created_at_in_wordpress: Date | null
+    published_at?: Date | null
+    updated_at?: Date | null
+    updated_at_in_wordpress?: Date | null
+    gdocSuccessorId?: string | null
+    excerpt?: string | null
+    created_at_in_wordpress?: Date | null
     featured_image: string
+    markdown: string
+    authors?: string | null
+    formattingOptions?: string | null
+    archieml?: string | null
+    archieml_update_statistics?: string | null
 }
-
-export interface PostRowUnparsedFields {
-    authors: string | null
-    formattingOptions: string | null
-    archieml: string | null
-    archieml_update_statistics: string | null
-}
-
-export interface PostRowParsedFields {
+export type DbRawPost = Required<DbInsertPost>
+export type DbEnrichedPost = Omit<
+    DbRawPost,
+    "authors" | "formattingOptions" | "archieml" | "archieml_update_statistics"
+> & {
     authors: string[] | null
     formattingOptions: FormattingOptions | null
     archieml: OwidGdocPostInterface | null
     archieml_update_statistics: OwidArticleBackportingStatistics | null
 }
-export type PostRowRaw = PostRowPlainFields & PostRowUnparsedFields
-export type PostRowEnriched = PostRowPlainFields & PostRowParsedFields
-export interface PostRowWithGdocPublishStatus extends PostRowRaw {
+export interface DbRawPostWithGdocPublishStatus extends DbRawPost {
     isGdocPublished: boolean
 }
+
+export function parsePostFormattingOptions(
+    formattingOptions: string
+): FormattingOptions {
+    return JSON.parse(formattingOptions)
+}
+
+export function parsePostAuthors(authors: string): string[] {
+    const authorsJson = JSON.parse(authors)
+    return authorsJson
+}
+
+export function parsePostArchieml(archieml: string): any {
+    // TODO: validation would be nice here
+    return JSON.parse(archieml)
+}
+
+export function parsePostRow(postRow: DbRawPost): DbEnrichedPost {
+    return {
+        ...postRow,
+        authors: postRow.authors ? parsePostAuthors(postRow.authors) : null,
+        formattingOptions: postRow.formattingOptions
+            ? parsePostFormattingOptions(postRow.formattingOptions)
+            : null,
+        archieml: postRow.archieml ? parsePostArchieml(postRow.archieml) : null,
+        archieml_update_statistics: postRow.archieml_update_statistics
+            ? JSON.parse(postRow.archieml_update_statistics)
+            : null,
+    }
+}
+
+export function serializePostRow(postRow: DbEnrichedPost): DbRawPost {
+    return {
+        ...postRow,
+        authors: JSON.stringify(postRow.authors),
+        formattingOptions: JSON.stringify(postRow.formattingOptions),
+        archieml: JSON.stringify(postRow.archieml),
+        archieml_update_statistics: JSON.stringify(
+            postRow.archieml_update_statistics
+        ),
+    }
+}
diff --git a/packages/@ourworldindata/types/src/dbTypes/PostsGdocs.ts b/packages/@ourworldindata/types/src/dbTypes/PostsGdocs.ts
new file mode 100644
index 00000000000..47e2601fe7a
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/PostsGdocs.ts
@@ -0,0 +1,65 @@
+import { BreadcrumbItem } from "../domainTypes/Site.js"
+import { JsonString } from "../domainTypes/Various.js"
+import {
+    OwidGdocContent,
+    OwidGdocPublicationContext,
+} from "../gdocTypes/Gdoc.js"
+
+export const PostsGdocsTableName = "posts_gdocs"
+export interface DbInsertPostGdoc {
+    breadcrumbs?: JsonString | null
+    content: JsonString
+    createdAt: Date
+    id: string
+    markdown?: string | null
+    publicationContext?: OwidGdocPublicationContext
+    published: number
+    publishedAt?: Date | null
+    revisionId?: string | null
+    slug: string
+    updatedAt?: Date | null
+}
+export type DbRawPostGdoc = Required<DbInsertPostGdoc>
+export type DbEnrichedPostGdoc = Omit<
+    DbRawPostGdoc,
+    "content" | "breadcrumbs"
+> & {
+    content: OwidGdocContent
+    breadcrumbs: BreadcrumbItem[] | null
+}
+
+export function parsePostGdocContent(content: JsonString): OwidGdocContent {
+    return JSON.parse(content)
+}
+
+export function serializePostGdocContent(content: OwidGdocContent): JsonString {
+    return JSON.stringify(content)
+}
+
+export function parsePostsGdocsBreadcrumbs(
+    breadcrumbs: JsonString | null
+): BreadcrumbItem[] | null {
+    return breadcrumbs ? JSON.parse(breadcrumbs) : null
+}
+
+export function serializePostsGdocsBreadcrumbs(
+    breadcrumbs: BreadcrumbItem[] | null
+): JsonString | null {
+    return breadcrumbs ? JSON.stringify(breadcrumbs) : null
+}
+
+export function parsePostsGdocsRow(row: DbRawPostGdoc): DbEnrichedPostGdoc {
+    return {
+        ...row,
+        content: parsePostGdocContent(row.content),
+        breadcrumbs: parsePostsGdocsBreadcrumbs(row.breadcrumbs),
+    }
+}
+
+export function serializePostsGdocsRow(row: DbEnrichedPostGdoc): DbRawPostGdoc {
+    return {
+        ...row,
+        content: serializePostGdocContent(row.content),
+        breadcrumbs: serializePostsGdocsBreadcrumbs(row.breadcrumbs),
+    }
+}
diff --git a/packages/@ourworldindata/types/src/dbTypes/PostsGdocsLinks.ts b/packages/@ourworldindata/types/src/dbTypes/PostsGdocsLinks.ts
new file mode 100644
index 00000000000..2d0e914f02e
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/PostsGdocsLinks.ts
@@ -0,0 +1,14 @@
+import { OwidGdocLinkType } from "../gdocTypes/Gdoc.js"
+
+export const PostsGdocsLinksTableName = "posts_gdocs_links"
+export interface DbInsertPostGdocLink {
+    componentType: string
+    hash: string
+    id?: number
+    linkType?: OwidGdocLinkType | null
+    queryString: string
+    sourceId?: string | null
+    target: string
+    text: string
+}
+export type DbPlainPostGdocLink = Required<DbInsertPostGdocLink>
diff --git a/packages/@ourworldindata/types/src/dbTypes/PostsGdocsVariablesFaqs.ts b/packages/@ourworldindata/types/src/dbTypes/PostsGdocsVariablesFaqs.ts
new file mode 100644
index 00000000000..d9fbf8c9171
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/PostsGdocsVariablesFaqs.ts
@@ -0,0 +1,8 @@
+export const PostsGdocsVariablesFaqsTableName = "posts_gdocs_variables_faqs"
+export interface DbInsertPostGdocVariableFaq {
+    displayOrder?: number
+    fragmentId: string
+    gdocId: string
+    variableId: number
+}
+export type DbPlainPostGdocVariableFaq = Required<DbInsertPostGdocVariableFaq>
diff --git a/packages/@ourworldindata/types/src/dbTypes/PostsGdocsXImages.ts b/packages/@ourworldindata/types/src/dbTypes/PostsGdocsXImages.ts
new file mode 100644
index 00000000000..3c447ab9d0c
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/PostsGdocsXImages.ts
@@ -0,0 +1,7 @@
+export const PostsGdocsXImagesTableName = "posts_gdocs_x_images"
+export interface DbInsertPostGdocXImage {
+    gdocId: string
+    id?: number
+    imageId: number
+}
+export type DbPlainPostGdocXImage = Required<DbInsertPostGdocXImage>
diff --git a/packages/@ourworldindata/types/src/dbTypes/PostsGdocsXTags.ts b/packages/@ourworldindata/types/src/dbTypes/PostsGdocsXTags.ts
new file mode 100644
index 00000000000..b458ae32237
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/PostsGdocsXTags.ts
@@ -0,0 +1,6 @@
+export const PostsGdocsXTagsTableName = "posts_gdocs_x_tags"
+export interface DbInsertPostGdocXTag {
+    gdocId: string
+    tagId: number
+}
+export type DbPlainPostGdocXTag = Required<DbInsertPostGdocXTag>
diff --git a/packages/@ourworldindata/types/src/dbTypes/PostsLinks.ts b/packages/@ourworldindata/types/src/dbTypes/PostsLinks.ts
new file mode 100644
index 00000000000..a16b7a08ff9
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/PostsLinks.ts
@@ -0,0 +1,14 @@
+import { OwidGdocLinkType } from "../gdocTypes/Gdoc.js"
+
+export const PostsLinksTableName = "posts_links"
+export interface DbInsertPostLink {
+    componentType: string
+    hash: string
+    id?: number
+    linkType?: OwidGdocLinkType | null
+    queryString: string
+    sourceId: number
+    target: string
+    text: string
+}
+export type DbPlainPostLink = Required<DbInsertPostLink>
diff --git a/packages/@ourworldindata/types/src/dbTypes/PostsUtilities.ts b/packages/@ourworldindata/types/src/dbTypes/PostsUtilities.ts
deleted file mode 100644
index 861f4f49b36..00000000000
--- a/packages/@ourworldindata/types/src/dbTypes/PostsUtilities.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { FormattingOptions } from "../wordpressTypes/WordpressTypes.js"
-import { PostRowEnriched, PostRowRaw } from "./Posts.js"
-
-export function parsePostFormattingOptions(
-    formattingOptions: string
-): FormattingOptions {
-    return JSON.parse(formattingOptions)
-}
-
-export function parsePostAuthors(authors: string): string[] {
-    const authorsJson = JSON.parse(authors)
-    return authorsJson
-}
-
-export function parsePostArchieml(archieml: string): any {
-    // TODO: validation would be nice here
-    return JSON.parse(archieml)
-}
-
-export function parsePostRow(postRow: PostRowRaw): PostRowEnriched {
-    return {
-        ...postRow,
-        authors: postRow.authors ? parsePostAuthors(postRow.authors) : null,
-        formattingOptions: postRow.formattingOptions
-            ? parsePostFormattingOptions(postRow.formattingOptions)
-            : null,
-        archieml: postRow.archieml ? parsePostArchieml(postRow.archieml) : null,
-        archieml_update_statistics: postRow.archieml_update_statistics
-            ? JSON.parse(postRow.archieml_update_statistics)
-            : null,
-    }
-}
-
-export function serializePostRow(postRow: PostRowEnriched): PostRowRaw {
-    return {
-        ...postRow,
-        authors: JSON.stringify(postRow.authors),
-        formattingOptions: JSON.stringify(postRow.formattingOptions),
-        archieml: JSON.stringify(postRow.archieml),
-        archieml_update_statistics: JSON.stringify(
-            postRow.archieml_update_statistics
-        ),
-    }
-}
diff --git a/packages/@ourworldindata/types/src/dbTypes/Sessions.ts b/packages/@ourworldindata/types/src/dbTypes/Sessions.ts
new file mode 100644
index 00000000000..6396be2d4f4
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Sessions.ts
@@ -0,0 +1,7 @@
+export const SessionsTableName = "sessions"
+export interface DbInsertSession {
+    expire_date: Date
+    session_data: string
+    session_key: string
+}
+export type DbPlainSession = Required<DbInsertSession>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Sources.ts b/packages/@ourworldindata/types/src/dbTypes/Sources.ts
new file mode 100644
index 00000000000..0a89ec234a5
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Sources.ts
@@ -0,0 +1,46 @@
+import { JsonString } from "../domainTypes/Various.js"
+
+export interface SourceDescription {
+    dataPublishedBy?: string
+    dataPublisherSource?: string
+    link?: string
+    retrievedDate?: string
+    additionalInfo?: string
+}
+
+export const SourcesTableName = "sources"
+export interface DbInsertSource {
+    createdAt?: Date
+    datasetId?: number | null
+    description: JsonString
+    id?: number
+    name?: string | null
+    updatedAt?: Date | null
+}
+export type DbRawSource = Required<DbInsertSource>
+export type DbEnrichedSource = Omit<DbRawSource, "description"> & {
+    description: SourceDescription
+}
+
+export function parseSourceDescription(
+    description: JsonString
+): SourceDescription {
+    return JSON.parse(description)
+}
+
+export function serializeSourceDescription(
+    description: SourceDescription
+): JsonString {
+    return JSON.stringify(description)
+}
+
+export function parseSourcesRow(row: DbRawSource): DbEnrichedSource {
+    return { ...row, description: parseSourceDescription(row.description) }
+}
+
+export function serializeSourcesRow(row: DbEnrichedSource): DbRawSource {
+    return {
+        ...row,
+        description: serializeSourceDescription(row.description),
+    }
+}
diff --git a/packages/@ourworldindata/types/src/dbTypes/SuggestedChartRevisions.ts b/packages/@ourworldindata/types/src/dbTypes/SuggestedChartRevisions.ts
new file mode 100644
index 00000000000..5248fea42c3
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/SuggestedChartRevisions.ts
@@ -0,0 +1,82 @@
+import { JsonString } from "../domainTypes/Various.js"
+import { GrapherInterface } from "../grapherTypes/GrapherTypes.js"
+import { parseChartConfig, serializeChartConfig } from "./Charts.js"
+
+export interface SuggestedChartRevisionsExperimental {
+    gpt: {
+        model: string
+        suggestions: {
+            title: string
+            subtitle: string
+        }[]
+    }
+}
+
+export const SuggestedChartRevisionsTableName = "suggested_chart_revisions"
+export interface DbInsertSuggestedChartRevision {
+    changesInDataSummary?: string | null
+    chartId: number
+    createdAt?: Date
+    createdBy: number
+    decisionReason?: string | null
+    experimental?: JsonString | null
+    id?: string
+    isPendingOrFlagged?: number | null
+    originalConfig: JsonString
+    originalVersion: number
+    status: string
+    suggestedConfig: JsonString
+    suggestedReason?: string | null
+    suggestedVersion: number
+    updatedAt?: Date | null
+    updatedBy?: number | null
+}
+export type DbRawSuggestedChartRevision =
+    Required<DbInsertSuggestedChartRevision>
+
+export type DbEnrichedSuggestedChartRevision = Omit<
+    DbRawSuggestedChartRevision,
+    "originalConfig" | "suggestedConfig" | "experimental"
+> & {
+    originalConfig: GrapherInterface
+    suggestedConfig: GrapherInterface
+    experimental: SuggestedChartRevisionsExperimental | null
+}
+
+export function parseSuggestedChartRevisionsExperimental(
+    experimental: JsonString | null
+): SuggestedChartRevisionsExperimental | null {
+    return experimental ? JSON.parse(experimental) : null
+}
+
+export function serializeSuggestedChartRevisionsExperimental(
+    experimental: SuggestedChartRevisionsExperimental | null
+): JsonString | null {
+    return experimental ? JSON.stringify(experimental) : null
+}
+
+export function parseSuggestedChartRevisionsRow(
+    row: DbRawSuggestedChartRevision
+): DbEnrichedSuggestedChartRevision {
+    return {
+        ...row,
+        originalConfig: parseChartConfig(row.originalConfig),
+        suggestedConfig: parseChartConfig(row.suggestedConfig),
+        experimental: parseSuggestedChartRevisionsExperimental(
+            row.experimental
+        ),
+    }
+}
+
+export function serializeSuggestedChartRevisionsRow(
+    row: DbEnrichedSuggestedChartRevision
+): DbRawSuggestedChartRevision {
+    return {
+        ...row,
+        originalConfig: serializeChartConfig(row.originalConfig),
+        suggestedConfig: serializeChartConfig(row.suggestedConfig),
+        experimental: serializeSuggestedChartRevisionsExperimental(
+            row.experimental
+        ),
+    }
+}
diff --git a/packages/@ourworldindata/types/src/dbTypes/Tags.ts b/packages/@ourworldindata/types/src/dbTypes/Tags.ts
index 4d588045d69..9ba797364ae 100644
--- a/packages/@ourworldindata/types/src/dbTypes/Tags.ts
+++ b/packages/@ourworldindata/types/src/dbTypes/Tags.ts
@@ -1,11 +1,13 @@
 /** the entity in the `tags` table */
-export interface Tag {
-    id: number
+export const TagsTableName = "tags"
+export interface DbInsertTag {
+    createdAt?: Date
+    id?: number
+    isBulkImport?: number
     name: string
-    createdAt: Date
-    updatedAt: Date
-    parentId: number
-    isBulkImport: boolean
-    specialType: string
-    slug: string | null
+    parentId?: number | null
+    slug?: string | null
+    specialType?: string | null
+    updatedAt?: Date | null
 }
+export type DbPlainTag = Required<DbInsertTag>
diff --git a/packages/@ourworldindata/types/src/dbTypes/TagsVariables.ts b/packages/@ourworldindata/types/src/dbTypes/TagsVariables.ts
new file mode 100644
index 00000000000..973107ba142
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/TagsVariables.ts
@@ -0,0 +1,7 @@
+export const TagsVariablesTopicTagsTableName = "tags_variables_topic_tags"
+export interface DbInsertTagVariableTopicTag {
+    displayOrder?: number
+    tagId: number
+    variableId: number
+}
+export type DbPlainTagVariableTopicTag = Required<DbInsertTagVariableTopicTag>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Users.ts b/packages/@ourworldindata/types/src/dbTypes/Users.ts
new file mode 100644
index 00000000000..21399a47ba9
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Users.ts
@@ -0,0 +1,14 @@
+export const UsersTableName = "users"
+export interface DbInsertUser {
+    createdAt?: Date
+    email: string
+    fullName: string
+    id?: number
+    isActive?: number
+    isSuperuser?: number
+    lastLogin?: Date | null
+    lastSeen?: Date | null
+    password?: string | null
+    updatedAt?: Date | null
+}
+export type DbPlainUser = Required<DbInsertUser>
diff --git a/packages/@ourworldindata/types/src/dbTypes/Variables.ts b/packages/@ourworldindata/types/src/dbTypes/Variables.ts
new file mode 100644
index 00000000000..7f0fd857b61
--- /dev/null
+++ b/packages/@ourworldindata/types/src/dbTypes/Variables.ts
@@ -0,0 +1,218 @@
+import { OwidVariableDisplayConfigInterface } from "../OwidVariableDisplayConfigInterface.js"
+import { JsonString } from "../domainTypes/Various.js"
+import { GrapherInterface } from "../grapherTypes/GrapherTypes.js"
+
+export const VariablesTableName = "variables"
+export interface DbInsertVariable {
+    attribution?: string | null
+    attributionShort?: string | null
+    catalogPath?: string | null
+    code?: string | null
+    columnOrder?: number
+    coverage: string
+    createdAt?: Date
+    datasetId: number
+    description?: string | null
+    descriptionFromProducer?: string | null
+    descriptionKey?: JsonString | null
+    descriptionProcessing?: string | null
+    descriptionShort?: string | null
+    dimensions?: JsonString | null
+    display: JsonString
+    grapherConfigAdmin?: JsonString | null
+    grapherConfigETL?: JsonString | null
+    id?: number
+    license?: JsonString | null
+    licenses?: JsonString | null
+    name?: string | null
+    originalMetadata?: JsonString | null
+    processingLevel?: string | null
+    processingLog?: JsonString | null
+    schemaVersion?: number
+    shortName?: string | null
+    shortUnit?: string | null
+    sourceId?: number | null
+    timespan: string
+    titlePublic?: string | null
+    titleVariant?: string | null
+    unit: string
+    updatedAt?: Date | null
+}
+export type DbRawVariable = Required<DbInsertVariable>
+
+export interface VariableDisplayDimension {
+    originalShortName: string
+    originalName: string
+    filters: {
+        name: string
+        value: string
+    }[]
+}
+
+export interface License {
+    name: string
+    url: string
+}
+
+export type DbEnrichedVariable = Omit<
+    DbRawVariable,
+    | "display"
+    | "license"
+    | "licenses"
+    | "dimensions"
+    | "descriptionKey"
+    | "originalMetadata"
+    | "grapherConfigAdmin"
+    | "grapherConfigETL"
+    | "processingLog"
+> & {
+    display: OwidVariableDisplayConfigInterface
+    license: License | null
+    licenses: License[] | null
+    dimensions: VariableDisplayDimension | null
+    descriptionKey: string[] | null
+    originalMetadata: unknown | null
+    grapherConfigAdmin: GrapherInterface | null
+    grapherConfigETL: GrapherInterface | null
+    processingLog: unknown | null
+}
+
+export function parseVariableDisplayConfig(
+    display: JsonString
+): OwidVariableDisplayConfigInterface {
+    return JSON.parse(display)
+}
+
+export function serializeVariableDisplayConfig(
+    display: OwidVariableDisplayConfigInterface
+): JsonString {
+    return JSON.stringify(display)
+}
+
+export function parseVariableDimensions(
+    dimensions: JsonString | null
+): VariableDisplayDimension {
+    return dimensions ? JSON.parse(dimensions) : null
+}
+
+export function serializeVariableDimensions(
+    dimensions: VariableDisplayDimension | null
+): JsonString | null {
+    return dimensions ? JSON.stringify(dimensions) : null
+}
+
+export function parseVariableLicenses(licenses: JsonString | null): License[] {
+    return licenses ? JSON.parse(licenses) : null
+}
+
+export function serializeVariableLicenses(
+    licenses: License[] | null
+): JsonString | null {
+    return licenses ? JSON.stringify(licenses) : null
+}
+
+export function parseLicense(license: JsonString | null): License {
+    return license ? JSON.parse(license) : null
+}
+
+export function serializeLicense(license: License | null): JsonString | null {
+    return license ? JSON.stringify(license) : null
+}
+
+export function parseVariableDescriptionKey(
+    descriptionKey: JsonString | null
+): string[] | null {
+    return descriptionKey ? JSON.parse(descriptionKey) : null
+}
+
+export function serializeVariableDescriptionKey(
+    descriptionKey: string[] | null
+): JsonString | null {
+    return descriptionKey ? JSON.stringify(descriptionKey) : null
+}
+
+export function parseVariableOriginalMetadata(
+    originalMetadata: JsonString | null
+): any {
+    return originalMetadata ? JSON.parse(originalMetadata) : null
+}
+
+export function serializeVariableOriginalMetadata(
+    originalMetadata: any
+): JsonString | null {
+    return originalMetadata ? JSON.stringify(originalMetadata) : null
+}
+
+export function parseVariableGrapherConfigAdmin(
+    grapherConfigAdmin: JsonString | null
+): GrapherInterface {
+    return grapherConfigAdmin ? JSON.parse(grapherConfigAdmin) : null
+}
+
+export function serializeVariableGrapherConfigAdmin(
+    grapherConfigAdmin: GrapherInterface | null
+): JsonString | null {
+    return grapherConfigAdmin ? JSON.stringify(grapherConfigAdmin) : null
+}
+
+export function parseVariableGrapherConfigETL(
+    grapherConfigETL: JsonString | null
+): GrapherInterface {
+    return grapherConfigETL ? JSON.parse(grapherConfigETL) : null
+}
+
+export function serializeVariableGrapherConfigETL(
+    grapherConfigETL: GrapherInterface | null
+): JsonString | null {
+    return grapherConfigETL ? JSON.stringify(grapherConfigETL) : null
+}
+
+export function parseVariableProcessingLog(
+    processingLog: JsonString | null
+): any {
+    return processingLog ? JSON.parse(processingLog) : null
+}
+
+export function serializeVariableProcessingLog(
+    processingLog: any
+): JsonString | null {
+    return processingLog ? JSON.stringify(processingLog) : null
+}
+
+export function parseVariablesRow(row: DbRawVariable): DbEnrichedVariable {
+    return {
+        ...row,
+        display: parseVariableDisplayConfig(row.display),
+        license: row.license ? parseLicense(row.license) : null,
+        licenses: parseVariableLicenses(row.licenses),
+        dimensions: parseVariableDimensions(row.dimensions),
+        descriptionKey: parseVariableDescriptionKey(row.descriptionKey),
+        originalMetadata: parseVariableOriginalMetadata(row.originalMetadata),
+        grapherConfigAdmin: parseVariableGrapherConfigAdmin(
+            row.grapherConfigAdmin
+        ),
+        grapherConfigETL: parseVariableGrapherConfigETL(row.grapherConfigETL),
+        processingLog: parseVariableProcessingLog(row.processingLog),
+    }
+}
+
+export function serializeVariablesRow(row: DbEnrichedVariable): DbRawVariable {
+    return {
+        ...row,
+        display: serializeVariableDisplayConfig(row.display),
+        license: row.license ? serializeLicense(row.license) : null,
+        licenses: serializeVariableLicenses(row.licenses),
+        dimensions: serializeVariableDimensions(row.dimensions),
+        descriptionKey: serializeVariableDescriptionKey(row.descriptionKey),
+        originalMetadata: serializeVariableOriginalMetadata(
+            row.originalMetadata
+        ),
+        grapherConfigAdmin: serializeVariableGrapherConfigAdmin(
+            row.grapherConfigAdmin
+        ),
+        grapherConfigETL: serializeVariableGrapherConfigETL(
+            row.grapherConfigETL
+        ),
+        processingLog: serializeVariableProcessingLog(row.processingLog),
+    }
+}
diff --git a/packages/@ourworldindata/types/src/domainTypes/Tag.ts b/packages/@ourworldindata/types/src/domainTypes/Tag.ts
new file mode 100644
index 00000000000..d7f8776c28d
--- /dev/null
+++ b/packages/@ourworldindata/types/src/domainTypes/Tag.ts
@@ -0,0 +1,10 @@
+export interface Tag {
+    id: number
+    name: string
+    createdAt: Date
+    updatedAt: Date
+    parentId: number
+    isBulkImport: boolean
+    specialType: string
+    slug: string | null
+}
diff --git a/packages/@ourworldindata/types/src/domainTypes/Various.ts b/packages/@ourworldindata/types/src/domainTypes/Various.ts
index 166649dcf2f..0f491eff454 100644
--- a/packages/@ourworldindata/types/src/domainTypes/Various.ts
+++ b/packages/@ourworldindata/types/src/domainTypes/Various.ts
@@ -2,6 +2,8 @@ export type Integer = number
 
 export type OwidVariableId = Integer // remove.
 
+export type JsonString = string
+
 /**
  * Pageview information about a single URL
  */
diff --git a/packages/@ourworldindata/types/src/gdocTypes/Gdoc.ts b/packages/@ourworldindata/types/src/gdocTypes/Gdoc.ts
index 833f96144bc..c3531711b57 100644
--- a/packages/@ourworldindata/types/src/gdocTypes/Gdoc.ts
+++ b/packages/@ourworldindata/types/src/gdocTypes/Gdoc.ts
@@ -1,4 +1,4 @@
-import { Tag } from "../dbTypes/Tags.js"
+import { Tag } from "../domainTypes/Tag.js"
 import { RelatedChart } from "../grapherTypes/GrapherTypes.js"
 import { BreadcrumbItem } from "../domainTypes/Site.js"
 import { TocHeadingWithTitleSupertitle } from "../domainTypes/Toc.js"
@@ -98,6 +98,7 @@ export type MinimalDataInsightInterface = Pick<
 }
 
 export type OwidGdoc = OwidGdocPostInterface | OwidGdocDataInsightInterface
+export type OwidGdocContent = OwidGdocPostContent | OwidGdocDataInsightContent
 
 export enum OwidGdocErrorMessageType {
     Error = "error",
@@ -129,9 +130,16 @@ export interface OwidGdocJSON
     updatedAt: string | null
 }
 
+export enum OwidGdocLinkType {
+    Gdoc = "gdoc",
+    Url = "url",
+    Grapher = "grapher",
+    Explorer = "explorer",
+}
+
 export interface OwidGdocLinkJSON {
     source: Record<string, any>
-    linkType: "gdoc" | "url" | "grapher" | "explorer"
+    linkType: OwidGdocLinkType
     target: string
     componentType: string
     text: string
diff --git a/packages/@ourworldindata/types/src/index.ts b/packages/@ourworldindata/types/src/index.ts
index 5dcdd1531d9..bc64d838285 100644
--- a/packages/@ourworldindata/types/src/index.ts
+++ b/packages/@ourworldindata/types/src/index.ts
@@ -49,9 +49,7 @@ export {
     DeployStatus,
     type DeployMetadata,
 } from "./domainTypes/DeployStatus.js"
-export { type Tag } from "./dbTypes/Tags.js"
-
-export { type ChartTag, type ChartTagJoin } from "./dbTypes/ChartTags.js"
+export { type Tag } from "./domainTypes/Tag.js"
 
 export {
     IDEAL_PLOT_ASPECT_RATIO,
@@ -278,6 +276,7 @@ export {
     GdocsContentSource,
     type OwidArticleBackportingStatistics,
     type LinkedChart,
+    OwidGdocLinkType,
     DYNAMIC_COLLECTION_PAGE_CONTAINER_ID,
 } from "./gdocTypes/Gdoc.js"
 
@@ -312,23 +311,6 @@ export {
     type UnformattedSpan,
 } from "./gdocTypes/Spans.js"
 
-export {
-    parsePostFormattingOptions,
-    parsePostAuthors,
-    parsePostRow,
-    serializePostRow,
-    parsePostArchieml,
-} from "./dbTypes/PostsUtilities.js"
-
-export {
-    type PostRowParsedFields,
-    type PostRowPlainFields,
-    type PostRowUnparsedFields,
-    type PostRowEnriched,
-    type PostRowRaw,
-    type PostRowWithGdocPublishStatus,
-} from "./dbTypes/Posts.js"
-
 export type { GDriveImageMetadata, ImageMetadata } from "./gdocTypes/Image.js"
 export {
     ALL_CHARTS_ID,
@@ -400,3 +382,224 @@ export {
     type CoreColumnDef,
     ErrorValue,
 } from "./domainTypes/CoreTableTypes.js"
+export {
+    type DbPlainAnalyticsPageview,
+    AnalyticsPageviewsTableName,
+} from "./dbTypes/AnalyticsPageviews.js"
+export {
+    type DbPlainChartDimension,
+    type DbInsertChartDimension,
+    ChartDimensionsTableName,
+} from "./dbTypes/ChartDimensions.js"
+export {
+    type DbInsertChartRevision,
+    type DbRawChartRevision,
+    type DbEnrichedChartRevision,
+    ChartRevisionsTableName,
+    parseChartRevisionsRow,
+    serializeChartRevisionsRow,
+} from "./dbTypes/ChartRevisions.js"
+export {
+    type DbInsertChart,
+    type DbRawChart,
+    type DbEnrichedChart,
+    ChartsTableName,
+    parseChartConfig,
+    serializeChartConfig,
+    parseChartsRow,
+    serializeChartsRow,
+} from "./dbTypes/Charts.js"
+export {
+    type DbPlainChartSlugRedirect,
+    type DbInsertChartSlugRedirect,
+    ChartSlugRedirectsTableName,
+} from "./dbTypes/ChartSlugRedirects.js"
+export {
+    type DbPlainChartTag,
+    type DbInsertChartTag,
+    ChartTagsTableName,
+    type DbChartTagJoin,
+} from "./dbTypes/ChartTags.js"
+export {
+    type DbPlainCountryLatestData,
+    type DbInsertCountryLatestData,
+    CountryLatestDataTableName,
+} from "./dbTypes/CountryLatestData.js"
+export {
+    type DbPlainDatasetFile,
+    type DbInsertDatasetFile,
+    DatasetFilesTableName,
+} from "./dbTypes/DatasetFiles.js"
+export {
+    type DbPlainDataset,
+    type DbInsertDataset,
+    DatasetsTableName,
+} from "./dbTypes/Datasets.js"
+export {
+    type DbPlainDatasetTag,
+    type DbInsertDatasetTag,
+    DatasetTagsTableName,
+} from "./dbTypes/DatasetTags.js"
+export {
+    type DbPlainEntity,
+    type DbInsertEntity,
+    EntitiesTableName,
+} from "./dbTypes/Entities.js"
+export {
+    type DbPlainExplorerChart,
+    type DbInsertExplorerChart,
+    ExplorerChartsTableName,
+} from "./dbTypes/ExplorerCharts.js"
+export {
+    type DbPlainExplorer,
+    type DbInsertExplorer,
+    ExplorersTableName,
+} from "./dbTypes/Explorers.js"
+export {
+    type DbPlainExplorerVariable,
+    type DbInsertExplorerVariable,
+    ExplorerVariablesTableName,
+} from "./dbTypes/ExplorerVariables.js"
+export {
+    type DbPlainImage,
+    type DbInsertImage,
+    ImagesTableName,
+} from "./dbTypes/Images.js"
+export {
+    type DbPlainNamespace,
+    type DbInsertNamespace,
+    NamespacesTableName,
+} from "./dbTypes/Namespaces.js"
+export {
+    type DbRawOrigin,
+    type DbEnrichedOrigin,
+    type DbInsertOrigin,
+    OriginsTableName,
+    parseOriginsRow,
+    serializeOriginsRow,
+} from "./dbTypes/Origins.js"
+export {
+    type DbPlainOriginVariable,
+    type DbInsertOriginsVariable,
+    OriginsVariablesTableName,
+} from "./dbTypes/OriginsVariables.js"
+export {
+    type DbInsertPost,
+    type DbEnrichedPost,
+    type DbRawPost,
+    type DbRawPostWithGdocPublishStatus,
+    PostsTableName,
+    parsePostFormattingOptions,
+    parsePostAuthors,
+    parsePostRow,
+    serializePostRow,
+    parsePostArchieml,
+} from "./dbTypes/Posts.js"
+export {
+    type DbInsertPostGdoc,
+    type DbRawPostGdoc,
+    type DbEnrichedPostGdoc,
+    PostsGdocsTableName,
+    parsePostGdocContent,
+    serializePostGdocContent,
+    parsePostsGdocsBreadcrumbs,
+    serializePostsGdocsBreadcrumbs,
+    parsePostsGdocsRow,
+    serializePostsGdocsRow,
+} from "./dbTypes/PostsGdocs.js"
+export {
+    type DbPlainPostGdocLink,
+    type DbInsertPostGdocLink,
+    PostsGdocsLinksTableName,
+} from "./dbTypes/PostsGdocsLinks.js"
+export {
+    type DbPlainPostGdocVariableFaq,
+    type DbInsertPostGdocVariableFaq,
+    PostsGdocsVariablesFaqsTableName,
+} from "./dbTypes/PostsGdocsVariablesFaqs.js"
+export {
+    type DbPlainPostGdocXImage,
+    type DbInsertPostGdocXImage,
+    PostsGdocsXImagesTableName,
+} from "./dbTypes/PostsGdocsXImages.js"
+export {
+    type DbPlainPostGdocXTag,
+    type DbInsertPostGdocXTag,
+    PostsGdocsXTagsTableName,
+} from "./dbTypes/PostsGdocsXTags.js"
+export {
+    type DbPlainPostLink,
+    type DbInsertPostLink,
+    PostsLinksTableName,
+} from "./dbTypes/PostsLinks.js"
+export {
+    type DbPlainPostTag,
+    type DbInsertPostTag,
+    PostTagsTableName,
+} from "./dbTypes/PostTags.js"
+export {
+    type DbPlainSession,
+    type DbInsertSession,
+    SessionsTableName,
+} from "./dbTypes/Sessions.js"
+
+export {
+    type DbInsertSource,
+    type DbRawSource,
+    type DbEnrichedSource,
+    SourcesTableName,
+    parseSourceDescription,
+    serializeSourceDescription,
+    parseSourcesRow,
+    serializeSourcesRow,
+} from "./dbTypes/Sources.js"
+export {
+    type DbInsertSuggestedChartRevision,
+    type DbRawSuggestedChartRevision,
+    type DbEnrichedSuggestedChartRevision,
+    SuggestedChartRevisionsTableName,
+    parseSuggestedChartRevisionsExperimental,
+    serializeSuggestedChartRevisionsExperimental,
+    parseSuggestedChartRevisionsRow,
+    serializeSuggestedChartRevisionsRow,
+} from "./dbTypes/SuggestedChartRevisions.js"
+export {
+    type DbInsertTag,
+    type DbPlainTag,
+    TagsTableName,
+} from "./dbTypes/Tags.js"
+export {
+    type DbPlainTagVariableTopicTag,
+    type DbInsertTagVariableTopicTag,
+    TagsVariablesTopicTagsTableName,
+} from "./dbTypes/TagsVariables.js"
+export {
+    type DbPlainUser,
+    type DbInsertUser,
+    UsersTableName,
+} from "./dbTypes/Users.js"
+export {
+    type DbRawVariable,
+    type DbEnrichedVariable,
+    type DbInsertVariable,
+    VariablesTableName,
+    parseVariableDisplayConfig,
+    serializeVariableDisplayConfig,
+    parseVariableDimensions,
+    serializeVariableDimensions,
+    parseVariablesRow,
+    serializeVariablesRow,
+    parseVariableDescriptionKey,
+    serializeVariableDescriptionKey,
+    parseVariableOriginalMetadata,
+    serializeVariableOriginalMetadata,
+    parseVariableLicenses,
+    serializeVariableLicenses,
+    parseVariableGrapherConfigAdmin,
+    serializeVariableGrapherConfigAdmin,
+    parseVariableGrapherConfigETL,
+    serializeVariableGrapherConfigETL,
+    parseVariableProcessingLog,
+    serializeVariableProcessingLog,
+    type License,
+} from "./dbTypes/Variables.js"
diff --git a/site/EntriesByYearPage.tsx b/site/EntriesByYearPage.tsx
index 9781d30c51d..a6a3ffa1c3e 100644
--- a/site/EntriesByYearPage.tsx
+++ b/site/EntriesByYearPage.tsx
@@ -1,11 +1,11 @@
 import React from "react"
-import { dayjs, groupBy, PostRowEnriched } from "@ourworldindata/utils"
+import { dayjs, groupBy, DbEnrichedPost } from "@ourworldindata/utils"
 import { Head } from "./Head.js"
 import { SiteHeader } from "./SiteHeader.js"
 import { SiteFooter } from "./SiteFooter.js"
 import { TableOfContents } from "../site/TableOfContents.js"
 
-type Entry = Pick<PostRowEnriched, "title" | "slug" | "published_at">
+type Entry = Pick<DbEnrichedPost, "title" | "slug" | "published_at">
 
 export const EntriesByYearPage = (props: {
     entries: Entry[]
diff --git a/site/GrapherPage.jsdom.test.tsx b/site/GrapherPage.jsdom.test.tsx
index e71556fee63..a0380939cd6 100755
--- a/site/GrapherPage.jsdom.test.tsx
+++ b/site/GrapherPage.jsdom.test.tsx
@@ -4,7 +4,7 @@ import { GrapherInterface } from "@ourworldindata/types"
 import {
     DimensionProperty,
     KeyChartLevel,
-    PostRowEnriched,
+    DbEnrichedPost,
     RelatedChart,
 } from "@ourworldindata/utils"
 import React from "react"
@@ -30,7 +30,7 @@ const mockGrapher: GrapherInterface = {
 }
 
 let grapher: GrapherInterface
-let post: PostRowEnriched
+let post: DbEnrichedPost
 let relatedCharts: RelatedChart[]
 
 beforeAll(() => {
diff --git a/site/GrapherPage.tsx b/site/GrapherPage.tsx
index bd2292bf677..961424edcbb 100644
--- a/site/GrapherPage.tsx
+++ b/site/GrapherPage.tsx
@@ -8,7 +8,7 @@ import {
 import {
     flatten,
     PostReference,
-    PostRowEnriched,
+    DbEnrichedPost,
     RelatedChart,
     serializeJSONForHTML,
     GrapherInterface,
@@ -34,7 +34,7 @@ import { SiteHeader } from "./SiteHeader.js"
 
 export const GrapherPage = (props: {
     grapher: GrapherInterface
-    post?: PostRowEnriched
+    post?: DbEnrichedPost
     relatedCharts?: RelatedChart[]
     relatedArticles?: PostReference[]
     baseUrl: string
diff --git a/yarn.lock b/yarn.lock
index d07a910eeca..e3ff9e4d2bd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3830,6 +3830,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rmp135/sql-ts@npm:^1.18.1":
+  version: 1.18.1
+  resolution: "@rmp135/sql-ts@npm:1.18.1"
+  dependencies:
+    change-case: "npm:^4.1.2"
+    handlebars: "npm:^4.7.7"
+    knex: "npm:^2.4.2"
+    yargs: "npm:^17.7.2"
+  peerDependencies:
+    better-sqlite3: ^8.4.0
+    mssql: ^9.1.1
+    mysql: ^2.18.1
+    mysql2: ^3.3.2
+    pg: ^8.11.0
+    sqlite3: ^5.1.6
+  peerDependenciesMeta:
+    better-sqlite3:
+      optional: true
+    mssql:
+      optional: true
+    mysql:
+      optional: true
+    mysql2:
+      optional: true
+    pg:
+      optional: true
+    sqlite3:
+      optional: true
+  bin:
+    sql-ts: bin/sql-ts
+  checksum: 0bad86296b8d6d1db92c5e3c93cccc690bfdaee5817fd99fbe9d6b39676391ade69d92b6931a923c169c768036884ad6bc2a66d2c29a31077e85dee39d00d05d
+  languageName: node
+  linkType: hard
+
 "@selderee/plugin-htmlparser2@npm:^0.6.0":
   version: 0.6.0
   resolution: "@selderee/plugin-htmlparser2@npm:0.6.0"
@@ -6797,6 +6831,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"camel-case@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "camel-case@npm:4.1.2"
+  dependencies:
+    pascal-case: "npm:^3.1.2"
+    tslib: "npm:^2.0.3"
+  checksum: bcbd25cd253b3cbc69be3f535750137dbf2beb70f093bdc575f73f800acc8443d34fd52ab8f0a2413c34f1e8203139ffc88428d8863e4dfe530cfb257a379ad6
+  languageName: node
+  linkType: hard
+
 "camelcase-keys@npm:^6.2.2":
   version: 6.2.2
   resolution: "camelcase-keys@npm:6.2.2"
@@ -6829,6 +6873,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"capital-case@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "capital-case@npm:1.0.4"
+  dependencies:
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+    upper-case-first: "npm:^2.0.2"
+  checksum: 41fa8fa87f6d24d0835a2b4a9341a3eaecb64ac29cd7c5391f35d6175a0fa98ab044e7f2602e1ec3afc886231462ed71b5b80c590b8b41af903ec2c15e5c5931
+  languageName: node
+  linkType: hard
+
 "capnp-ts@npm:^0.7.0":
   version: 0.7.0
   resolution: "capnp-ts@npm:0.7.0"
@@ -6887,6 +6942,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"change-case@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "change-case@npm:4.1.2"
+  dependencies:
+    camel-case: "npm:^4.1.2"
+    capital-case: "npm:^1.0.4"
+    constant-case: "npm:^3.0.4"
+    dot-case: "npm:^3.0.4"
+    header-case: "npm:^2.0.4"
+    no-case: "npm:^3.0.4"
+    param-case: "npm:^3.0.4"
+    pascal-case: "npm:^3.1.2"
+    path-case: "npm:^3.0.4"
+    sentence-case: "npm:^3.0.4"
+    snake-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: e4bc4a093a1f7cce8b33896665cf9e456e3bc3cc0def2ad7691b1994cfca99b3188d0a513b16855b01a6bd20692fcde12a7d4d87a5615c4c515bbbf0e651f116
+  languageName: node
+  linkType: hard
+
 "char-regex@npm:^1.0.2":
   version: 1.0.2
   resolution: "char-regex@npm:1.0.2"
@@ -7334,6 +7409,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:^10.0.0":
+  version: 10.0.1
+  resolution: "commander@npm:10.0.1"
+  checksum: 8799faa84a30da985802e661cc9856adfaee324d4b138413013ef7f087e8d7924b144c30a1f1405475f0909f467665cd9e1ce13270a2f41b141dab0b7a58f3fb
+  languageName: node
+  linkType: hard
+
 "commander@npm:^4.0.0, commander@npm:^4.1.1":
   version: 4.1.1
   resolution: "commander@npm:4.1.1"
@@ -7433,6 +7515,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"constant-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "constant-case@npm:3.0.4"
+  dependencies:
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+    upper-case: "npm:^2.0.2"
+  checksum: 6c3346d51afc28d9fae922e966c68eb77a19d94858dba230dd92d7b918b37d36db50f0311e9ecf6847e43e934b1c01406a0936973376ab17ec2c471fbcfb2cf3
+  languageName: node
+  linkType: hard
+
 "content-disposition@npm:0.5.4":
   version: 0.5.4
   resolution: "content-disposition@npm:0.5.4"
@@ -8692,6 +8785,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dot-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "dot-case@npm:3.0.4"
+  dependencies:
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: a65e3519414856df0228b9f645332f974f2bf5433370f544a681122eab59e66038fc3349b4be1cdc47152779dac71a5864f1ccda2f745e767c46e9c6543b1169
+  languageName: node
+  linkType: hard
+
 "dot-prop@npm:^5.1.0":
   version: 5.3.0
   resolution: "dot-prop@npm:5.3.0"
@@ -10918,6 +11021,7 @@ __metadata:
     "@ourworldindata/types": "workspace:^"
     "@ourworldindata/utils": "workspace:^"
     "@react-awesome-query-builder/antd": "npm:^6.1.1"
+    "@rmp135/sql-ts": "npm:^1.18.1"
     "@sinclair/typebox": "npm:^0.28.5"
     "@slack/web-api": "npm:^6.11.1"
     "@stripe/stripe-js": "npm:^1.54.0"
@@ -11026,7 +11130,7 @@ __metadata:
     js-yaml: "npm:^4.1.0"
     json8-pointer: "npm:^1.0.6"
     jsonwebtoken: "npm:^9.0.0"
-    knex: "npm:^2.4.2"
+    knex: "npm:^3.1.0"
     lerna: "npm:^7.4.2"
     lodash: "npm:^4.17.20"
     mathjax-full: "npm:^3.1.0"
@@ -11312,6 +11416,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"header-case@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "header-case@npm:2.0.4"
+  dependencies:
+    capital-case: "npm:^1.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 571c83eeb25e8130d172218712f807c0b96d62b020981400bccc1503a7cf14b09b8b10498a962d2739eccf231d950e3848ba7d420b58a6acd2f9283439546cd9
+  languageName: node
+  linkType: hard
+
 "highlight.js@npm:^10.7.1":
   version: 10.7.3
   resolution: "highlight.js@npm:10.7.3"
@@ -13509,6 +13623,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"knex@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "knex@npm:3.1.0"
+  dependencies:
+    colorette: "npm:2.0.19"
+    commander: "npm:^10.0.0"
+    debug: "npm:4.3.4"
+    escalade: "npm:^3.1.1"
+    esm: "npm:^3.2.25"
+    get-package-type: "npm:^0.1.0"
+    getopts: "npm:2.3.0"
+    interpret: "npm:^2.2.0"
+    lodash: "npm:^4.17.21"
+    pg-connection-string: "npm:2.6.2"
+    rechoir: "npm:^0.8.0"
+    resolve-from: "npm:^5.0.0"
+    tarn: "npm:^3.0.2"
+    tildify: "npm:2.0.0"
+  peerDependenciesMeta:
+    better-sqlite3:
+      optional: true
+    mysql:
+      optional: true
+    mysql2:
+      optional: true
+    pg:
+      optional: true
+    pg-native:
+      optional: true
+    sqlite3:
+      optional: true
+    tedious:
+      optional: true
+  bin:
+    knex: bin/cli.js
+  checksum: 12eb978ebec9944d6d0225d33d31d44feb54046b3a02f9f14dfa33a4e665a54d784290991b17a68fd8141a14a3336b325c7706af35557f845dae9e500f3c8aae
+  languageName: node
+  linkType: hard
+
 "lazy-ass@npm:^1.6.0":
   version: 1.6.0
   resolution: "lazy-ass@npm:1.6.0"
@@ -13889,6 +14042,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lower-case@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "lower-case@npm:2.0.2"
+  dependencies:
+    tslib: "npm:^2.0.3"
+  checksum: 83a0a5f159ad7614bee8bf976b96275f3954335a84fad2696927f609ddae902802c4f3312d86668722e668bef41400254807e1d3a7f2e8c3eede79691aa1f010
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^5.1.1":
   version: 5.1.1
   resolution: "lru-cache@npm:5.1.1"
@@ -14832,6 +14994,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"no-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "no-case@npm:3.0.4"
+  dependencies:
+    lower-case: "npm:^2.0.2"
+    tslib: "npm:^2.0.3"
+  checksum: 0b2ebc113dfcf737d48dde49cfebf3ad2d82a8c3188e7100c6f375e30eafbef9e9124aadc3becef237b042fd5eb0aad2fd78669c20972d045bbe7fea8ba0be5c
+  languageName: node
+  linkType: hard
+
 "node-abi@npm:^3.3.0":
   version: 3.8.0
   resolution: "node-abi@npm:3.8.0"
@@ -15827,6 +15999,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"param-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "param-case@npm:3.0.4"
+  dependencies:
+    dot-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: b34227fd0f794e078776eb3aa6247442056cb47761e9cd2c4c881c86d84c64205f6a56ef0d70b41ee7d77da02c3f4ed2f88e3896a8fefe08bdfb4deca037c687
+  languageName: node
+  linkType: hard
+
 "parent-module@npm:^1.0.0":
   version: 1.0.1
   resolution: "parent-module@npm:1.0.1"
@@ -15964,6 +16146,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pascal-case@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "pascal-case@npm:3.1.2"
+  dependencies:
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: ba98bfd595fc91ef3d30f4243b1aee2f6ec41c53b4546bfa3039487c367abaa182471dcfc830a1f9e1a0df00c14a370514fa2b3a1aacc68b15a460c31116873e
+  languageName: node
+  linkType: hard
+
 "pascalcase@npm:^0.1.1":
   version: 0.1.1
   resolution: "pascalcase@npm:0.1.1"
@@ -15971,6 +16163,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "path-case@npm:3.0.4"
+  dependencies:
+    dot-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 61de0526222629f65038a66f63330dd22d5b54014ded6636283e1d15364da38b3cf29e4433aa3f9d8b0dba407ae2b059c23b0104a34ee789944b1bc1c5c7e06d
+  languageName: node
+  linkType: hard
+
 "path-exists@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-exists@npm:3.0.0"
@@ -16108,6 +16310,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pg-connection-string@npm:2.6.2":
+  version: 2.6.2
+  resolution: "pg-connection-string@npm:2.6.2"
+  checksum: 22265882c3b6f2320785378d0760b051294a684989163d5a1cde4009e64e84448d7bf67d9a7b9e7f69440c3ee9e2212f9aa10dd17ad6773f6143c6020cebbcb5
+  languageName: node
+  linkType: hard
+
 "picocolors@npm:^1.0.0":
   version: 1.0.0
   resolution: "picocolors@npm:1.0.0"
@@ -18323,6 +18532,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sentence-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "sentence-case@npm:3.0.4"
+  dependencies:
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+    upper-case-first: "npm:^2.0.2"
+  checksum: 3cfe6c0143e649132365695706702d7f729f484fa7b25f43435876efe7af2478243eefb052bacbcce10babf9319fd6b5b6bc59b94c80a1c819bcbb40651465d5
+  languageName: node
+  linkType: hard
+
 "serve-static@npm:1.15.0":
   version: 1.15.0
   resolution: "serve-static@npm:1.15.0"
@@ -18602,6 +18822,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"snake-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "snake-case@npm:3.0.4"
+  dependencies:
+    dot-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 0a7a79900bbb36f8aaa922cf111702a3647ac6165736d5dc96d3ef367efc50465cac70c53cd172c382b022dac72ec91710608e5393de71f76d7142e6fd80e8a3
+  languageName: node
+  linkType: hard
+
 "snapdragon-node@npm:^2.0.1":
   version: 2.1.1
   resolution: "snapdragon-node@npm:2.1.1"
@@ -19818,6 +20048,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.0.3":
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca
+  languageName: node
+  linkType: hard
+
 "tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0":
   version: 2.5.0
   resolution: "tslib@npm:2.5.0"
@@ -20387,6 +20624,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"upper-case-first@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "upper-case-first@npm:2.0.2"
+  dependencies:
+    tslib: "npm:^2.0.3"
+  checksum: 4487db4701effe3b54ced4b3e4aa4d9ab06c548f97244d04aafb642eedf96a76d5a03cf5f38f10f415531d5792d1ac6e1b50f2a76984dc6964ad530f12876409
+  languageName: node
+  linkType: hard
+
+"upper-case@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "upper-case@npm:2.0.2"
+  dependencies:
+    tslib: "npm:^2.0.3"
+  checksum: 508723a2b03ab90cf1d6b7e0397513980fab821cbe79c87341d0e96cedefadf0d85f9d71eac24ab23f526a041d585a575cfca120a9f920e44eb4f8a7cf89121c
+  languageName: node
+  linkType: hard
+
 "uri-js@npm:^4.2.2":
   version: 4.4.1
   resolution: "uri-js@npm:4.4.1"
@@ -21311,6 +21566,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs@npm:^17.7.2":
+  version: 17.7.2
+  resolution: "yargs@npm:17.7.2"
+  dependencies:
+    cliui: "npm:^8.0.1"
+    escalade: "npm:^3.1.1"
+    get-caller-file: "npm:^2.0.5"
+    require-directory: "npm:^2.1.1"
+    string-width: "npm:^4.2.3"
+    y18n: "npm:^5.0.5"
+    yargs-parser: "npm:^21.1.1"
+  checksum: abb3e37678d6e38ea85485ed86ebe0d1e3464c640d7d9069805ea0da12f69d5a32df8e5625e370f9c96dd1c2dc088ab2d0a4dd32af18222ef3c4224a19471576
+  languageName: node
+  linkType: hard
+
 "yauzl@npm:^2.10.0":
   version: 2.10.0
   resolution: "yauzl@npm:2.10.0"