feat(postgres): Support nested sql fragments

vercel · Nov 6, 2023 · 79a201e · 79a201e
1 parent 7e5686b
commit 79a201e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/postgres/src/sql-template.test.ts b/packages/postgres/src/sql-template.test.ts
@@ -45,6 +45,14 @@ const validCases = [
       [123, 'admin'],
     ],
   },
+  {
+    input: (() => {
+      const column = fragment`foo`;
+      const filter = fragment`${column} = ${123}`;
+      return sqlTemplate`SELECT ${column} FROM table WHERE ${filter}`;
+    })(),
+    output: ['SELECT foo FROM table WHERE foo = $1', [123]],
+  },
 ];
 
 describe('sql', () => {

diff --git a/packages/postgres/src/sql-template.ts b/packages/postgres/src/sql-template.ts
@@ -6,7 +6,7 @@ export type Primitive = string | number | boolean | undefined | null;
 export interface QueryFragment {
   [fragmentSymbol]: true;
   strings: TemplateStringsArray;
-  values: Primitive[];
+  values: (Primitive | QueryFragment)[];
 }
 
 const fragmentSymbol = Symbol('fragment');
@@ -68,7 +68,7 @@ function processTemplate(
  */
 export function fragment(
   strings: TemplateStringsArray,
-  ...values: Primitive[]
+  ...values: (Primitive | QueryFragment)[]
 ): QueryFragment {
   if (!isTemplateStringsArray(strings) || !Array.isArray(values)) {
     throw new VercelPostgresError(