From efcd5ab98dad7dbd86c81befe869fadf3cef9cc9 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Wed, 14 Feb 2018 10:39:20 -0800
Subject: [PATCH] db.queries: set the "table-name" inside a with-variables.

---
 basis/db/queries/queries.factor | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/basis/db/queries/queries.factor b/basis/db/queries/queries.factor
index 00799950bf..3357ee5635 100644
--- a/basis/db/queries/queries.factor
+++ b/basis/db/queries/queries.factor
@@ -46,11 +46,10 @@ M: retryable execute-statement* ( statement type -- )
 : sql-props ( class -- columns table )
     [ db-columns ] [ db-table-name ] bi ;
 
-: query-make ( class quot -- statements )
+: query-make ( ..a class quot: ( ..a columns table -- ..b ) -- ..b statements )
     ! query, input, outputs, secondary queries
-    over db-table-name "table-name" set
     [ sql-props ] dip
-    [ 0 sql-counter rot with-variable ] curry
+    '[ 0 sql-counter [ dup "table-name" set @ ] with-variable ]
     { "" { } { } { } } nmake
     [ <simple-statement> maybe-make-retryable ] dip
     [ [ 1array ] dip append ] unless-empty ; inline