rdf-lmdb 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3974d6238f7b35ae6d58d500fd35e3ffe3b927621b9a83d433352576dc6f4f01
-  data.tar.gz: a4bb3618b788f8ad2e79a92d0eec78860a6a4c76b1f4e83dc330b0302878b0e8
+  metadata.gz: ea35cfcc72e22d7a71f047728b412575ce712691c2815a3693d23f94909a78b2
+  data.tar.gz: ab6e65528c0b9bc70bf4d18a7f47b2f47206dbfd1d09aa99c4551a799694b3a0
 SHA512:
-  metadata.gz: '09e1cfa5e90ba6834a7f8c76fc310e1d89d7adacc22d20deb77295c8d128a9e48325d9f6a4174bab56c73803e654ef3a04c0a418928e2f56dca6ac4b0caef459'
-  data.tar.gz: 8e778b125ead8e2bd8cf5c3a695b00c499e1e6a3d6e8e98da8de9f273cb5e75558942e66646fdf2301b4d24ae5ede4ae34209c3be5a311c04faffa692e288e5f
+  metadata.gz: 483d8b372297ee978595110432dd21170cd34fafde285b7f0f1269fea9d5d06428066b19e8e9b6cf294c6e71dbf378e1b30e37215e36810fae19dd6ebbeda5fc
+  data.tar.gz: 20fac6ce5e493fa10ef923bd12e0e549e33b83a46f859b623f5fe5838ab42348ec1ef67884bfbe7baaa396ae1937a6bb3256897f86e8fd0343b0705ac2ed423d

data/lib/rdf/lmdb/version.rb

@@ -1,5 +1,5 @@
 module RDF
   module LMDB
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/lib/rdf/lmdb.rb

@@ -688,7 +688,10 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
       end
 
       def delete_statement statement
+        # note that this does not get called by `delete_statements`,
+        # because we want the transaction on the outside.
         complete! statement
+        # warn "WTF LOL #{statement.inspect}"
         @lmdb.transaction do |t|
           if statement.variable?
             query(statement).each { |stmt| rm_one stmt }
@@ -714,12 +717,25 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
       def delete_statements statements
         @lmdb.transaction do |t|
           hashes = []
-          statements.each do |statement|
-            complete! statement
-            hashes += rm_one statement, scan: false
+
+          # we don't know what's in here but it may contain statements
+          # with variables, in which case we have to handle them
+          enums = [statements]
+          # also note that RDF::Util::Coercions#coerce_statements
+          # which is called in advance of this is supposed to take
+          # care of this situation but doesn't for some reason.
+          until enums.empty?
+            statements = enums.shift
+            statements.each do |statement|
+              if statement.variable?
+                enums << query(statement)
+              else
+                hashes += rm_one statement, scan: false
+              end
+            end
           end
 
-          clean_terms hashes
+          clean_terms hashes.uniq
           t.commit
         end
 
@@ -818,7 +834,8 @@ Currently you have to dump from the old layout and reload the new one. Sorry!
       # end
 
       def delete_insert deletes, inserts
-        ret = super(deletes, inserts)
+        ret = nil
+        @lmdb.transaction { ret = super(deletes, inserts) }
         commit_transaction # this is to satiate the test suite
         ret
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-lmdb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dorian Taylor