added >multi word, removed unused singletons, fixed tuple example in docs

diff --git a/extra/mongodb/driver/driver.factor b/extra/mongodb/driver/driver.factor
index 0bd22ee7fe3b9f60f8af2b8a3e0fb744fa684e17..0fff78249ca1358c2c993c3005a2a9ffb0785d57 100644 (file)
--- a/extra/mongodb/driver/driver.factor
+++ b/extra/mongodb/driver/driver.factor
@@ -5,6 +5,7 @@ mongodb.cmd mongodb.connection mongodb.msg namespaces parser
 prettyprint prettyprint.custom prettyprint.sections sequences
 sets splitting strings ;
 FROM: ascii => ascii? ;
+FROM: math.bitwise => set-bit ;
 IN: mongodb.driver
 
 TUPLE: mdb-pool < pool mdb ;
@@ -278,7 +279,10 @@ PRIVATE>
     [ check-collection ] 2dip <mdb-update-msg> ;
 
 : >upsert ( mdb-update-msg -- mdb-update-msg )
-    1 >>upsert? ; 
+    [ 0 set-bit ] change-update-flags ;
+
+: >multi ( mdb-update-msg -- mdb-update-msg )
+    [ 1 set-bit ] change-update-flags ;
 
 : update ( mdb-update-msg -- )
     send-message-check-error ;

diff --git a/extra/mongodb/mongodb-docs.factor b/extra/mongodb/mongodb-docs.factor
index 6bddc2f496ec08a0d9f61adafb8c064b16b1ca2b..6a7439259689568c97e062c6a4f06c9f4c28afe1 100644 (file)
--- a/extra/mongodb/mongodb-docs.factor
+++ b/extra/mongodb/mongodb-docs.factor
@@ -20,7 +20,7 @@ ARTICLE: "mongodb" "MongoDB factor integration"
   "person \"persons\" { } { $[ \"ageIdx\" [ \"age\" asc ] key-spec <tuple-index> ] } define-persistent "
   "\"db\" \"127.0.0.1\" 27017 <mdb>"
   "person new \"Alfred\" >>name 57 >>age"
-  "'[ _ save-tuple person new 57 >>age select-tuple ] with-db"
+  "'[ person ensure-table _ save-tuple person new 57 >>age select-tuple ] with-db"
   "" }
 ;
 

diff --git a/extra/mongodb/msg/msg.factor b/extra/mongodb/msg/msg.factor
index ca9393a1086fef65774ff2f9b49f27a1a5ceb651..3d1ca28557920a324f51fe1025dede50bf0666db 100644 (file)
--- a/extra/mongodb/msg/msg.factor
+++ b/extra/mongodb/msg/msg.factor
@@ -38,7 +38,7 @@ TUPLE: mdb-insert-msg < mdb-msg
 
 TUPLE: mdb-update-msg < mdb-msg
     { collection string }
-    { upsert? integer initial: 0 }
+    { update-flags integer initial: 0 }
     { selector assoc }
     { object assoc } ;
 

diff --git a/extra/mongodb/operations/operations.factor b/extra/mongodb/operations/operations.factor
index 7d16b4c40aafca724c18562520cb85c6b4030c4e..1b51e2d377a3e725e072475a61774e00f85f0be3 100644 (file)
--- a/extra/mongodb/operations/operations.factor
+++ b/extra/mongodb/operations/operations.factor
@@ -120,7 +120,7 @@ PRIVATE>
         { 
             [ flags>> write-int32 ]
             [ collection>> write-cstring ]
-            [ upsert?>> write-int32 ]
+            [ update-flags>> write-int32 ]
             [ selector>> assoc>stream ]
             [ object>> assoc>stream ]
         } cleave

diff --git a/extra/mongodb/tuple/tuple.factor b/extra/mongodb/tuple/tuple.factor
index 2f235f74a0a9c47c925318b6cd8c49e2bcac1fbb..c787405f048d72e5374670d966dc9427676da9a8 100644 (file)
--- a/extra/mongodb/tuple/tuple.factor
+++ b/extra/mongodb/tuple/tuple.factor
@@ -7,8 +7,6 @@ FROM: mongodb.tuple.persistent => assoc>tuple ;
 
 IN: mongodb.tuple
 
-SINGLETONS: +fieldindex+ +compoundindex+ +deepindex+ +unique+ ;
-
 SYNTAX: MDBTUPLE:
     parse-tuple-definition
     mdb-check-slots