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

db4
Sascha Matzke 2010-07-31 10:48:49 +02:00
parent e42479b257
commit 7295a04519
5 changed files with 8 additions and 6 deletions

View File

@ -5,6 +5,7 @@ mongodb.cmd mongodb.connection mongodb.msg namespaces parser
prettyprint prettyprint.custom prettyprint.sections sequences prettyprint prettyprint.custom prettyprint.sections sequences
sets splitting strings ; sets splitting strings ;
FROM: ascii => ascii? ; FROM: ascii => ascii? ;
FROM: math.bitwise => set-bit ;
IN: mongodb.driver IN: mongodb.driver
TUPLE: mdb-pool < pool mdb ; TUPLE: mdb-pool < pool mdb ;
@ -278,7 +279,10 @@ PRIVATE>
[ check-collection ] 2dip <mdb-update-msg> ; [ check-collection ] 2dip <mdb-update-msg> ;
: >upsert ( mdb-update-msg -- 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 -- ) : update ( mdb-update-msg -- )
send-message-check-error ; send-message-check-error ;

View File

@ -20,7 +20,7 @@ ARTICLE: "mongodb" "MongoDB factor integration"
"person \"persons\" { } { $[ \"ageIdx\" [ \"age\" asc ] key-spec <tuple-index> ] } define-persistent " "person \"persons\" { } { $[ \"ageIdx\" [ \"age\" asc ] key-spec <tuple-index> ] } define-persistent "
"\"db\" \"127.0.0.1\" 27017 <mdb>" "\"db\" \"127.0.0.1\" 27017 <mdb>"
"person new \"Alfred\" >>name 57 >>age" "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"
"" } "" }
; ;

View File

@ -38,7 +38,7 @@ TUPLE: mdb-insert-msg < mdb-msg
TUPLE: mdb-update-msg < mdb-msg TUPLE: mdb-update-msg < mdb-msg
{ collection string } { collection string }
{ upsert? integer initial: 0 } { update-flags integer initial: 0 }
{ selector assoc } { selector assoc }
{ object assoc } ; { object assoc } ;

View File

@ -120,7 +120,7 @@ PRIVATE>
{ {
[ flags>> write-int32 ] [ flags>> write-int32 ]
[ collection>> write-cstring ] [ collection>> write-cstring ]
[ upsert?>> write-int32 ] [ update-flags>> write-int32 ]
[ selector>> assoc>stream ] [ selector>> assoc>stream ]
[ object>> assoc>stream ] [ object>> assoc>stream ]
} cleave } cleave

View File

@ -7,8 +7,6 @@ FROM: mongodb.tuple.persistent => assoc>tuple ;
IN: mongodb.tuple IN: mongodb.tuple
SINGLETONS: +fieldindex+ +compoundindex+ +deepindex+ +unique+ ;
SYNTAX: MDBTUPLE: SYNTAX: MDBTUPLE:
parse-tuple-definition parse-tuple-definition
mdb-check-slots mdb-check-slots