From a84880d770b5e5b18c26a649bdea078e8b074ff9 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 25 May 2008 19:45:21 -0500
Subject: [PATCH] Fix parameter ordering

---
 extra/db/db.factor          | 2 +-
 extra/db/pools/pools.factor | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extra/db/db.factor b/extra/db/db.factor
index 9514f62cf0..4b98612069 100755
--- a/extra/db/db.factor
+++ b/extra/db/db.factor
@@ -127,7 +127,7 @@ M: nonthrowable execute-statement* ( statement type -- )
 : query-map ( statement quot -- seq )
     accumulator >r query-each r> { } like ; inline
 
-: with-db ( db seq quot -- )
+: with-db ( seq class quot -- )
     >r make-db db-open db r>
     [ db get swap [ drop ] prepose with-disposal ] curry with-variable ;
     inline
diff --git a/extra/db/pools/pools.factor b/extra/db/pools/pools.factor
index 4d201c2edf..63153c451e 100644
--- a/extra/db/pools/pools.factor
+++ b/extra/db/pools/pools.factor
@@ -6,16 +6,16 @@ IN: db.pools
 
 TUPLE: db-pool < pool db params ;
 
-: <db-pool> ( db params -- pool )
+: <db-pool> ( params db -- pool )
     db-pool <pool>
-        swap >>params
-        swap >>db ;
+        swap >>db
+        swap >>params ;
 
 : with-db-pool ( db params quot -- )
     >r <db-pool> r> with-pool ; inline
 
 M: db-pool make-connection ( pool -- )
-    [ db>> ] [ params>> ] bi make-db db-open ;
+    [ params>> ] [ db>> ] bi make-db db-open ;
 
 : with-pooled-db ( pool quot -- )
     [ db swap with-variable ] curry with-pooled-connection ; inline