From 1e7506f7c1ee92576d403308f47d0504e8ed1106 Mon Sep 17 00:00:00 2001 From: Sascha Matzke Date: Thu, 7 May 2009 10:32:32 +0200 Subject: [PATCH 1/2] reworked insert, save and update; added save-deep --- extra/mongodb/tuple/tuple.factor | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/extra/mongodb/tuple/tuple.factor b/extra/mongodb/tuple/tuple.factor index 9173957979..e5e4867d71 100644 --- a/extra/mongodb/tuple/tuple.factor +++ b/extra/mongodb/tuple/tuple.factor @@ -54,14 +54,22 @@ M: mdb-persistent id-selector >upsert update ] assoc-each ; inline PRIVATE> -: save-tuple ( tuple -- ) - tuple>storable [ (save-tuples) ] assoc-each ; +: save-tuple-deep ( tuple -- ) + tuple>storable [ (save-tuples) ] assoc-each ; : update-tuple ( tuple -- ) - save-tuple ; + [ tuple-collection name>> ] + [ id-selector ] + [ tuple>assoc ] tri + update ; + +: save-tuple ( tuple -- ) + update-tuple ; : insert-tuple ( tuple -- ) - save-tuple ; + [ tuple-collection name>> ] + [ tuple>assoc ] bi + save ; : delete-tuple ( tuple -- ) [ tuple-collection name>> ] keep From d047c5110f8991b7364fe708463452dccd05dae9 Mon Sep 17 00:00:00 2001 From: Sascha Matzke Date: Thu, 7 May 2009 12:01:01 +0200 Subject: [PATCH 2/2] some bug fixes --- extra/mongodb/tuple/collection/collection.factor | 4 +++- extra/mongodb/tuple/tuple.factor | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extra/mongodb/tuple/collection/collection.factor b/extra/mongodb/tuple/collection/collection.factor index 1bd2d94e69..60b2d25764 100644 --- a/extra/mongodb/tuple/collection/collection.factor +++ b/extra/mongodb/tuple/collection/collection.factor @@ -92,6 +92,8 @@ GENERIC: mdb-index-map ( tuple -- sequence ) [ ] [ name>> ] bi H{ } clone [ set-at ] keep ] [ 2drop H{ } clone ] if ; + + PRIVATE> : MDB_ADDON_SLOTS ( -- slots ) @@ -116,7 +118,7 @@ PRIVATE> [ drop MDB_USER_KEY set-word-prop ] [ 3drop ] if ; inline : set-index-map ( class index-list -- ) - [ [ dup user-defined-key-index ] dip index-list>map ] output>sequence + [ dup user-defined-key-index ] dip index-list>map 2array assoc-combine MDB_INDEX_MAP set-word-prop ; inline M: tuple-class tuple-collection ( tuple -- mdb-collection ) diff --git a/extra/mongodb/tuple/tuple.factor b/extra/mongodb/tuple/tuple.factor index e5e4867d71..8f7504d9bc 100644 --- a/extra/mongodb/tuple/tuple.factor +++ b/extra/mongodb/tuple/tuple.factor @@ -69,7 +69,7 @@ PRIVATE> : insert-tuple ( tuple -- ) [ tuple-collection name>> ] [ tuple>assoc ] bi - save ; + save ; : delete-tuple ( tuple -- ) [ tuple-collection name>> ] keep