mosql 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab1024ecdb478cb92b0c2041f7d5f52a67ec0d3
-  data.tar.gz: 2b88ed3d4bb0723f67170d645d61e34b62d29dc6
+  metadata.gz: 6c0bef56bc688f403ccbc3ee8cb0e20a68a653b9
+  data.tar.gz: 7a1ee9bfb170e668aa201e84897a19d26cd3ea6b
 SHA512:
-  metadata.gz: 5e8cc02a48b261391e0a161e0c35fb92113cc85f9e7436ed14bb9a4e0b54f4389f13093a02f9af6b516bd6d1d1db93202d5e8fd52c76d927564ead0733eb2d1d
-  data.tar.gz: d6a2c35555a5e8d4c99596f8c0cd212dca2546932a023cc1d7686ea6581ef0387813179817ce368cf06dff50753b927cc1ecba8be3bc82b44ff52519c141e31c
+  metadata.gz: 476b45cde7f4be786096327408a5e07f2124d5cee2e9a53d5da04a4aa5307df2c5aa7e4aef8eff48f3a676249eb39c65f1dd0e8cf0d9a90fd6cb89fc22d74851
+  data.tar.gz: 866fb300b0608669bded7814e30d753749e1511af1008b56be79b032d1f108a3973bf39cf3ab825aa01ffe5155a4f2bdb15d4f7f8882e725118a3ad08a7797c2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mosql (0.4.1)
+    mosql (0.4.2)
       bson (~> 1.10)
       bson_ext
       json

data/README.md

@@ -176,7 +176,8 @@ If it encounters a MongoDB object with fields not listed in the
 collection map, it will discard the extra fields, unless
 `:extra_props` is set in the `:meta` hash. If it is, it will collect
 any missing fields, JSON-encode them in a hash, and store the
-resulting text in `_extra_props` in SQL.
+resulting text in `_extra_props` in SQL. You can set `:extra_props`
+to use `JSON`, `JSONB`, or `TEXT`.
 
 As of PostgreSQL 9.3, you can declare columns as type "JSON" and use
 the [native JSON support][pg-json] to inspect inside of JSON-encoded

data/lib/mosql/schema.rb

@@ -101,10 +101,13 @@ module MoSQL
             primary_key keys
             if meta[:extra_props]
               type =
-                if meta[:extra_props] == "JSON"
-                  "JSON"
+                case meta[:extra_props]
+                when 'JSON'
+                  'JSON'
+                when 'JSONB'
+                  'JSONB'
                 else
-                  "TEXT"
+                  'TEXT'
                 end
               column '_extra_props', type
             end

data/lib/mosql/streamer.rb

@@ -185,14 +185,7 @@ module MoSQL
           @sql.upsert_ns(ns, obj)
         end
       else
-        primary_sql_keys = @schema.primary_sql_key_for_ns(ns)
-        schema = @schema.find_ns!(ns)
-        query = {}
-        primary_sql_keys.each do |key|
-          source =  schema[:columns].find {|c| c[:name] == key }[:source]
-          query[key] = selector[source]
-        end
-        @sql.table_for_ns(ns).where(query).delete()
+        @sql.delete_ns(ns, selector)
       end
     end
 

data/lib/mosql/version.rb

@@ -1,3 +1,3 @@
 module MoSQL
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/functional/streamer.rb

@@ -139,6 +139,21 @@ EOF
       assert_equal(100, sequel[:sqltable].where(:_id => o['_id'].to_s).select.first[:var])
     end
 
+    it 'handle "u" ops with $set, BSON::ObjectID, and a deleted row' do
+      o = { '_id' => BSON::ObjectId.new, 'var' => 17 }
+      @adapter.upsert_ns('mosql_test.collection', o)
+
+      # Don't store the row in mongo, which will cause the 'u' op to
+      # delete it from SQL.
+
+      @streamer.handle_op({ 'ns' => 'mosql_test.collection',
+                            'op' => 'u',
+                            'o2' => { '_id' => o['_id'] },
+                            'o'  => { '$set' => { 'var' => 100 } },
+                          })
+      assert_equal(0, sequel[:sqltable].count(:_id => o['_id'].to_s))
+    end
+
     it 'handle "u" ops with $set and a renamed _id' do
       o = { '_id' => BSON::ObjectId.new, 'goats' => 96 }
       @adapter.upsert_ns('mosql_test.renameid', o)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mosql
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Nelson Elhage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel