factor: trim using lists

[factor.git] / basis / db / pools / pools.factor

diff --git a/basis/db/pools/pools.factor b/basis/db/pools/pools.factor
index 63153c451ea0bed6fd5b9eb9dc2437816b75f719..01d02c1dfb4b6e992f6dc62dcedd183e5bce5970 100644 (file)
--- a/basis/db/pools/pools.factor
+++ b/basis/db/pools/pools.factor
@@ -1,21 +1,19 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel arrays namespaces sequences continuations
-io.pools db ;
+USING: accessors db io.pools kernel namespaces ;
 IN: db.pools
 
-TUPLE: db-pool < pool db params ;
+TUPLE: db-pool < pool db ;
 
-: <db-pool> ( params db -- pool )
+: <db-pool> ( db -- pool )
     db-pool <pool>
-        swap >>db
-        swap >>params ;
+        swap >>db ;
 
-: with-db-pool ( db params quot -- )
-    >r <db-pool> r> with-pool ; inline
+: with-db-pool ( db quot -- )
+    [ <db-pool> ] dip with-pool ; inline
 
-M: db-pool make-connection ( pool -- )
-    [ params>> ] [ db>> ] bi make-db db-open ;
+M: db-pool make-connection
+    db>> db-open ;
 
 : with-pooled-db ( pool quot -- )
-    [ db swap with-variable ] curry with-pooled-connection ; inline
+    '[ db-connection _ with-variable ] with-pooled-connection ; inline