diff --git a/basis/db/tuples/tuples.factor b/basis/db/tuples/tuples.factor index 6e009d84d5..7a8d6e5674 100644 --- a/basis/db/tuples/tuples.factor +++ b/basis/db/tuples/tuples.factor @@ -40,13 +40,11 @@ GENERIC: eval-generator ( singleton -- object ) : query-modify-tuple ( tuple statement -- ) [ query-results [ sql-row-typed ] with-disposal ] keep - out-params>> rot [ - [ slot-name>> ] dip set-slot-named - ] curry 2each ; + out-params>> rot '[ slot-name>> _ set-slot-named ] 2each ; : with-disposals ( object quotation -- ) over sequence? [ - over [ dispose-each ] curry [ ] cleanup + over '[ _ dispose-each ] [ ] cleanup ] [ with-disposal ] if ; inline @@ -73,7 +71,8 @@ PRIVATE> ! High level ERROR: no-slots-named class seq ; -: check-columns ( class columns -- ) + +: check-columns ( columns class -- ) [ nip ] [ [ keys ] [ all-slots [ name>> ] map ] bi* diff