Fix a bug with updates on objects with BSON::ObjectId's.

closes #9.

Author: nelhage

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mosql (0.1.0)
+    mosql (0.1.1)
       bson_ext
       json
       log4r
@@ -17,7 +17,7 @@ GEM
     bson (1.8.2)
     bson_ext (1.8.2)
       bson (~> 1.8.2)
-    json (1.7.6)
+    json (1.7.7)
     log4r (1.1.10)
     metaclass (0.0.1)
     minitest (3.0.0)

lib/mosql/cli.rb

@@ -253,11 +253,12 @@ def optail
     end
 
     def sync_object(ns, _id)
+      sqlid = @sql.transform_one_ns(ns, { '_id' => _id })['_id']
       obj = collection_for_ns(ns).find_one({:_id => _id})
       if obj
         @sql.upsert_ns(ns, obj)
       else
-        @sql.table_for_ns(ns).where(:_id => _id).delete()
+        @sql.table_for_ns(ns).where(:_id => sqlid).delete()
       end
     end
 

lib/mosql/sql.rb

@@ -25,22 +25,24 @@ def table_for_ns(ns)
       @db[@schema.table_for_ns(ns).intern]
     end
 
-
-    def upsert_ns(ns, obj)
+    def transform_one_ns(ns, obj)
       h = {}
       cols = @schema.all_columns(@schema.find_ns(ns))
       row  = @schema.transform(ns, obj)
       cols.zip(row).each { |k,v| h[k] = v }
+      h
+    end
+
+    def upsert_ns(ns, obj)
+      h = transform_one_ns(ns, obj)
       upsert(table_for_ns(ns), h)
     end
 
     # obj must contain an _id field. All other fields will be ignored.
     def delete_ns(ns, obj)
-      cols = @schema.all_columns(@schema.find_ns(ns))
-      row  = @schema.transform(ns, obj)
-      sqlid = row[cols.index("_id")]
-      raise "No _id found in transform of #{obj}" if sqlid.nil?
-      table_for_ns(ns).where(:_id => sqlid).delete
+      h = transform_one_ns(ns, obj)
+      raise "No _id found in transform of #{obj.inspect}" if h['_id'].nil?
+      table_for_ns(ns).where(:_id => h['_id']).delete
     end
 
     def upsert(table, item)

test/functional/cli.rb

@@ -56,4 +56,21 @@ def fake_cli
                    })
     assert_equal(0, sequel[:sqltable].where(:_id => o['_id'].to_s).count)
   end
+
+  it 'handle "u" ops with $set and BSON::ObjectIDs' do
+    o = { '_id' => BSON::ObjectId.new, 'var' => 17 }
+    @adapter.upsert_ns('mosql_test.collection', o)
+
+    # $set's are currently a bit of a hack where we read the object
+    # from the db, so make sure the new object exists in mongo
+    connect_mongo['mosql_test']['collection'].insert(o.merge('var' => 100),
+                                                     :w => 1)
+
+    @cli.handle_op({ 'ns' => 'mosql_test.collection',
+                     'op' => 'u',
+                     'o2' => { '_id' => o['_id'] },
+                     'o'  => { '$set' => { 'var' => 100 } },
+                   })
+    assert_equal(100, sequel[:sqltable].where(:_id => o['_id'].to_s).select.first[:var])
+  end
 end