🐝 remove ?? for indentifier names in queries

owid · Feb 27, 2024 · d1f180f · d1f180f
1 parent 07a36dd
commit d1f180f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/db/model/Variable.ts b/db/model/Variable.ts
@@ -214,9 +214,9 @@ export async function writeVariableCSV(
             id as variableId,
             name as variableName,
             columnOrder
-        FROM ?? v
+        FROM variables v
         WHERE id IN (?)`,
-            [VariablesTableName, variableIds],
+            [variableIds],
             knex
         )
     ).withColumn(pl.col("variableId").cast(pl.Int32))
@@ -260,11 +260,11 @@ export const getDataValue = async (
     const unit = (
         await knexRawFirst<Pick<DbRawVariable, "unit">>(
             `-- sql
-        SELECT unit FROM ??
+        SELECT unit FROM variables
         WHERE id = ?
         `,
             knex,
-            [VariablesTableName, variableId]
+            [variableId]
         )
     )?.unit
 
@@ -299,11 +299,11 @@ export const getOwidChartDimensionConfigForVariable = async (
     const row = await db.knexRawFirst<{ dimensions: string }>(
         `
         SELECT config->"$.dimensions" AS dimensions
-        FROM ??
+        FROM charts
         WHERE id = ?
         `,
         knex,
-        [ChartsTableName, chartId]
+        [chartId]
     )
     if (!row?.dimensions) return
     const dimensions = JSON.parse(row.dimensions)

diff --git a/db/tests/basic.test.ts b/db/tests/basic.test.ts
@@ -132,9 +132,9 @@ test("knex interface", async () => {
         // Use raw queries, using ?? to specify the table name using the shared const value
         // The pick type is used to type the result row
         const usersFromRawQuery: Pick<DbPlainUser, "email">[] = await knexRaw(
-            "select email from ??",
+            "select email from users",
             trx,
-            [UsersTableName]
+            []
         )
         expect(usersFromRawQuery.length).toBe(2)
         await deleteUser(trx, 2)