🔨 fix rebase issues

adminSiteServer/adminRouter.tsx

@@ -43,7 +43,7 @@ import {
 } from "../baker/GrapherBaker.js"
 import { Chart } from "../db/model/Chart.js"
 import { getVariableMetadata } from "../db/model/Variable.js"
-import { DatasetFilesRow, DatasetsRow } from "@ourworldindata/types"
+import { DatasetFilesRow, DbPlainDataset } from "@ourworldindata/types"
 
 // Used for rate-limiting important endpoints (login, register) to prevent brute force attacks
 const limiterMiddleware = (
@@ -139,7 +139,7 @@ adminRouter.get("/datasets/:datasetId.csv", async (req, res) => {
     const datasetId = expectInt(req.params.datasetId)
 
     const datasetName = (
-        await db.knexRawFirst<Pick<DatasetsRow, "name">>(
+        await db.knexRawFirst<Pick<DbPlainDataset, "name">>(
             `SELECT name FROM datasets WHERE id=?`,
             [datasetId]
         )

adminSiteServer/apiRouter.ts

@@ -51,10 +51,10 @@ import {
     OwidGdoc,
 } from "@ourworldindata/utils"
 import {
-    DatasetTagsRow,
+    DatasetDbPlainTag,
     GrapherInterface,
     OwidGdocLinkType,
-    TagsRow,
+    DbPlainTag,
     grapherKeysToSerialize,
 } from "@ourworldindata/types"
 import {
@@ -1778,7 +1778,7 @@ apiRouter.get("/datasets.json", async (req) => {
     `)
 
     const tags = await db.knexRaw<
-        Pick<TagsRow, "id" | "name"> & Pick<DatasetTagsRow, "datasetId">
+        Pick<DbPlainTag, "id" | "name"> & Pick<DatasetDbPlainTag, "datasetId">
     >(`
         SELECT dt.datasetId, t.id, t.name FROM dataset_tags dt
         JOIN tags t ON dt.tagId = t.id

adminSiteServer/exportGitData.ts

@@ -1,10 +1,10 @@
 import * as db from "../db/db.js"
 import { syncDatasetToGitRepo } from "./gitDataExport.js"
-import { DatasetsRow, DatasetsRowTableName } from "@ourworldindata/types"
+import { DbPlainDataset, DbPlainDatasetTableName } from "@ourworldindata/types"
 
 const main = async () => {
     const knex = db.knexInstance()
-    const datasets = await knex<DatasetsRow>(DatasetsRowTableName).where({
+    const datasets = await knex<DbPlainDataset>(DbPlainDatasetTableName).where({
         namespace: "owid",
     })
     for (const dataset of datasets) {

adminSiteServer/gitDataExport.ts

@@ -16,13 +16,13 @@ import * as db from "../db/db.js"
 import filenamify from "filenamify"
 import { execFormatted } from "../db/execWrapper.js"
 import { JsonError } from "@ourworldindata/utils"
-import { DatasetsRow } from "@ourworldindata/types"
+import { DbPlainDataset } from "@ourworldindata/types"
 import { Knex } from "knex"
 import { getSourcesForDataset } from "../db/model/Source.js"
 
 const datasetToReadme = async (
     knex: Knex<any, any[]>,
-    dataset: DatasetsRow
+    dataset: DbPlainDataset
 ): Promise<string> => {
     // TODO: add origins here
     const source = (await getSourcesForDataset(knex, dataset.id))[0]

db/model/Dataset.ts

@@ -16,9 +16,9 @@ import * as db from "../db.js"
 import { VariableRow, variableTable, writeVariableCSV } from "./Variable.js"
 import _ from "lodash"
 import {
-    DatasetsRow,
-    DatasetsRowTableName,
-    TagsRow,
+    DbPlainDataset,
+    DatasetsTableName,
+    DbPlainTag,
 } from "@ourworldindata/types"
 import { Knex } from "knex"
 
@@ -45,8 +45,8 @@ export class Dataset extends BaseEntity {
 export async function getDatasetById(
     knex: Knex<any, any[]>,
     datasetId: number
-): Promise<DatasetsRow | undefined> {
-    const dataset = await knex<DatasetsRow>(DatasetsRowTableName)
+): Promise<DbPlainDataset | undefined> {
+    const dataset = await knex<DbPlainDataset>(DatasetsTableName)
         .where({ id: datasetId })
         .first()
     if (!dataset) return undefined
@@ -116,7 +116,7 @@ export async function datasetToDatapackage(
     const variables = (await db
         .knexTable(variableTable)
         .where({ datasetId })) as VariableRow[]
-    const tags = await db.knexRaw<Pick<TagsRow, "id" | "name">>(
+    const tags = await db.knexRaw<Pick<DbPlainTag, "id" | "name">>(
         `SELECT t.id, t.name FROM dataset_tags dt JOIN tags t ON t.id=dt.tagId WHERE dt.datasetId=?`,
         [datasetId],
         knex
@@ -159,7 +159,7 @@ export async function datasetToDatapackage(
 }
 
 export function isDatasetWithName(
-    dataset: DatasetsRow
-): dataset is DatasetsRow & { name: NonNullable<DatasetsRow["name"]> } {
+    dataset: DbPlainDataset
+): dataset is DbPlainDataset & { name: NonNullable<DbPlainDataset["name"]> } {
     return dataset.name !== undefined && dataset.name !== null
 }

db/model/Source.ts

@@ -1,9 +1,9 @@
 import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm"
 import { Knex } from "knex"
 import {
-    SourcesRowEnriched,
-    SourcesRowRaw,
-    SourcesRowTableName,
+    DbEnrichedSource,
+    DbRawSource,
+    SourcesTableName,
     parseSourcesRow,
 } from "@ourworldindata/types"
 
@@ -18,8 +18,8 @@ export class Source extends BaseEntity {
 export async function getSourceById(
     knex: Knex<any, any[]>,
     sourceId: number
-): Promise<SourcesRowEnriched | undefined> {
-    const rawSource = await knex<SourcesRowRaw>(SourcesRowTableName)
+): Promise<DbEnrichedSource | undefined> {
+    const rawSource = await knex<DbRawSource>(SourcesTableName)
         .where({ id: sourceId })
         .first()
     if (!rawSource) return undefined
@@ -34,8 +34,8 @@ export async function getSourceById(
 export async function getSourcesForDataset(
     knex: Knex<any, any[]>,
     datasetId: number
-): Promise<SourcesRowEnriched[]> {
-    const rawSources = await knex<SourcesRowRaw>(SourcesRowTableName).where({
+): Promise<DbEnrichedSource[]> {
+    const rawSources = await knex<DbRawSource>(SourcesTableName).where({
         datasetId,
     })
     const sources = rawSources.map((rawSource) =>
@@ -49,7 +49,7 @@ export async function getSourcesForDataset(
 }
 
 export async function sourceToDatapackage(
-    source: SourcesRowEnriched
+    source: DbEnrichedSource
 ): Promise<any> {
     return Object.assign({}, { name: source.name }, source.description)
 }