src/sqlFragmentFactories/createIntervalSqlFragment.ts

@@ -9,15 +9,17 @@ import {
   type SqlFragment,
 } from '../types';
 
-const IntervalInput = z.object({
-  days: z.number().optional(),
-  hours: z.number().optional(),
-  minutes: z.number().optional(),
-  months: z.number().optional(),
-  seconds: z.number().optional(),
-  weeks: z.number().optional(),
-  years: z.number().optional(),
-}).strict();
+const IntervalInput = z
+  .object({
+    days: z.number().optional(),
+    hours: z.number().optional(),
+    minutes: z.number().optional(),
+    months: z.number().optional(),
+    seconds: z.number().optional(),
+    weeks: z.number().optional(),
+    years: z.number().optional(),
+  })
+  .strict();
 
 const intervalFragments = [
   'years',
@@ -28,13 +30,23 @@ const intervalFragments = [
   'seconds',
 ];
 
-export const createIntervalSqlFragment = (token: IntervalSqlToken, greatestParameterPosition: number): SqlFragment => {
+const tokenMap = {
+  minutes: 'mins',
+  seconds: 'secs',
+};
+
+export const createIntervalSqlFragment = (
+  token: IntervalSqlToken,
+  greatestParameterPosition: number,
+): SqlFragment => {
   let intervalInput;
 
   try {
     intervalInput = IntervalInput.parse(token.interval);
   } catch {
-    throw new InvalidInputError('Interval input must not contain unknown properties.');
+    throw new InvalidInputError(
+      'Interval input must not contain unknown properties.',
+    );
   }
 
   const values: number[] = [];
@@ -47,7 +59,13 @@ export const createIntervalSqlFragment = (token: IntervalSqlToken, greatestParam
     if (value !== undefined) {
       values.push(value);
 
-      intervalTokens.push(intervalFragment + ' => $' + String(greatestParameterPosition + values.length));
+      const mappedToken = tokenMap[intervalFragment] ?? intervalFragment;
+
+      intervalTokens.push(
+        mappedToken +
+          ' => $' +
+          String(greatestParameterPosition + values.length),
+      );
     }
   }
 

test/slonik/templateTags/sql/interval.ts

@@ -18,6 +18,30 @@ test('creates an empty make_interval invocation', (t) => {
   });
 });
 
+test('creates an interval', (t) => {
+  const query = sql.fragment`SELECT ${sql.interval({
+    days: 3,
+    hours: 4,
+    minutes: 5,
+    months: 2,
+    seconds: 6,
+    years: 1,
+  })}`;
+
+  t.deepEqual(query, {
+    sql: 'SELECT make_interval(years => $1, months => $2, days => $3, hours => $4, mins => $5, secs => $6)',
+    type: FragmentToken,
+    values: [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+    ],
+  });
+});
+
 test('throws if contains unknown properties', (t) => {
   const error = t.throws(() => {
     sql.fragment`SELECT ${sql.interval({