Merge branch 'master' of git@github.com:x6j8x/mongo-factor-driver

Conflicts:
	mongodb/driver/driver.factor

diff --cc mongodb/driver/driver.factor
index 3c61c8e4f0f0e6c949a54331f383713883817635,cfa374be7aacd24d54178ef3466f5b554d3f272c..426167b08e78f15f130c62439f76cc87af7e8ff5
--- 1/mongodb/driver/driver.factor
--- 2/mongodb/driver/driver.factor
+++ b/mongodb/driver/driver.factor
@@@ -52,8 -56,29 +52,6 @@@ SYNTAX: r/ ( token -- mdbregexp 
      [ MDB_OID_FIELD swap at ] keep
      H{ } clone [ set-at ] keep ;
  
--<PRIVATE
 -
 -: index-collection ( -- ns )
 -   mdb-instance name>> "%s.system.indexes" sprintf ; inline
 -
 -: namespaces-collection ( -- ns )
 -    mdb-instance name>> "%s.system.namespaces" sprintf ; inline
 -
 -: cmd-collection ( -- ns )
 -    mdb-instance name>> "%s.$cmd" sprintf ; inline
 - 
 -: index-ns ( colname -- index-ns )
 -    [ mdb-instance name>> ] dip "%s.%s" sprintf ; inline
 -
 -: send-message ( message -- )
 -    [ mdb-connection> handle>> ] dip '[ _ write-message ] with-stream* ;
 -
 -DEFER: check-collection
 -: send-query-plain ( query-message -- result )
 -    [ check-collection ] change-collection
 -    [ mdb-connection> handle>> ] dip
 -    '[ _ write-message read-message ] with-stream* ;
--
  : make-cursor ( mdb-result-msg -- cursor/f )
      dup cursor>> 0 > 
      [ [ cursor>> ] [ collection>> ] [ requested#>> ] tri <mdb-cursor> ]
@@@ -220,11 -240,11 +216,11 @@@ M: assoc ensure-inde
      H{ } clone
      [ [ "index" ] dip set-at ] keep
      [ [ "deleteIndexes" ] dip set-at ] keep
 -    [ cmd-collection ] dip <mdb-query-msg> find-one 
 -    check-ok [ "could not drop index" throw ] unless ;
 +    [ cmd-collection ] dip <mdb-query-msg>
 +    find-one drop ;
  
  : <update> ( collection selector object -- update-msg )
-     [ ensure-collection ] 2dip <mdb-update-msg> ;
+     [ check-collection ] 2dip <mdb-update-msg> ;
  
  : >upsert ( mdb-update-msg -- mdb-update-msg )
      1 >>upsert? ;