Use postgres instance directly for raw queries

Author: aldis-ameriks

apps/api/src/helpers/context.ts

@@ -13,7 +13,7 @@ type User = {
 }
 
 export type Context = {
-  postgres: Postgres.Sql
+  sql: Postgres.Sql
   db: PostgresJsDatabase<typeof schema>
   log: Logger
   config: typeof config
@@ -42,11 +42,6 @@ export async function createRequestContext(context: RequestContext): Promise<Req
   return context
 }
 
-export function createContext({
-  postgres,
-  db,
-  log,
-  config
-}: Pick<Context, 'postgres' | 'db' | 'log' | 'config'>): Context {
-  return { log, db, postgres, config }
+export function createContext({ sql, db, log, config }: Pick<Context, 'sql' | 'db' | 'log' | 'config'>): Context {
+  return { log, db, sql, config }
 }

apps/api/src/helpers/shutdown.ts

@@ -76,7 +76,7 @@ async function initiateShutdown(context: Context, event, err: any, close: () =>
     await close()
 
     log.info('Closing connection pool')
-    await context.postgres.end()
+    await context.sql.end()
   } catch (e) {
     log.error(e, 'Failed to close server')
     process.exit(1)

apps/api/src/index.ts

@@ -11,7 +11,7 @@ import { shutdown } from './helpers/shutdown.ts'
 import { sendTelegram } from './modules/errors/helpers/sendTelegram.ts'
 
 const log = pino({ level: 'debug', timestamp: pino.stdTimeFunctions.isoTime })
-const context = createContext({ db, postgres, log, config })
+const context = createContext({ db, sql: postgres, log, config })
 const app = initApp({ context })
 initRoutes({ app })
 initGraphql({ app })

apps/api/src/modules/readings/loaders.ts

@@ -1,4 +1,4 @@
-import { desc, sql } from 'drizzle-orm'
+import { desc } from 'drizzle-orm'
 import { inArray } from 'drizzle-orm/sql/expressions/conditions'
 import { type Context } from '../../helpers/context.ts'
 import { readings } from '../../helpers/schema.ts'
@@ -17,17 +17,17 @@ export default {
     },
     lastWateredTime: async (queries, context: Context) => {
       const deviceIds = queries.map((query) => query.obj.id)
-      const result = await context.db.execute<{ time: string; device_id: string }>(sql`
+      const result = await context.sql<{ time: string; device_id: string }[]>`
         SELECT DISTINCT ON (device_id) *
         FROM (SELECT device_id,
                      time::timestamptz,
                      moisture - lead(moisture) OVER (PARTITION BY device_id ORDER BY time DESC) AS moisture_increase
               FROM readings
-              WHERE device_id = ANY (ARRAY [${sql(deviceIds.join(','))}]::bigint[])
+              WHERE device_id IN ${context.sql(deviceIds)}
                 AND time > now() - '90 days'::interval) AS readings
         WHERE moisture_increase > 10
         ORDER BY device_id, time DESC;
-      `)
+      `
 
       return queries.map((query) => {
         const time = result.find((entry) => entry.device_id === `${query.obj.id}`)?.time
@@ -36,8 +36,7 @@ export default {
     },
     readings: async (queries, context: Context) => {
       const deviceIds = queries.map((query) => query.obj.id)
-      const result = await context.db.execute(
-        sql`
+      const result = await context.sql`
                     SELECT device_id, day AS time, moisture, temperature, light, battery_voltage AS "batteryVoltage"
                     FROM (SELECT device_id,
                                  time_bucket_gapfill('1 day'::interval, time) AS day,
@@ -46,14 +45,13 @@ export default {
                                  locf(avg(light))                             AS light,
                                  locf(avg(battery_voltage))                   AS battery_voltage
                           FROM readings
-                          WHERE device_id = ANY (ARRAY [${sql(deviceIds.join(','))}]::bigint[])
+                          WHERE device_id IN ${context.sql(deviceIds)}
                             AND time > now() - INTERVAL '90 days'
                             AND time < now()
                           GROUP BY day, device_id
                           ORDER BY day ASC) AS readings
                     WHERE moisture IS NOT NULL; -- Exclude entries with non-null readings that can occur when period is before first readings.
                 `
-      )
 
       return queries.map((query) => result.filter((entry) => entry.device_id === `${query.obj.id}`))
     }

apps/api/src/test-helpers/setupGraphql.ts

@@ -20,7 +20,7 @@ export function setupGraphql() {
 
   beforeEach(async () => {
     context.db = dbResult.db
-    context.postgres = dbResult.sql
+    context.sql = dbResult.sql
     result.context = createContext({
       ...result.context,
       db: dbResult.db,