Fix dynamic in helper after insert #305

Author: porsager

cjs/src/types.js

@@ -145,7 +145,7 @@ const builders = Object.entries({
     ).join(',') + ')values' +
     valuesBuilder(Array.isArray(first) ? first : [first], parameters, types, transform, columns)
   }
-}).map(([x, fn]) => ([new RegExp('(^|[\\s(])' + x, 'i'), fn]))
+}).map(([x, fn]) => ([new RegExp('(^|[\\s(])' + x + '($|[\\s(])', 'i'), fn]))
 
 function notTagged() {
   throw Errors.generic('NOT_TAGGED_CALL', 'Query not called as a tagged template literal')

cjs/tests/index.js

@@ -893,6 +893,21 @@ t('dynamic insert pluck', async() => {
   return [null, (await sql`insert into test ${ sql(x, 'a') } returning *`)[0].b, await sql`drop table test`]
 })
 
+t('dynamic in after insert', async() => {
+  await sql`create table test (a int, b text)`
+  const [{ x }] = await sql`
+    with x as (
+      insert into test values (1, 'hej')
+      returning *
+    )
+    select 1 in ${ sql([1, 2, 3]) } as x from x
+  `
+  return [
+    true, x,
+    await sql`drop table test`
+  ]
+})
+
 t('array insert', async() => {
   await sql`create table test (a int, b int)`
   return [2, (await sql`insert into test (a, b) values ${ sql([1, 2]) } returning *`)[0].b, await sql`drop table test`]

deno/src/types.js

@@ -146,7 +146,7 @@ const builders = Object.entries({
     ).join(',') + ')values' +
     valuesBuilder(Array.isArray(first) ? first : [first], parameters, types, transform, columns)
   }
-}).map(([x, fn]) => ([new RegExp('(^|[\\s(])' + x, 'i'), fn]))
+}).map(([x, fn]) => ([new RegExp('(^|[\\s(])' + x + '($|[\\s(])', 'i'), fn]))
 
 function notTagged() {
   throw Errors.generic('NOT_TAGGED_CALL', 'Query not called as a tagged template literal')

deno/tests/index.js

@@ -895,6 +895,21 @@ t('dynamic insert pluck', async() => {
   return [null, (await sql`insert into test ${ sql(x, 'a') } returning *`)[0].b, await sql`drop table test`]
 })
 
+t('dynamic in after insert', async() => {
+  await sql`create table test (a int, b text)`
+  const [{ x }] = await sql`
+    with x as (
+      insert into test values (1, 'hej')
+      returning *
+    )
+    select 1 in ${ sql([1, 2, 3]) } as x from x
+  `
+  return [
+    true, x,
+    await sql`drop table test`
+  ]
+})
+
 t('array insert', async() => {
   await sql`create table test (a int, b int)`
   return [2, (await sql`insert into test (a, b) values ${ sql([1, 2]) } returning *`)[0].b, await sql`drop table test`]

src/types.js

@@ -145,7 +145,7 @@ const builders = Object.entries({
     ).join(',') + ')values' +
     valuesBuilder(Array.isArray(first) ? first : [first], parameters, types, transform, columns)
   }
-}).map(([x, fn]) => ([new RegExp('(^|[\\s(])' + x, 'i'), fn]))
+}).map(([x, fn]) => ([new RegExp('(^|[\\s(])' + x + '($|[\\s(])', 'i'), fn]))
 
 function notTagged() {
   throw Errors.generic('NOT_TAGGED_CALL', 'Query not called as a tagged template literal')

tests/index.js

@@ -893,6 +893,21 @@ t('dynamic insert pluck', async() => {
   return [null, (await sql`insert into test ${ sql(x, 'a') } returning *`)[0].b, await sql`drop table test`]
 })
 
+t('dynamic in after insert', async() => {
+  await sql`create table test (a int, b text)`
+  const [{ x }] = await sql`
+    with x as (
+      insert into test values (1, 'hej')
+      returning *
+    )
+    select 1 in ${ sql([1, 2, 3]) } as x from x
+  `
+  return [
+    true, x,
+    await sql`drop table test`
+  ]
+})
+
 t('array insert', async() => {
   await sql`create table test (a int, b int)`
   return [2, (await sql`insert into test (a, b) values ${ sql([1, 2]) } returning *`)[0].b, await sql`drop table test`]